Browse Source

列表修改

zhaoxiaohai 2 years ago
parent
commit
4d2557d0e1

+ 14 - 3
packageA/orderForm/index.js

@@ -2,7 +2,7 @@ const _Http = getApp().globalData.http;
 
 Page({
     data: {
-        active: 0,
+        active: 1,
         loading: true,
         amount: 0,
         "content": {
@@ -42,7 +42,7 @@ Page({
                 "content.sort": res.sort,
                 "content.total": res.total,
                 loading: false,
-                amount: res.tips.amount||0
+                amount: res.tips.amount || 0
             })
         })
     },
@@ -57,7 +57,18 @@ Page({
     },
     /* 切换tabs */
     tabsChange(e) {
-        let status = e.detail.title == '全部' ? "" : e.detail.title;
+        let status = "";
+        switch (e.detail.title) {
+            case '全部':
+                status = "";
+                break;
+            case '待确认':
+                status = "交期待确认";
+                break;
+            default:
+                status = e.detail.title
+                break;
+        }
         this.setData({
             active: e.detail.index,
             "content.where.status": status

+ 2 - 0
packageA/orderForm/index.wxml

@@ -5,6 +5,8 @@
     <van-tab title="全部" />
     <van-tab title="新建" />
     <van-tab title="提交" />
+    <van-tab title="待确认" />
+    <van-tab title="交期确认" />
     <van-tab title="审核" />
     <van-tab title="关闭" />
 </van-tabs>

+ 4 - 4
packageA/orderForm/modules/list/index.wxml

@@ -11,19 +11,19 @@
     </view>
     <view class="content">
         <view class="num">
-            订单号:{{item.sonum}}
+            {{item.type}}:{{item.sonum}}
         </view>
         <view class="exp">
-            区域经理:{{item.name}}
+            区域经理:{{item.name || ' --'}}
         </view>
         <view class="exp">
-            单据日期:{{item.createdate}}
+            单据时间:{{item.createdate}}
         </view>
         <view class="exp">
             共计{{item.qty}}件商品
         </view>
         <view class="amount">
-            合计:¥{{item.amount}}
+            合计:¥{{item.amount}}
         </view>
     </view>
 

+ 41 - 16
packageA/orderForm/modules/product/index.js

@@ -102,7 +102,6 @@ Component({
 				index = this.data.list.findIndex(v => v.itemid == detail.itemid),
 				data = this.data.list[index],
 				calculatePrice = data.qty != obj.qty;
-
 			if (data.qty == obj.qty && data.remarks == obj.remarks && data.needdate == obj.needdate) return;
 			_Http.basic({
 				"id": 20221109093602,
@@ -125,18 +124,19 @@ Component({
 				};
 				if (res.msg == '成功' && calculatePrice) {
 					let page = getCurrentPages()[getCurrentPages().length - 1];
-					let amount = page.data.detail.amount - data.amount;
-					data.amount = ((data.qty - 0) * (data.price - 0)).toFixed(2);
-					amount = amount + (data.amount - 0);
-					page.setData({
-						"detail.amount": amount
-					})
+					if (page) {
+						let amount = page.data.detail.amount - data.amount;
+						data.amount = ((data.qty - 0) * (data.price - 0)).toFixed(2);
+						amount = (amount + (data.amount - 0)).toFixed(2);
+						page.setData({
+							"detail.amount": amount - 0
+						})
+					}
 				}
 				this.setData({
 					[`list[${index}]`]: data
 				})
 			})
-
 		},
 		/* 删除 */
 		deleteItem({
@@ -148,21 +148,26 @@ Component({
 				content: `是否确认删除“${detail.itemname}”?`,
 				complete: (res) => {
 					if (res.confirm) _Http.basic({
-						"id": 20221108152102,
+						"id": 20221109093702,
 						"content": {
-							"sa_orderids": [
-								detail.sa_orderid
-							],
-							"deletereason": "" //删除原因,可选
-						},
-						"accesstoken": "bde1f111b04ad5fbd8a4b0803e0d6df6"
+							sa_orderid: detail.sa_orderid,
+							"sa_orderitemsids": [
+								detail.sa_orderitemsid
+							]
+						}
 					}).then(s => {
 						if (s.msg != '成功') return wx.showToast({
 							title: res.msg,
 							icon: "none"
 						});
 						that.setData({
-							list: that.data.list.filter(v => v.itemid != detail.itemid)
+							list: that.data.list.filter(v => v.sa_orderitemsid != detail.sa_orderitemsid)
+						});
+						/* 更新金额 */
+						let page = getCurrentPages()[getCurrentPages().length - 1];
+						let amount = (page.data.detail.amount - detail.amount).toFixed(2);
+						if (page) page.setData({
+							"detail.amount": amount - 0
 						})
 					})
 				}
@@ -216,10 +221,30 @@ Component({
 						if (s.msg == '成功') setTimeout(() => {
 							that.getList(that.data.sa_orderid, true);
 							wx.navigateBack();
+							that.updateThePrice();
 						}, 300)
 					})
 				}
 			});
+		},
+		/* 使用接口更新总价 */
+		updateThePrice() {
+			_Http.basic({
+				"id": 20230105101102,
+				"content": {
+					"sa_orderid": this.data.sa_orderid
+				},
+			}).then(res => {
+				console.log("获取列表总价", res)
+				if (res.msg != '成功') return wx.showToast({
+					title: `产品总价更新失败`,
+					icon: "none"
+				});
+				let page = getCurrentPages()[getCurrentPages().length - 1];
+				if (page) page.setData({
+					"detail.amount": res.data.amount - 0
+				})
+			})
 		}
 	}
 })