From ff9e778a76577ff7e8688342da22ce588e22769c 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:40:02 +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=E9=87=91=E9=A2=9D=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/mixins/BillModalMixin.js   | 12 +++++++++++-
 .../src/views/bill/modules/PurchaseBackModal.vue     |  9 +--------
 .../src/views/bill/modules/PurchaseInModal.vue       |  9 +--------
 jshERP-web/src/views/bill/modules/SaleBackModal.vue  |  9 +--------
 jshERP-web/src/views/bill/modules/SaleOutModal.vue   |  7 -------
 5 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index eebb4291..41cde44a 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -1,7 +1,7 @@
 import { VALIDATE_NO_PASSED, validateFormAndTables } from '@/utils/JEditableTableUtil'
 import {findBySelectSup,findBySelectCus,findBySelectRetail,getMaterialByBarCode,findStockByDepotAndBarCode,getAccount,getPersonByNumType} from '@/api/api'
 import { getAction,putAction } from '@/api/manage'
-import { getMpListShort, getNowFormatDateTime } from "@/utils/util"
+import { getMpListShort, getNowFormatDateTime, changeListFmtMinus } from "@/utils/util"
 import Vue from 'vue'
 
 export const BillModalMixin = {
@@ -150,6 +150,16 @@ export const BillModalMixin = {
         this.manyAccountBtnStatus = false
       }
     },
+    manyAccountModalFormOk(idList, moneyList, allPrice) {
+      this.accountIdList = idList
+      this.accountMoneyList = changeListFmtMinus(moneyList)
+      let discountLastMoney = this.form.getFieldValue('discountLastMoney')-0
+      let otherMoney = this.form.getFieldValue('otherMoney')-0
+      let debt = (discountLastMoney + otherMoney - allPrice).toFixed(2)
+      this.$nextTick(() => {
+        this.form.setFieldsValue({'changeAmount':allPrice, 'debt':debt})
+      });
+    },
     onAdded(event) {
       const { row, target } = event
       getAction('/depot/findDepotByCurrentUser').then((res) => {
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 0b5c0e55..1ddb00f9 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -130,7 +130,7 @@
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
-  import { getMpListShort, changeListFmtMinus} from "@/utils/util"
+  import { getMpListShort} from "@/utils/util"
   import { getAction } from '@/api/manage'
   import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
@@ -275,13 +275,6 @@
           rows: JSON.stringify(detailArr),
         }
       },
-      manyAccountModalFormOk(idList, moneyList, allPrice) {
-        this.accountIdList = idList
-        this.accountMoneyList = changeListFmtMinus(moneyList)
-        this.$nextTick(() => {
-          this.form.setFieldsValue({'changeAmount':allPrice})
-        });
-      },
       onSearchLinkNumber() {
         this.$refs.linkBillList.show('入库', '采购', '供应商', "0")
         this.$refs.linkBillList.title = "选择采购入库"
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 7ee93ec0..6525d8a3 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -131,7 +131,7 @@
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
-  import { getMpListShort, changeListFmtMinus} from "@/utils/util"
+  import { getMpListShort} from "@/utils/util"
   import { getAction } from '@/api/manage'
   import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
@@ -282,13 +282,6 @@
           rows: JSON.stringify(detailArr),
         }
       },
-      manyAccountModalFormOk(idList, moneyList, allPrice) {
-        this.accountIdList = idList
-        this.accountMoneyList = changeListFmtMinus(moneyList)
-        this.$nextTick(() => {
-          this.form.setFieldsValue({'changeAmount':allPrice})
-        });
-      },
       onSearchLinkNumber() {
         this.$refs.linkBillList.show('其它', '采购订单', '供应商', "1")
         this.$refs.linkBillList.title = "选择采购订单"
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index fd1a3c4d..1b3bedb1 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -133,7 +133,7 @@
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
-  import { getMpListShort, changeListFmtMinus } from "@/utils/util"
+  import { getMpListShort } from "@/utils/util"
   import { getAction } from '@/api/manage'
   import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
   import JUpload from '@/components/jeecg/JUpload'
@@ -289,13 +289,6 @@
           rows: JSON.stringify(detailArr),
         }
       },
-      manyAccountModalFormOk(idList, moneyList, allPrice) {
-        this.accountIdList = idList
-        this.accountMoneyList = changeListFmtMinus(moneyList)
-        this.$nextTick(() => {
-          this.form.setFieldsValue({'changeAmount':allPrice})
-        });
-      },
       onSearchLinkNumber() {
         this.$refs.linkBillList.show('出库', '销售', '客户', "0")
         this.$refs.linkBillList.title = "选择销售出库"
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index a98e5495..3481a65f 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -288,13 +288,6 @@
           rows: JSON.stringify(detailArr),
         }
       },
-      manyAccountModalFormOk(idList, moneyList, allPrice) {
-        this.accountIdList = idList
-        this.accountMoneyList = moneyList
-        this.$nextTick(() => {
-          this.form.setFieldsValue({'changeAmount':allPrice})
-        });
-      },
       onSearchLinkNumber() {
         this.$refs.linkBillList.show('其它', '销售订单', '客户', "1")
         this.$refs.linkBillList.title = "选择销售订单"