From 8814917af2382339807a73c6ecc335064b66ce11 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 29 Apr 2025 15:12:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=94=B6=E6=AC=BE=E5=8D=95=E5=92=8C?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=8D=95=E7=9A=84=E6=96=B0=E5=A2=9E=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=BF=AB=E6=8D=B7=E6=94=B6=E6=AC=BE?=
 =?UTF-8?q?=E6=88=96=E4=BB=98=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/financial/dialog/WaitNeedList.vue     |  2 +-
 .../views/financial/mixins/FinancialModalMixin.js   | 13 +++++++++++--
 .../src/views/financial/modules/MoneyInModal.vue    |  2 ++
 .../src/views/financial/modules/MoneyOutModal.vue   |  2 ++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/src/views/financial/dialog/WaitNeedList.vue b/jshERP-web/src/views/financial/dialog/WaitNeedList.vue
index 55cd10b7..04f2df02 100644
--- a/jshERP-web/src/views/financial/dialog/WaitNeedList.vue
+++ b/jshERP-web/src/views/financial/dialog/WaitNeedList.vue
@@ -178,7 +178,7 @@
         getAction('/depotHead/debtList', params).then((res) => {
           if (res.code === 200) {
             this.selectBillRows = res.data.rows
-            this.$emit('ok', record.id, this.selectBillRows)
+            this.$emit('ok', this.organType, record.id, this.selectBillRows)
             this.selectBillRows = []
             this.close()
           }
diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
index d2e44bb7..665719a8 100644
--- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
+++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
@@ -234,12 +234,14 @@ export const FinancialModalMixin = {
     workflowModalFormOk() {
       this.close()
     },
-    waitNeedListOk(organId, selectBillRows) {
+    waitNeedListOk(organType, organId, selectBillRows) {
       if(organId) {
         this.form.setFieldsValue({'organId': organId})
       }
       if (selectBillRows && selectBillRows.length > 0) {
         this.requestSubTableDataEx(selectBillRows, this.accountTable);
+      } else {
+        this.selectBeginNeed(organType)
       }
     },
     onAdded(event) {
@@ -305,7 +307,7 @@ export const FinancialModalMixin = {
       }
       tab.dataSource = listEx
       this.$nextTick(() => {
-        this.form.setFieldsValue({'totalPrice':changeAmount, 'changeAmount':changeAmount})
+        this.form.setFieldsValue({'totalPrice':changeAmount.toFixed(2), 'changeAmount':changeAmount.toFixed(2)})
       });
       typeof success === 'function' ? success(res) : ''
       tab.loading = false
@@ -331,6 +333,9 @@ export const FinancialModalMixin = {
                 listEx.push(info)
                 that.accountTable.dataSource = listEx
                 let changeAmount = info.eachAmount
+                if(changeAmount) {
+                  changeAmount = changeAmount.toFixed(2)
+                }
                 that.$nextTick(() => {
                   that.form.setFieldsValue({'totalPrice':changeAmount, 'changeAmount':changeAmount})
                 })
@@ -344,6 +349,10 @@ export const FinancialModalMixin = {
         that.$message.warning('请选择' + type + '！');
       }
     },
+    //选择-待收款或者待付款
+    handleWaitNeed(type) {
+      this.$refs.waitNeedList.show(type)
+    },
     //保存并审核
     handleOkAndCheck() {
       this.billStatus = '1'
diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
index ca101c7a..f2ccf1f7 100644
--- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
@@ -72,6 +72,8 @@
               <span class="gap"></span>
               <a-button type="primary" icon="plus" @click="selectBeginNeed('客户')">选择期初</a-button>
               <span class="gap"></span>
+              <a-button icon="link" @click="handleWaitNeed('客户')">待收款</a-button>
+              <span class="gap"></span>
               <a-button icon="minus" @click="handleClear">清空</a-button>
             </div>
           </a-col>
diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
index f5f81ca5..41250cc6 100644
--- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
@@ -72,6 +72,8 @@
               <span class="gap"></span>
               <a-button type="primary" icon="plus" @click="selectBeginNeed('供应商')">选择期初</a-button>
               <span class="gap"></span>
+              <a-button icon="link" @click="handleWaitNeed('供应商')">待付款</a-button>
+              <span class="gap"></span>
               <a-button icon="minus" @click="handleClear">清空</a-button>
             </div>
           </a-col>