From d2e56aa3ae6d60eaa0506c0253d6b7281e9757f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 1 Mar 2023 22:54:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=A2=9E=E5=8A=A0=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/mixins/JeecgListMixin.js          | 6 +++++-
 jshERP-web/src/views/bill/AllocationOutList.vue  | 2 +-
 jshERP-web/src/views/bill/AssembleList.vue       | 2 +-
 jshERP-web/src/views/bill/DisassembleList.vue    | 2 +-
 jshERP-web/src/views/bill/OtherInList.vue        | 2 +-
 jshERP-web/src/views/bill/OtherOutList.vue       | 2 +-
 jshERP-web/src/views/bill/PurchaseBackList.vue   | 2 +-
 jshERP-web/src/views/bill/PurchaseInList.vue     | 2 +-
 jshERP-web/src/views/bill/PurchaseOrderList.vue  | 2 +-
 jshERP-web/src/views/bill/RetailBackList.vue     | 2 +-
 jshERP-web/src/views/bill/RetailOutList.vue      | 2 +-
 jshERP-web/src/views/bill/SaleBackList.vue       | 2 +-
 jshERP-web/src/views/bill/SaleOrderList.vue      | 2 +-
 jshERP-web/src/views/bill/SaleOutList.vue        | 2 +-
 jshERP-web/src/views/financial/AdvanceInList.vue | 2 +-
 jshERP-web/src/views/financial/GiroList.vue      | 2 +-
 jshERP-web/src/views/financial/ItemInList.vue    | 2 +-
 jshERP-web/src/views/financial/ItemOutList.vue   | 2 +-
 jshERP-web/src/views/financial/MoneyInList.vue   | 2 +-
 jshERP-web/src/views/financial/MoneyOutList.vue  | 2 +-
 20 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index cd61026c..bc51f553 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -272,7 +272,11 @@ export const JeecgListMixin = {
     },
     modalFormOk() {
       // 新增/修改 成功时，重载列表
-      this.loadData();
+      this.loadData()
+    },
+    modalFormClose() {
+      // 关闭页面时，重载列表
+      this.loadData()
     },
     handleDetail:function(record, type, prefixNo){
       this.$refs.modalDetail.show(record, type, prefixNo);
diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue
index baa137fa..d68d5ebb 100644
--- a/jshERP-web/src/views/bill/AllocationOutList.vue
+++ b/jshERP-web/src/views/bill/AllocationOutList.vue
@@ -128,7 +128,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <allocation-out-modal ref="modalForm" @ok="modalFormOk"></allocation-out-modal>
-        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue
index 355bfffb..6f65cb89 100644
--- a/jshERP-web/src/views/bill/AssembleList.vue
+++ b/jshERP-web/src/views/bill/AssembleList.vue
@@ -128,7 +128,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <assemble-modal ref="modalForm" @ok="modalFormOk"></assemble-modal>
-        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue
index c2cd5b26..458aafc3 100644
--- a/jshERP-web/src/views/bill/DisassembleList.vue
+++ b/jshERP-web/src/views/bill/DisassembleList.vue
@@ -128,7 +128,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <disassemble-modal ref="modalForm" @ok="modalFormOk"></disassemble-modal>
-        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue
index ae1e7419..af98e61c 100644
--- a/jshERP-web/src/views/bill/OtherInList.vue
+++ b/jshERP-web/src/views/bill/OtherInList.vue
@@ -142,7 +142,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <other-in-modal ref="modalForm" @ok="modalFormOk"></other-in-modal>
-        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue
index 984374ad..ebb969d2 100644
--- a/jshERP-web/src/views/bill/OtherOutList.vue
+++ b/jshERP-web/src/views/bill/OtherOutList.vue
@@ -142,7 +142,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <other-out-modal ref="modalForm" @ok="modalFormOk"></other-out-modal>
-        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue
index ae905121..4e9ba969 100644
--- a/jshERP-web/src/views/bill/PurchaseBackList.vue
+++ b/jshERP-web/src/views/bill/PurchaseBackList.vue
@@ -151,7 +151,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <purchase-back-modal ref="modalForm" @ok="modalFormOk"></purchase-back-modal>
-        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue
index 1bd566cf..1f6662b4 100644
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -170,7 +170,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <purchase-in-modal ref="modalForm" @ok="modalFormOk"></purchase-in-modal>
-        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue
index b11a2551..efdfe660 100644
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -133,7 +133,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <purchase-order-modal ref="modalForm" @ok="modalFormOk"></purchase-order-modal>
-        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue
index 81306d1c..fabfc0ae 100644
--- a/jshERP-web/src/views/bill/RetailBackList.vue
+++ b/jshERP-web/src/views/bill/RetailBackList.vue
@@ -151,7 +151,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <retail-back-modal ref="modalForm" @ok="modalFormOk"></retail-back-modal>
-        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue
index d6ec6ed7..72948fd4 100644
--- a/jshERP-web/src/views/bill/RetailOutList.vue
+++ b/jshERP-web/src/views/bill/RetailOutList.vue
@@ -146,7 +146,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <retail-out-modal ref="modalForm" @ok="modalFormOk"></retail-out-modal>
-        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue
index 950d3e87..22d9b06b 100644
--- a/jshERP-web/src/views/bill/SaleBackList.vue
+++ b/jshERP-web/src/views/bill/SaleBackList.vue
@@ -152,7 +152,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <sale-back-modal ref="modalForm" @ok="modalFormOk"></sale-back-modal>
-        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index 0319d03c..80e1a410 100644
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -139,7 +139,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <sale-order-modal ref="modalForm" @ok="modalFormOk"></sale-order-modal>
-        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue
index 86a38660..f6b78265 100644
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@@ -171,7 +171,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <sale-out-modal ref="modalForm" @ok="modalFormOk"></sale-out-modal>
-        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue
index 22c16f32..c309b194 100644
--- a/jshERP-web/src/views/financial/AdvanceInList.vue
+++ b/jshERP-web/src/views/financial/AdvanceInList.vue
@@ -131,7 +131,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <advance-in-modal ref="modalForm" @ok="modalFormOk"></advance-in-modal>
-        <financial-detail ref="modalDetail" @ok="modalFormOk"></financial-detail>
+        <financial-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></financial-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue
index 22c1b19e..280e115c 100644
--- a/jshERP-web/src/views/financial/GiroList.vue
+++ b/jshERP-web/src/views/financial/GiroList.vue
@@ -131,7 +131,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <giro-modal ref="modalForm" @ok="modalFormOk"></giro-modal>
-        <financial-detail ref="modalDetail" @ok="modalFormOk"></financial-detail>
+        <financial-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></financial-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue
index 866d70d2..5ade1b93 100644
--- a/jshERP-web/src/views/financial/ItemInList.vue
+++ b/jshERP-web/src/views/financial/ItemInList.vue
@@ -140,7 +140,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <item-in-modal ref="modalForm" @ok="modalFormOk"></item-in-modal>
-        <financial-detail ref="modalDetail" @ok="modalFormOk"></financial-detail>
+        <financial-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></financial-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue
index adc64f42..526e707a 100644
--- a/jshERP-web/src/views/financial/ItemOutList.vue
+++ b/jshERP-web/src/views/financial/ItemOutList.vue
@@ -140,7 +140,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <item-out-modal ref="modalForm" @ok="modalFormOk"></item-out-modal>
-        <financial-detail ref="modalDetail" @ok="modalFormOk"></financial-detail>
+        <financial-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></financial-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue
index 23a0308c..94f3cb71 100644
--- a/jshERP-web/src/views/financial/MoneyInList.vue
+++ b/jshERP-web/src/views/financial/MoneyInList.vue
@@ -146,7 +146,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <money-in-modal ref="modalForm" @ok="modalFormOk"></money-in-modal>
-        <financial-detail ref="modalDetail" @ok="modalFormOk"></financial-detail>
+        <financial-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></financial-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue
index 8e4cdc4b..10e7f6bd 100644
--- a/jshERP-web/src/views/financial/MoneyOutList.vue
+++ b/jshERP-web/src/views/financial/MoneyOutList.vue
@@ -146,7 +146,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <money-out-modal ref="modalForm" @ok="modalFormOk"></money-out-modal>
-        <financial-detail ref="modalDetail" @ok="modalFormOk"></financial-detail>
+        <financial-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></financial-detail>
       </a-card>
     </a-col>
   </a-row>