From 03cd35254d1d5f5e161cccd4d71a952c0357ffd9 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, 23 Sep 2021 22:44:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=AE=A2=E5=8D=95=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/PurchaseOrderList.vue        | 10 ----------
 jshERP-web/src/views/bill/SaleOrderList.vue            | 10 ----------
 jshERP-web/src/views/bill/dialog/BillDetail.vue        |  2 --
 .../src/views/bill/modules/PurchaseOrderModal.vue      |  3 ---
 jshERP-web/src/views/bill/modules/SaleOrderModal.vue   |  3 ---
 5 files changed, 28 deletions(-)

diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue
index 81f6d3cf..af1b9963 100644
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -39,15 +39,6 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="仓库名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="请选择仓库" showSearch optionFilterProp="children" v-model="queryParam.depotId">
-                      <a-select-option v-for="(depot,index) in depotList" :value="depot.id">
-                        {{ depot.depotName }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
@@ -206,7 +197,6 @@
     },
     created() {
       this.initSupplier()
-      this.getDepotData()
       this.initUser()
     },
     computed: {
diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index fcf42126..34f550bb 100644
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -40,15 +40,6 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="仓库名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="请选择仓库" showSearch optionFilterProp="children" v-model="queryParam.depotId">
-                      <a-select-option v-for="(depot,index) in depotList" :value="depot.id">
-                        {{ depot.depotName }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
@@ -206,7 +197,6 @@
     },
     created() {
       this.initCustomer()
-      this.getDepotData()
       this.initUser()
     },
     computed: {
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index c600e8c4..3d325941 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -998,7 +998,6 @@
           { title: '备注', dataIndex: 'remark', width: '5%'}
         ],
         purchaseOrderColumns: [
-          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
           { title: '条码', dataIndex: 'barCode', width: '10%'},
           { title: '名称', dataIndex: 'name', width: '8%'},
           { title: '规格', dataIndex: 'standard', width: '5%'},
@@ -1062,7 +1061,6 @@
           { title: '备注', dataIndex: 'remark', width: '5%'}
         ],
         saleOrderColumns: [
-          { title: '仓库名称', dataIndex: 'depotName', width: '8%'},
           { title: '条码', dataIndex: 'barCode', width: '10%'},
           { title: '名称', dataIndex: 'name', width: '8%'},
           { title: '规格', dataIndex: 'standard', width: '5%'},
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 7b23e5c6..7b5825db 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -112,9 +112,6 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
-              allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
-            },
             { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index 160d44ed..0ccf950e 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -115,9 +115,6 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
-              allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
-            },
             { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },