From 2b7c43c3e1300ba2157170b18767fd6a27916e33 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Wed, 21 May 2025 22:45:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=B4=A2=E5=8A=A1=E7=9A=84=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E5=8D=95=E5=92=8C=E4=BB=98=E6=AC=BE=E5=8D=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8B=BE=E9=80=89=E5=88=A0=E9=99=A4=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financial/mixins/FinancialModalMixin.js   |  5 ++
 .../views/financial/modules/MoneyInModal.vue  | 63 +++++++++----------
 .../views/financial/modules/MoneyOutModal.vue | 60 +++++++++---------
 3 files changed, 67 insertions(+), 61 deletions(-)

diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
index 665719a8..a700bc15 100644
--- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
+++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
@@ -252,6 +252,11 @@ export const FinancialModalMixin = {
         that.$refs.accountDataTable.resetScrollTop((target.rows.length+1)*that.$refs.accountDataTable.rowHeight)
       },1000)
     },
+    //删除一行或多行的时候触发
+    onDeleted(ids, target) {
+      target.recalcAllStatisticsColumns()
+      this.autoChangeAmount(target)
+    },
     //单元值改变一个字符就触发一次
     onValueChange(event) {
       let that = this
diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
index f2ccf1f7..a39a7851 100644
--- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
@@ -64,35 +64,37 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="12" :md="12" :sm="24">
-            <!-- 操作按钮 -->
-            <div class="action-button">
-              <a-button type="primary" icon="plus" @click="handleClickAdd">选择单据</a-button>
-              <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>
-        </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :span="24">
-            <j-editable-table
-              :ref="refKeys[0]"
-              :loading="accountTable.loading"
-              :columns="accountTable.columns"
-              :dataSource="accountTable.dataSource"
-              :minWidth="minWidth"
-              :maxHeight="300"
-              :rowNumber="true"
-              :rowSelection="false"
-              :actionButton="false"
-              @valueChange="onValueChange" />
-          </a-col>
-        </a-row>
+        <j-editable-table
+          :ref="refKeys[0]"
+          :loading="accountTable.loading"
+          :columns="accountTable.columns"
+          :dataSource="accountTable.dataSource"
+          :minWidth="minWidth"
+          :maxHeight="300"
+          :rowNumber="true"
+          :rowSelection="true"
+          :actionButton="false"
+          :actionDeleteButton="true"
+          @deleted="onDeleted"
+          @valueChange="onValueChange">
+          <template #buttonBefore>
+            <a-row :gutter="24" style="float:left;padding-bottom:8px;">
+              <a-col :md="12" :sm="24">
+                <a-button type="primary" icon="plus" @click="handleClickAdd">选择单据</a-button>
+              </a-col>
+              <a-col :md="12" :sm="24" style="padding-left:0">
+                <a-button type="primary" icon="plus" @click="selectBeginNeed('客户')">选择期初</a-button>
+              </a-col>
+            </a-row>
+          </template>
+          <template #buttonAfter>
+            <a-row :gutter="24" style="float:left;padding-bottom:8px;">
+              <a-col :md="12" :sm="24">
+                <a-button icon="link" @click="handleWaitNeed('客户')">待收款</a-button>
+              </a-col>
+            </a-row>
+          </template>
+        </j-editable-table>
         <a-row class="form-row" :gutter="24">
           <a-col :lg="24" :md="24" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
@@ -302,9 +304,6 @@
         } else {
           this.$message.warning('请选择客户！');
         }
-      },
-      handleClear() {
-        this.accountTable.dataSource = []
       }
     }
   }
diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
index 41250cc6..f934d679 100644
--- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
@@ -64,35 +64,37 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="12" :md="12" :sm="24">
-            <!-- 操作按钮 -->
-            <div class="action-button">
-              <a-button type="primary" icon="plus" @click="handleClickAdd">选择单据</a-button>
-              <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>
-        </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :span="24">
-            <j-editable-table
-              :ref="refKeys[0]"
-              :loading="accountTable.loading"
-              :columns="accountTable.columns"
-              :dataSource="accountTable.dataSource"
-              :minWidth="minWidth"
-              :maxHeight="300"
-              :rowNumber="true"
-              :rowSelection="false"
-              :actionButton="false"
-              @valueChange="onValueChange" />
-          </a-col>
-        </a-row>
+        <j-editable-table
+          :ref="refKeys[0]"
+          :loading="accountTable.loading"
+          :columns="accountTable.columns"
+          :dataSource="accountTable.dataSource"
+          :minWidth="minWidth"
+          :maxHeight="300"
+          :rowNumber="true"
+          :rowSelection="true"
+          :actionButton="false"
+          :actionDeleteButton="true"
+          @deleted="onDeleted"
+          @valueChange="onValueChange">
+          <template #buttonBefore>
+            <a-row :gutter="24" style="float:left;padding-bottom:8px;">
+              <a-col :md="12" :sm="24">
+                <a-button type="primary" icon="plus" @click="handleClickAdd">选择单据</a-button>
+              </a-col>
+              <a-col :md="12" :sm="24" style="padding-left:0">
+                <a-button type="primary" icon="plus" @click="selectBeginNeed('供应商')">选择期初</a-button>
+              </a-col>
+            </a-row>
+          </template>
+          <template #buttonAfter>
+            <a-row :gutter="24" style="float:left;padding-bottom:8px;">
+              <a-col :md="12" :sm="24">
+                <a-button icon="link" @click="handleWaitNeed('供应商')">待付款</a-button>
+              </a-col>
+            </a-row>
+          </template>
+        </j-editable-table>
         <a-row class="form-row" :gutter="24">
           <a-col :lg="24" :md="24" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">