From 084c047b6c0a090b049b07c140b7808b9378ff3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 18 May 2023 23:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=8D=95=E6=8D=AE=E4=B8=AD=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E6=96=B0=E5=A2=9E=E5=92=8C=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=8C=AA=E5=8A=A8=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/jeecg/JEditableTable.vue   | 18 +++++++++++---
 .../src/views/bill/mixins/BillModalMixin.js   |  2 +-
 .../views/bill/modules/AllocationOutModal.vue | 18 ++++++--------
 .../src/views/bill/modules/AssembleModal.vue  | 18 ++++++--------
 .../views/bill/modules/DisassembleModal.vue   | 18 ++++++--------
 .../src/views/bill/modules/OtherInModal.vue   | 18 ++++++--------
 .../src/views/bill/modules/OtherOutModal.vue  | 18 ++++++--------
 .../views/bill/modules/PurchaseBackModal.vue  | 18 ++++++--------
 .../views/bill/modules/PurchaseInModal.vue    | 24 ++++++++-----------
 .../views/bill/modules/RetailBackModal.vue    | 18 ++++++--------
 .../src/views/bill/modules/RetailOutModal.vue | 18 ++++++--------
 .../src/views/bill/modules/SaleBackModal.vue  | 18 ++++++--------
 .../src/views/bill/modules/SaleOutModal.vue   | 20 +++++++---------
 13 files changed, 97 insertions(+), 129 deletions(-)

diff --git a/jshERP-web/src/components/jeecg/JEditableTable.vue b/jshERP-web/src/components/jeecg/JEditableTable.vue
index 5608dbfe..ca554f17 100644
--- a/jshERP-web/src/components/jeecg/JEditableTable.vue
+++ b/jshERP-web/src/components/jeecg/JEditableTable.vue
@@ -60,7 +60,10 @@
               class="td"
               :key="col.key"
               :style="buildTdStyle(col)">
-              <span style="padding: 0 5px;">{{ col.title }}</span>
+              <span style="padding: 0 5px;">
+                {{ col.title }}
+                <slot name="depotBatchSet" v-if="col.key === 'depotId'" :target="getVM()"/>
+              </span>
             </div>
           </template>
         </div>
@@ -208,7 +211,10 @@
                           @blur="(v)=>handleBlurSearch(v,id,row,col)"
                           allowClear
                         >
-
+                          <div slot="dropdownRender" slot-scope="menu">
+                            <v-nodes :vnodes="menu" />
+                            <slot name="depotAdd" v-if="col.key === 'depotId'" :target="getVM()"/>
+                          </div>
                           <!--<template v-for="(opt,optKey) in col.options">-->
                           <!--<a-select-option :value="opt.value" :key="optKey">{{ opt.title }}</a-select-option>-->
                           <!--</template>-->
@@ -779,7 +785,13 @@
 
   export default {
     name: 'JEditableTable',
-    components: { JDate, Draggable, JInputPop, JFilePop, JSelectList },
+    components: {
+      JDate, Draggable, JInputPop, JFilePop, JSelectList,
+      VNodes: {
+        functional: true,
+        render: (h, ctx) => ctx.props.vnodes,
+      }
+    },
     provide() {
       return {
         parentIsJEditableTable: true,
diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index f1860e66..fa670d40 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -260,7 +260,7 @@ export const BillModalMixin = {
     },
     handleBatchSetDepot() {
       this.$refs.batchSetDepotModalForm.add();
-      this.$refs.batchSetDepotModalForm.title = "批量设置仓库";
+      this.$refs.batchSetDepotModalForm.title = "批量切换仓库";
       this.$refs.batchSetDepotModalForm.disableSubmit = false;
     },
     addDepot() {
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index da540185..758cd6eb 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -58,17 +58,13 @@
                 <a-button @click="stopScan">收起扫码</a-button>
               </a-col>
             </a-row>
-            <a-row :gutter="24" style="float:left;">
-              <a-col :md="24" :sm="24">
-                <a-dropdown>
-                  <a-menu slot="overlay">
-                    <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
-                    <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
-                  </a-menu>
-                  <a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
-                </a-dropdown>
-              </a-col>
-            </a-row>
+          </template>
+          <template #depotBatchSet>
+            <a-icon type="down" @click="handleBatchSetDepot" />
+          </template>
+          <template #depotAdd>
+            <a-divider v-if="isTenant" style="margin: 4px 0;" />
+            <div v-if="isTenant" style="padding: 4px 8px; cursor: pointer;" @click="addDepot"><a-icon type="plus" /> 新增仓库</div>
           </template>
         </j-editable-table>
         <a-row class="form-row" :gutter="24">
diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue
index b726d0a4..6719e731 100644
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -57,17 +57,13 @@
                 <a-button @click="stopScan">收起扫码</a-button>
               </a-col>
             </a-row>
-            <a-row :gutter="24" style="float:left;">
-              <a-col :md="24" :sm="24">
-                <a-dropdown>
-                  <a-menu slot="overlay">
-                    <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
-                    <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
-                  </a-menu>
-                  <a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
-                </a-dropdown>
-              </a-col>
-            </a-row>
+          </template>
+          <template #depotBatchSet>
+            <a-icon type="down" @click="handleBatchSetDepot" />
+          </template>
+          <template #depotAdd>
+            <a-divider v-if="isTenant" style="margin: 4px 0;" />
+            <div v-if="isTenant" style="padding: 4px 8px; cursor: pointer;" @click="addDepot"><a-icon type="plus" /> 新增仓库</div>
           </template>
         </j-editable-table>
         <a-row class="form-row" :gutter="24">
diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
index 290aab33..4de570b0 100644
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -57,17 +57,13 @@
                 <a-button @click="stopScan">收起扫码</a-button>
               </a-col>
             </a-row>
-            <a-row :gutter="24" style="float:left;">
-              <a-col :md="24" :sm="24">
-                <a-dropdown>
-                  <a-menu slot="overlay">
-                    <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
-                    <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
-                  </a-menu>
-                  <a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
-                </a-dropdown>
-              </a-col>
-            </a-row>
+          </template>
+          <template #depotBatchSet>
+            <a-icon type="down" @click="handleBatchSetDepot" />
+          </template>
+          <template #depotAdd>
+            <a-divider v-if="isTenant" style="margin: 4px 0;" />
+            <div v-if="isTenant" style="padding: 4px 8px; cursor: pointer;" @click="addDepot"><a-icon type="plus" /> 新增仓库</div>
           </template>
         </j-editable-table>
         <a-row class="form-row" :gutter="24">
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index 95ada3f2..1afabdb9 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -73,17 +73,13 @@
                 <a-button @click="stopScan">收起扫码</a-button>
               </a-col>
             </a-row>
-            <a-row :gutter="24" style="float:left;">
-              <a-col :md="24" :sm="24">
-                <a-dropdown>
-                  <a-menu slot="overlay">
-                    <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
-                    <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
-                  </a-menu>
-                  <a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
-                </a-dropdown>
-              </a-col>
-            </a-row>
+          </template>
+          <template #depotBatchSet>
+            <a-icon type="down" @click="handleBatchSetDepot" />
+          </template>
+          <template #depotAdd>
+            <a-divider v-if="isTenant" style="margin: 4px 0;" />
+            <div v-if="isTenant" style="padding: 4px 8px; cursor: pointer;" @click="addDepot"><a-icon type="plus" /> 新增仓库</div>
           </template>
         </j-editable-table>
         <a-row class="form-row" :gutter="24">
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
index f316f2a6..07733222 100644
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -73,17 +73,13 @@
                 <a-button @click="stopScan">收起扫码</a-button>
               </a-col>
             </a-row>
-            <a-row :gutter="24" style="float:left;">
-              <a-col :md="24" :sm="24">
-                <a-dropdown>
-                  <a-menu slot="overlay">
-                    <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
-                    <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
-                  </a-menu>
-                  <a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
-                </a-dropdown>
-              </a-col>
-            </a-row>
+          </template>
+          <template #depotBatchSet>
+            <a-icon type="down" @click="handleBatchSetDepot" />
+          </template>
+          <template #depotAdd>
+            <a-divider v-if="isTenant" style="margin: 4px 0;" />
+            <div v-if="isTenant" style="padding: 4px 8px; cursor: pointer;" @click="addDepot"><a-icon type="plus" /> 新增仓库</div>
           </template>
         </j-editable-table>
         <a-row class="form-row" :gutter="24">
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 285f4f54..ee1f0ce1 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -77,17 +77,13 @@
                 <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>
               </a-col>
             </a-row>
-            <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
-              <a-col :md="24" :sm="24">
-                <a-dropdown>
-                  <a-menu slot="overlay">
-                    <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
-                    <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
-                  </a-menu>
-                  <a-button>仓库操作 <a-icon type="down" /></a-button>
-                </a-dropdown>
-              </a-col>
-            </a-row>
+          </template>
+          <template #depotBatchSet>
+            <a-icon type="down" @click="handleBatchSetDepot" />
+          </template>
+          <template #depotAdd>
+            <a-divider v-if="isTenant" style="margin: 4px 0;" />
+            <div v-if="isTenant" style="padding: 4px 8px; cursor: pointer;" @click="addDepot"><a-icon type="plus" /> 新增仓库</div>
           </template>
         </j-editable-table>
         <a-row class="form-row" :gutter="24">
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index b16bb346..ca60cfc1 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -77,30 +77,26 @@
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button>
               </a-col>
-              <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px">
+              <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 8px 0 12px">
                 <a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
               </a-col>
-              <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 12px 0 0">
+              <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 24px 0 0">
                 <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>
               </a-col>
             </a-row>
             <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
               <a-col :md="24" :sm="24">
-                <a-dropdown>
-                  <a-menu slot="overlay">
-                    <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
-                    <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
-                  </a-menu>
-                  <a-button>仓库操作 <a-icon type="down" /></a-button>
-                </a-dropdown>
-              </a-col>
-            </a-row>
-            <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
-              <a-col :md="24" :sm="24">
-                <a-button style="margin-left: 8px" @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button>
+                <a-button @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button>
               </a-col>
             </a-row>
           </template>
+          <template #depotBatchSet>
+            <a-icon type="down" @click="handleBatchSetDepot" />
+          </template>
+          <template #depotAdd>
+            <a-divider v-if="isTenant" style="margin: 4px 0;" />
+            <div v-if="isTenant" style="padding: 4px 8px; cursor: pointer;" @click="addDepot"><a-icon type="plus" /> 新增仓库</div>
+          </template>
         </j-editable-table>
         <a-row class="form-row" :gutter="24">
           <a-col :lg="24" :md="24" :sm="24">
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index 531ea64c..b35f71f0 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -79,17 +79,13 @@
                     <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>
                   </a-col>
                 </a-row>
-                <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
-                  <a-col :md="24" :sm="24">
-                    <a-dropdown>
-                      <a-menu slot="overlay">
-                        <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
-                        <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
-                      </a-menu>
-                      <a-button>仓库操作 <a-icon type="down" /></a-button>
-                    </a-dropdown>
-                  </a-col>
-                </a-row>
+              </template>
+              <template #depotBatchSet>
+                <a-icon type="down" @click="handleBatchSetDepot" />
+              </template>
+              <template #depotAdd>
+                <a-divider v-if="isTenant" style="margin: 4px 0;" />
+                <div v-if="isTenant" style="padding: 4px 8px; cursor: pointer;" @click="addDepot"><a-icon type="plus" /> 新增仓库</div>
               </template>
             </j-editable-table>
             <a-row class="form-row" :gutter="24">
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index fd39ced7..3b997c7e 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -89,17 +89,13 @@
                     <a-button @click="stopScan">收起扫码</a-button>
                   </a-col>
                 </a-row>
-                <a-row :gutter="24" style="float:left;">
-                  <a-col :md="24" :sm="24">
-                    <a-dropdown>
-                      <a-menu slot="overlay">
-                        <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
-                        <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
-                      </a-menu>
-                      <a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
-                    </a-dropdown>
-                  </a-col>
-                </a-row>
+              </template>
+              <template #depotBatchSet>
+                <a-icon type="down" @click="handleBatchSetDepot" />
+              </template>
+              <template #depotAdd>
+                <a-divider v-if="isTenant" style="margin: 4px 0;" />
+                <div v-if="isTenant" style="padding: 4px 8px; cursor: pointer;" @click="addDepot"><a-icon type="plus" /> 新增仓库</div>
               </template>
             </j-editable-table>
             <a-row class="form-row" :gutter="24">
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 2c72f032..20ef9b58 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -77,17 +77,13 @@
                 <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>
               </a-col>
             </a-row>
-            <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
-              <a-col :md="24" :sm="24">
-                <a-dropdown>
-                  <a-menu slot="overlay">
-                    <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
-                    <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
-                  </a-menu>
-                  <a-button>仓库操作 <a-icon type="down" /></a-button>
-                </a-dropdown>
-              </a-col>
-            </a-row>
+          </template>
+          <template #depotBatchSet>
+            <a-icon type="down" @click="handleBatchSetDepot" />
+          </template>
+          <template #depotAdd>
+            <a-divider v-if="isTenant" style="margin: 4px 0;" />
+            <div v-if="isTenant" style="padding: 4px 8px; cursor: pointer;" @click="addDepot"><a-icon type="plus" /> 新增仓库</div>
           </template>
         </j-editable-table>
         <a-row class="form-row" :gutter="24">
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index dcb017dc..9e379c65 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -87,21 +87,17 @@
             </a-row>
             <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
               <a-col :md="24" :sm="24">
-                <a-dropdown>
-                  <a-menu slot="overlay">
-                    <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
-                    <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
-                  </a-menu>
-                  <a-button>仓库操作 <a-icon type="down" /></a-button>
-                </a-dropdown>
-              </a-col>
-            </a-row>
-            <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
-              <a-col :md="24" :sm="24">
-                <a-button style="margin-left: 8px" @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button>
+                <a-button @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button>
               </a-col>
             </a-row>
           </template>
+          <template #depotBatchSet>
+            <a-icon type="down" @click="handleBatchSetDepot" />
+          </template>
+          <template #depotAdd>
+            <a-divider v-if="isTenant" style="margin: 4px 0;" />
+            <div v-if="isTenant" style="padding: 4px 8px; cursor: pointer;" @click="addDepot"><a-icon type="plus" /> 新增仓库</div>
+          </template>
         </j-editable-table>
         <a-row class="form-row" :gutter="24">
           <a-col :lg="24" :md="24" :sm="24">