From 595bb87076bd5d8af40ebd08013ea930a4b525de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 24 Oct 2021 23:07:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=BF=AB=E6=8D=B7=E8=BE=93=E5=85=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/components/jeecg/JEditableTable.vue     |  4 ++--
 jshERP-web/src/views/bill/mixins/BillModalMixin.js     |  8 ++++++++
 .../src/views/bill/modules/AllocationOutModal.vue      | 10 +++++++++-
 jshERP-web/src/views/bill/modules/AssembleModal.vue    | 10 +++++++++-
 jshERP-web/src/views/bill/modules/DisassembleModal.vue | 10 +++++++++-
 jshERP-web/src/views/bill/modules/OtherInModal.vue     | 10 +++++++++-
 jshERP-web/src/views/bill/modules/OtherOutModal.vue    | 10 +++++++++-
 .../src/views/bill/modules/PurchaseBackModal.vue       | 10 +++++++++-
 jshERP-web/src/views/bill/modules/PurchaseInModal.vue  | 10 +++++++++-
 .../src/views/bill/modules/PurchaseOrderModal.vue      | 10 +++++++++-
 jshERP-web/src/views/bill/modules/RetailBackModal.vue  | 10 +++++++++-
 jshERP-web/src/views/bill/modules/RetailOutModal.vue   | 10 +++++++++-
 jshERP-web/src/views/bill/modules/SaleBackModal.vue    | 10 +++++++++-
 jshERP-web/src/views/bill/modules/SaleOrderModal.vue   | 10 +++++++++-
 jshERP-web/src/views/bill/modules/SaleOutModal.vue     | 10 +++++++++-
 15 files changed, 127 insertions(+), 15 deletions(-)

diff --git a/jshERP-web/src/components/jeecg/JEditableTable.vue b/jshERP-web/src/components/jeecg/JEditableTable.vue
index e8059c59..43c36b06 100644
--- a/jshERP-web/src/components/jeecg/JEditableTable.vue
+++ b/jshERP-web/src/components/jeecg/JEditableTable.vue
@@ -11,13 +11,13 @@
       <a-col>
         <!-- 操作按钮 -->
         <div v-if="actionButton" class="action-button">
-          <a-button type="primary" icon="plus" @click="handleClickAdd" :disabled="disabled">新增</a-button>
+          <a-button type="primary" icon="plus" @click="handleClickAdd" :disabled="disabled">新增行</a-button>
           <span class="gap"></span>
           <template v-if="selectedRowIds.length>0">
             <a-popconfirm
               :title="`确定要删除这 ${selectedRowIds.length} 项吗?`"
               @confirm="handleConfirmDelete">
-              <a-button type="primary" icon="minus" :disabled="disabled">删除</a-button>
+              <a-button type="primary" icon="minus" :disabled="disabled">删除行</a-button>
               <span class="gap"></span>
             </a-popconfirm>
             <template v-if="showClearSelectButton">
diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index ece91895..0687e130 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -225,6 +225,11 @@ export const BillModalMixin = {
       this.$refs.memberModalForm.title = "新增会员";
       this.$refs.memberModalForm.disableSubmit = false;
     },
+    addDepot() {
+      this.$refs.depotModalForm.add();
+      this.$refs.depotModalForm.title = "新增仓库";
+      this.$refs.depotModalForm.disableSubmit = false;
+    },
     vendorModalFormOk() {
       this.initSupplier()
     },
@@ -234,6 +239,9 @@ export const BillModalMixin = {
     memberModalFormOk() {
       this.initRetail()
     },
+    depotModalFormOk() {
+      this.initDepot()
+    },
     onAdded(event) {
       const { row, target } = event
       getAction('/depot/findDepotByCurrentUser').then((res) => {
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index 9bfcbcba..c30a9757 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -41,7 +41,12 @@
           @added="onAdded"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24">
+            <a-row :gutter="24" style="float:left;width:140px;">
+              <a-col :md="24" :sm="24">
+                <a-button icon="plus" @click="addDepot">新增仓库</a-button>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" style="float:left;">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
@@ -70,10 +75,12 @@
         </a-row>
       </a-form>
     </a-spin>
+    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
+  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -85,6 +92,7 @@
     name: "AllocationOutModal",
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
+      DepotModal,
       JUpload,
       JDate
     },
diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue
index 3bfe9d9f..3fe476ea 100644
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -41,7 +41,12 @@
           @added="onAdded"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24">
+            <a-row :gutter="24" style="float:left;width:140px;">
+              <a-col :md="24" :sm="24">
+                <a-button icon="plus" @click="addDepot">新增仓库</a-button>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" style="float:left;">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
@@ -70,10 +75,12 @@
         </a-row>
       </a-form>
     </a-spin>
+    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
+  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -86,6 +93,7 @@
     name: "AssembleModal",
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
+      DepotModal,
       JUpload,
       JDate
     },
diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
index 5219e899..7a0929ea 100644
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -41,7 +41,12 @@
           @added="onAdded"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24">
+            <a-row :gutter="24" style="float:left;width:140px;">
+              <a-col :md="24" :sm="24">
+                <a-button icon="plus" @click="addDepot">新增仓库</a-button>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" style="float:left;">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
@@ -70,10 +75,12 @@
         </a-row>
       </a-form>
     </a-spin>
+    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
+  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -86,6 +93,7 @@
     name: "DisassembleModal",
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
+      DepotModal,
       JUpload,
       JDate
     },
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index 94ed3658..c0903491 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -56,7 +56,12 @@
           @added="onAdded"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24">
+            <a-row :gutter="24" style="float:left;width:140px;">
+              <a-col :md="24" :sm="24">
+                <a-button icon="plus" @click="addDepot">新增仓库</a-button>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" style="float:left;">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
@@ -86,11 +91,13 @@
       </a-form>
     </a-spin>
     <vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
+    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import VendorModal from '../../system/modules/VendorModal'
+  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -103,6 +110,7 @@
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
       VendorModal,
+      DepotModal,
       JUpload,
       JDate,
       VNodes: {
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
index 16dce129..f4762fe4 100644
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -56,7 +56,12 @@
           @added="onAdded"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24">
+            <a-row :gutter="24" style="float:left;width:140px;">
+              <a-col :md="24" :sm="24">
+                <a-button icon="plus" @click="addDepot">新增仓库</a-button>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" style="float:left;">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
@@ -86,11 +91,13 @@
       </a-form>
     </a-spin>
     <customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
+    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import CustomerModal from '../../system/modules/CustomerModal'
+  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -103,6 +110,7 @@
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
       CustomerModal,
+      DepotModal,
       JUpload,
       JDate,
       VNodes: {
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index ffff25f4..f47ee16f 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -60,7 +60,12 @@
           @added="onAdded"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24">
+            <a-row :gutter="24" style="float:left;width:140px;">
+              <a-col :md="24" :sm="24">
+                <a-button icon="plus" @click="addDepot">新增仓库</a-button>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" style="float:left;">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
@@ -141,6 +146,7 @@
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
     <vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
+    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
@@ -148,6 +154,7 @@
   import ManyAccountModal from '../dialog/ManyAccountModal'
   import LinkBillList from '../dialog/LinkBillList'
   import VendorModal from '../../system/modules/VendorModal'
+  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -163,6 +170,7 @@
       ManyAccountModal,
       LinkBillList,
       VendorModal,
+      DepotModal,
       JUpload,
       JDate,
       VNodes: {
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 2b63ff83..171d68dd 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -64,7 +64,12 @@
           @added="onAdded"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
+            <a-row :gutter="24" style="float:left;width:140px;">
+              <a-col :md="24" :sm="24">
+                <a-button icon="plus" @click="addDepot">新增仓库</a-button>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
@@ -152,6 +157,7 @@
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
     <vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
+    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 
@@ -160,6 +166,7 @@
   import ManyAccountModal from '../dialog/ManyAccountModal'
   import LinkBillList from '../dialog/LinkBillList'
   import VendorModal from '../../system/modules/VendorModal'
+  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -175,6 +182,7 @@
       ManyAccountModal,
       LinkBillList,
       VendorModal,
+      DepotModal,
       JUpload,
       JDate,
       VNodes: {
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 512c19c0..d7acf187 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -57,7 +57,12 @@
           @valueChange="onValueChange"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24" data-step="3" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
+            <a-row :gutter="24" style="float:left;width:140px;">
+              <a-col :md="24" :sm="24">
+                <a-button icon="plus" @click="addDepot">新增仓库</a-button>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" style="float:left;" data-step="3" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
@@ -87,11 +92,13 @@
       </a-form>
     </a-spin>
     <vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
+    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import VendorModal from '../../system/modules/VendorModal'
+  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -104,6 +111,7 @@
     mixins: [JEditableTableMixin,BillModalMixin],
     components: {
       VendorModal,
+      DepotModal,
       JUpload,
       JDate,
       VNodes: {
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index 958f29ce..69ec062f 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -63,7 +63,12 @@
               @added="onAdded"
               @deleted="onDeleted">
               <template #buttonAfter>
-                <a-row :gutter="24">
+                <a-row :gutter="24" style="float:left;width:140px;">
+                  <a-col :md="24" :sm="24">
+                    <a-button icon="plus" @click="addDepot">新增仓库</a-button>
+                  </a-col>
+                </a-row>
+                <a-row :gutter="24" style="float:left;">
                   <a-col v-if="scanStatus" :md="6" :sm="24">
                     <a-button @click="scanEnter">扫码录入</a-button>
                   </a-col>
@@ -125,12 +130,14 @@
     </a-spin>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
     <member-modal ref="memberModalForm" @ok="memberModalFormOk"></member-modal>
+    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import LinkBillList from '../dialog/LinkBillList'
   import MemberModal from '../../system/modules/MemberModal'
+  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -146,6 +153,7 @@
     components: {
       LinkBillList,
       MemberModal,
+      DepotModal,
       JUpload,
       JDate,
       VNodes: {
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index 09dbfdfa..3c7a0fec 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -70,7 +70,12 @@
               @added="onAdded"
               @deleted="onDeleted">
               <template #buttonAfter>
-                <a-row :gutter="24" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
+                <a-row :gutter="24" style="float:left;width:140px;">
+                  <a-col :md="24" :sm="24">
+                    <a-button icon="plus" @click="addDepot">新增仓库</a-button>
+                  </a-col>
+                </a-row>
+                <a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
                   <a-col v-if="scanStatus" :md="6" :sm="24">
                     <a-button @click="scanEnter">扫码录入</a-button>
                   </a-col>
@@ -136,11 +141,13 @@
       </a-form>
     </a-spin>
     <member-modal ref="memberModalForm" @ok="memberModalFormOk"></member-modal>
+    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import MemberModal from '../../system/modules/MemberModal'
+  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -155,6 +162,7 @@
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
       MemberModal,
+      DepotModal,
       JUpload,
       JDate,
       VNodes: {
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 6444575e..7ad428a8 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -60,7 +60,12 @@
           @added="onAdded"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24">
+            <a-row :gutter="24" style="float:left;width:140px;">
+              <a-col :md="24" :sm="24">
+                <a-button icon="plus" @click="addDepot">新增仓库</a-button>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" style="float:left;">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
@@ -144,6 +149,7 @@
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
     <customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
+    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
@@ -151,6 +157,7 @@
   import ManyAccountModal from '../dialog/ManyAccountModal'
   import LinkBillList from '../dialog/LinkBillList'
   import CustomerModal from '../../system/modules/CustomerModal'
+  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -167,6 +174,7 @@
       ManyAccountModal,
       LinkBillList,
       CustomerModal,
+      DepotModal,
       JUpload,
       JDate,
       JSelectMultiple,
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index 7bf5e599..453b4152 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -63,7 +63,12 @@
           @valueChange="onValueChange"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
+            <a-row :gutter="24" style="float:left;width:140px;">
+              <a-col :md="24" :sm="24">
+                <a-button icon="plus" @click="addDepot">新增仓库</a-button>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
@@ -93,11 +98,13 @@
       </a-form>
     </a-spin>
     <customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
+    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import CustomerModal from '../../system/modules/CustomerModal'
+  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -111,6 +118,7 @@
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
       CustomerModal,
+      DepotModal,
       JUpload,
       JDate,
       JSelectMultiple,
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index fcd106e2..0a5eb28c 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -65,7 +65,12 @@
           @added="onAdded"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
+            <a-row :gutter="24" style="float:left;width:140px;">
+              <a-col :md="24" :sm="24">
+                <a-button icon="plus" @click="addDepot">新增仓库</a-button>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
@@ -157,6 +162,7 @@
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
     <customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
+    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
@@ -164,6 +170,7 @@
   import ManyAccountModal from '../dialog/ManyAccountModal'
   import LinkBillList from '../dialog/LinkBillList'
   import CustomerModal from '../../system/modules/CustomerModal'
+  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -180,6 +187,7 @@
       ManyAccountModal,
       LinkBillList,
       CustomerModal,
+      DepotModal,
       JUpload,
       JDate,
       JSelectMultiple,