Browse Source

修改逻辑

xiaohaizhao 2 năm trước cách đây
mục cha
commit
00ac967f3d
2 tập tin đã thay đổi với 34 bổ sung28 xóa
  1. 2 3
      packageA/remitVoucher/detail.js
  2. 32 25
      packageA/remitVoucher/update.js

+ 2 - 3
packageA/remitVoucher/detail.js

@@ -283,13 +283,12 @@ Page({
 		this.partialRenewal();
 	},
 	onUnload() {
-		console.log("更新列表数据")
 		let page = getCurrentPages().find(v => v.__route__ == 'packageA/remitVoucher/index');
 		let content = JSON.parse(JSON.stringify(page.data.content));
-		content.pageNumber = 1;
 		content.pageSize = (page.data.content.pageNumber - 1) * page.data.content.pageSize;
+		content.pageNumber = 1;
 		_Http.basic({
-			"id": 20230111141104,
+			"id": 20221226152904,
 			content
 		}).then(res => {
 			console.log("更新订单列表", res)

+ 32 - 25
packageA/remitVoucher/update.js

@@ -31,14 +31,14 @@ Page({
                             "condition": ""
                         }
                     }
-                  },
+                },
                 query: '&radio=true',
                 value: "",
                 placeholder: "选择经销商信息",
                 valueName: "sys_enterpriseid",
                 checking: "base",
                 required: true,
-                interrupt:true
+                interrupt: true
             },
             {
                 label: "付款人",
@@ -49,8 +49,8 @@ Page({
                 placeholder: "付款人",
                 valueName: "payer",
                 required: false,
-                disabled:true
-            },{
+                disabled: true
+            }, {
                 label: "银行账号",
                 error: false,
                 errMsg: "",
@@ -59,9 +59,9 @@ Page({
                 placeholder: "银行账号",
                 valueName: "bankcardno",
                 required: false,
-                disabled:true
+                disabled: true
 
-            },{
+            }, {
                 label: "银行",
                 error: false,
                 errMsg: "",
@@ -70,27 +70,27 @@ Page({
                 placeholder: "银行",
                 valueName: "bank",
                 required: false,
-                disabled:true
-            },{
+                disabled: true
+            }, {
                 label: "付款时间",
                 error: false,
                 errMsg: "",
                 type: "date",
-                value: getTime.formatTime(new Date(),'-').split(' ')[0],
+                value: getTime.formatTime(new Date(), '-').split(' ')[0],
                 placeholder: "请选择付款时间",
                 valueName: "paydate",
                 required: true,
-            },{
+            }, {
                 label: "打款总金额",
                 error: false,
                 errMsg: "",
-                type: "number",
+                type: "digit",
                 value: "",
                 placeholder: "请输入打款总金额",
                 valueName: "amount",
                 required: true,
 
-            },{
+            }, {
                 label: "转入银行",
                 error: false,
                 errMsg: "",
@@ -142,8 +142,8 @@ Page({
                     }
                     return v
                 }),
-                'form[0].value': [data.enterprisename,[data.sys_enterpriseid]],
-                'content.sa_paybillid':data.sa_paybillid
+                'form[0].value': [data.enterprisename, [data.sys_enterpriseid]],
+                'content.sa_paybillid': data.sa_paybillid
             })
             this.selectComponent('#Form').confirm()
             console.log(this.data.form);
@@ -158,17 +158,17 @@ Page({
         detail.form[2].value = ''
         detail.form[3].value = ''
         detail.form[detail.temporary.index].value = detail.data.value
-        this.queryMoneyInfo(detail.data.id[0],detail.form)
+        this.queryMoneyInfo(detail.data.id[0], detail.form)
 
         this.selectComponent('#Form').confirm()
         wx.navigateBack()
     },
     /* 获取财务信息 */
-    async queryMoneyInfo (id,form) {
+    async queryMoneyInfo(id, form) {
         let res = await _Http.basic({
             "id": 20221013160602,
             "content": {
-                "sys_enterpriseid":id,
+                "sys_enterpriseid": id,
                 "pageNumber": 1,
                 "pageSize": 20,
                 "where": {
@@ -180,7 +180,7 @@ Page({
         form[2].value = res.data[0].bank
         form[3].value = res.data[0].bankcardno
         this.setData({
-            form:form
+            form: form
         })
         console.log(this.data.form);
     },
@@ -196,13 +196,20 @@ Page({
         })
         console.log(res);
         if (res.msg == '成功') {
-            wx.navigateBack()
-            getCurrentPages().forEach(item => {
-                if (item.__route__ == 'packageA/remitVoucher/index') {
-                    item.getList(true)
-                } else if (item.__route__ == 'packageA/remitVoucher/detail') {
-                    item.getDetail(true)
-                }
+            let page = getCurrentPages()[getCurrentPages().length - 2];
+            if (page.__route__ == 'packageA/remitVoucher/index') {
+                wx.redirectTo({
+                    url: '/packageA/remitVoucher/detail?id=' + res.data.sa_paybillid,
+                })
+            } else if (page.__route__ == 'packageA/remitVoucher/detail') {
+                wx.navigateBack();
+                page.getDetail(true)
+            }
+        } else {
+            wx.showToast({
+                title: res.msg,
+                icon: "none",
+                mask: true
             })
         }
     },