修复bug

packageA/deliveryConfirmation/detail.js

@@ -1,4 +1,10 @@
-const _Http = getApp().globalData.http;
+const _Http = getApp().globalData.http,
+  currency = require("../../utils/currency");
+let CNY = num => currency(num, {
+  symbol: "￥",
+  precision: 2
+}).format();
+
 
 Page({
   data: {
@@ -33,6 +39,10 @@ Page({
         title: res.msg,
         icon: "none"
       })
+      res.data.receivableamount = CNY(res.data.receivableamount)
+      res.data.payamount = CNY(res.data.payamount)
+      res.data.paydiscountamount = CNY(res.data.paydiscountamount)
+      res.data.discountamount_xjzh = CNY(res.data.discountamount_xjzh)
       this.setData({
         detail: res.data
       })

packageA/deliveryConfirmation/detail.scss

@@ -50,6 +50,22 @@
 	}
 }
 
+.amounts {
+	display: flex;
+	justify-content: space-around;
+	background-color: #fff;
+	padding: 20rpx;
+	margin: 16rpx 0;
+
+	.label {
+		font-size: 26rpx;
+		color: #333333;
+	}
+
+	.price {
+		margin-top: 20rpx;
+	}
+}
 
 .footer {
 	display: flex;

packageA/deliveryConfirmation/detail.wxml

@@ -9,19 +9,36 @@
 		单据日期：{{detail.billdate}}
 	</view>
 	<view class="exp">
-		联系人：{{detail.createby || ' --'}}
+		备注：{{detail.remarks || ' --'}}
 	</view>
 	<view class="exp">
-		地址：{{detail.address || ' --'}}
+		是否收货：{{detail.isreceiver ?'已收货':'未收货'}}
 	</view>
 	<view class="exp">
-		备注：{{detail.remarks || ' --'}}
+		收货地址：{{detail.invoice_address || '--'}}
 	</view>
 	<view class="exp">
-		是否收货：{{detail.isreceiver ?'已收货':'未收货'}}
+		开票信息：{{detail.invoice_enterprisename || '--'}}
+	</view>
+</view>
+<view class="amounts">
+	<view>
+		<view class="label">应收金额</view>
+		<view class="price">{{detail.receivableamount}}</view>
+	</view>
+	<view>
+		<view class="label">支付金额</view>
+		<view class="price">{{detail.payamount}}</view>
+	</view>
+	<view>
+		<view class="label">优惠金额</view>
+		<view class="price">{{detail.paydiscountamount}}</view>
+	</view>
+	<view>
+		<view class="label">优惠余额</view>
+		<view class="price">{{detail.discountamount_xjzh}}</view>
 	</view>
 </view>
-<view style="height: 10rpx;"></view>
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
 	<product slot='产品明细' id='Product' />
 	<record slot='操作记录' id='record' ownertable='st_stockbill' ownerid='{{st_stockbillid}}' />

packageA/deliveryConfirmation/modules/product/index.wxml

@@ -20,16 +20,13 @@
     单位：{{item.unitname || ' --'}}
   </view>
   <view class="row">
-    未税单价：{{item.price || ' --'}}
+    单价：{{item.price || ' --'}}
   </view>
   <view class="row">
     数量：{{item.qty || ' --'}}
   </view>
   <view class="row">
-    未税金额：{{item.amount || ' --'}}
-  </view>
-  <view class="row">
-    价税合计{{item.sum || ' --'}}
+    金额：{{item.amount || ' --'}}
   </view>
 </navigator>
 

packageA/favorites/index.js

@@ -247,6 +247,8 @@ Page({
               "sa_brandid": v.brand.length ? v.brand[0].sa_brandid : this.data.sa_brandid || 0,
               width: v.favoriteswidth || 0,
               length: v.favoriteslength || 0,
+              custamount: v.custamount || 0, // 客户档案资料费
+              amount: v.amount || 0, // 客户档案资料费
             }
           })
         }

packageA/fittings/index.wxml

@@ -6,7 +6,6 @@
         <van-tab title="提交" />
         <van-tab title="确认" />
         <van-tab title="审核" />
-        <van-tab title="手工关闭" />
         <van-tab title="关闭" />
     </van-tabs>
     <!-- <view class="tips">

packageA/fittings/modules/product/index.js

@@ -143,6 +143,8 @@ Component({
                 index = obj.index,
                 data = this.data.list[index];
             detail.sa_order_v = this.data.sa_order_v - 0;
+            detail.amount = detail.amount || 0;
+            detail.custamount = detail.custamount || 0;
             _Http.basic({
                 "id": 20221109093602,
                 "content": {
@@ -362,6 +364,7 @@ Component({
                             v.custamount = v.custamount || 0;
                             v.price = this.data.type == '工具订单' ? v.marketprice : v.contractprice;
                             v.delivery = this.data.delivery || this.data.deliverys[0].value
+                            v.amount = v.amount || 0;
                             return v
                         })
                     }
@@ -436,7 +439,11 @@ Component({
                     "id": 20221109093602,
                     "content": {
                         ...that.data.base,
-                        items,
+                        items:items.map(v=>{
+                            v.amount = v.amount || 0;
+                            v.custamount = v.custamount || 0;
+                            return v
+                        }),
                         sa_order_v: that.data.sa_order_v - 0
                     }
                 }).then(res => {

packageA/market/detail.js

@@ -326,6 +326,9 @@ Page({
 			qty: detail.qty, //数量
 			itemno: detail.itemno, //货品编号
 			custamount: detail.custamount || 0, // 客户档案资料费
+			amount: detail.amount || 0, // 客户档案资料费
+			width: detail.width || 0,
+			length: detail.length || 0,
 		}, custom)];
 
 

packageA/orderForm/detail.js

@@ -166,7 +166,7 @@ Page({
 				symbol: "￥",
 				precision: 2
 			}).format();
-			let item = Object.assign(this.data.detail.sa_accountclassinfos, res.data[0]);
+			let item = Object.assign(this.data.detail.sa_accountclassinfos || {}, res.data[0] || {});
 			item.balance = item.balance - 0 + item.discountamount - item.freezamount;
 			['amount', 'freezamount', 'discountamount', 'creditguota', 'balance'].forEach(v => item[v] = CNY(item[v]))
 			this.setData({

packageA/orderForm/modules/product/index.js

@@ -111,6 +111,8 @@ Component({
             detail.customcheek = '';
             detail.customcolors = '';
             detail.custommaterial = '';
+            detail.amount = detail.amount || 0;
+            detail.custamount = detail.custamount || 0;
             console.log("detail", detail)
             _Http.basic({
                 "id": 20221109093602,
@@ -328,6 +330,7 @@ Component({
                                 customcheek: '',
                                 customcolors: '',
                                 custommaterial: '',
+                                amount: v.amount || 0
                             }
                         })
                     }

pages/index/collect/index.js

@@ -93,7 +93,7 @@ Component({
 				list = res.data.map(v => {
 					v.showPrice = CNY(v.gradeprice)
 					v.oldprice = CNY(v.oldprice)
-					v.custamount = CNY(v.custamount)
+					v.showCustamount = CNY(v.custamount)
 					v.cover = (v.attinfos.length) ? _Http.getSpecifiedImage(v.attinfos[0]) : ""
 					let obj = allBrandList.find(s => s.sa_brandid == v.sa_brandid);
 					if (obj) {
@@ -161,6 +161,7 @@ Component({
 								"sa_brandid": v.sa_brandid,
 								"qty": v.qty,
 								custamount: v.custamount || 0, // 客户档案资料费
+								amount: v.amount || 0, // 客户档案资料费
 								width: v.width || 0,
 								length: v.length || 0,
 								sa_shoppingcartid: v.sa_shoppingcartid || 0

pages/index/collect/index.wxml

@@ -18,7 +18,7 @@
 					<view class="exp">品号：{{item.itemno}}</view>
 					<view class="exp">型号：{{item.model ||" --"}}</view>
 					<view class="exp">原单价：{{item.oldprice ||" --"}}</view>
-					<view class="exp">客户资料档案费：{{item.custamount ||" --"}}</view>
+					<view class="exp">客户资料档案费：{{item.showCustamount ||" --"}}</view>
 					<view class="price" style="bottom: {{item.iscustomsize?'40rpx':'0rpx'}};">{{handleHide.verify(item.showPrice,'购物车价格',privacyFieldC)}}/{{item.unitname}}</view>
 				</view>
 			</view>

pages/login/modules/agreement.js

@@ -30,7 +30,7 @@ Component({
                 title: '加载中...',
             })
             wx.downloadFile({
-                url: 'https://lsa79853.obs.cn-east-3.myhuaweicloud.com/system/%E6%9D%A5%E6%96%AF%E5%A5%A5E%E8%AE%A2%E5%8D%95.docx',
+        
                 success: (res) => {
                     wx.openDocument({
                         filePath: res.tempFilePath,