From f682cee831e7d125566f5186abcaafc6330c5831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 10 Jul 2021 21:21:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=95=E6=8D=AE=E4=B8=AD?=
 =?UTF-8?q?=E5=A4=9A=E8=B4=A6=E6=88=B7=E5=B1=95=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/bill/dialog/ManyAccountModal.vue    | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue b/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
index 55d5ed4e..6e0e6d0d 100644
--- a/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
+++ b/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
@@ -95,16 +95,20 @@
       edit (idStr, moneyStr) {
         this.form.resetFields();
         this.model = Object.assign({}, {});
+        let idList = [], moneyList = []
         if(idStr && idStr.indexOf(',')>-1) {
-          let idList = idStr.split(",")
-          if(idList[0]) {this.model.oneAccountId = idList[0]-0}
-          if(idList[1]) {this.model.twoAccountId = idList[1]-0}
-          if(idList[2]) {this.model.threeAccountId = idList[2]-0}
-          let moneyList = moneyStr.split(",")
-          if(moneyList[0]) {this.model.oneAccountPrice = Math.abs(moneyList[0])}
-          if(moneyList[1]) {this.model.twoAccountPrice = Math.abs(moneyList[1])}
-          if(moneyList[2]) {this.model.threeAccountPrice = Math.abs(moneyList[2])}
+          idList = idStr.split(",")
+          moneyList = moneyStr.split(",")
+        } else {
+          idList = idStr
+          moneyList = moneyStr
         }
+        if(idList[0]) {this.model.oneAccountId = idList[0]-0}
+        if(idList[1]) {this.model.twoAccountId = idList[1]-0}
+        if(idList[2]) {this.model.threeAccountId = idList[2]-0}
+        if(moneyList[0]) {this.model.oneAccountPrice = Math.abs(moneyList[0])}
+        if(moneyList[1]) {this.model.twoAccountPrice = Math.abs(moneyList[1])}
+        if(moneyList[2]) {this.model.threeAccountPrice = Math.abs(moneyList[2])}
         this.visible = true;
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model,'oneAccountId','oneAccountPrice',
@@ -122,8 +126,9 @@
           if (!err) {
             let allPrice = 0
             that.confirmLoading = true;
+            that.accountIdList = []
+            that.accountMoneyList = []
             let formData = Object.assign(this.model, values);
-            console.log(formData)
             if(formData.oneAccountId!==undefined) {
               that.accountIdList.push(formData.oneAccountId)
             }
@@ -146,6 +151,7 @@
               allPrice = allPrice + formData.threeAccountPrice
             }
             that.$emit('ok', that.accountIdList, that.accountMoneyList, allPrice);
+            that.confirmLoading = false;
             that.close();
           }
         })