From 7386302510e1c7fe770dcef67a0a5bab087d84f6 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 28 Mar 2023 09:54:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87=E9=A2=86?=
 =?UTF-8?q?=E7=94=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/DeviceReceiveOrderAudit.vue     | 18 ++++----
 .../inventory/DeviceReceiveOrderCompleted.vue | 44 ++++++++++---------
 .../inventory/DeviceReceiveOrderModify.vue    |  5 +--
 src/views/inventory/DeviceReceiveOrderNew.vue |  2 +-
 4 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/src/views/inventory/DeviceReceiveOrderAudit.vue b/src/views/inventory/DeviceReceiveOrderAudit.vue
index 4b3eaed5..7587a067 100644
--- a/src/views/inventory/DeviceReceiveOrderAudit.vue
+++ b/src/views/inventory/DeviceReceiveOrderAudit.vue
@@ -21,7 +21,6 @@
         </el-form-item>
         <el-form-item class="query-form-item" label="领用仓库:">
           <el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true"
-                     @change="invChange"
           >
             <el-option
               v-for="item in invList"
@@ -32,7 +31,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item class="query-form-item" label="领用货位:">
+<!--        <el-form-item class="query-form-item" label="领用货位:">
           <el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true"
           >
             <el-option
@@ -43,7 +42,7 @@
               <span style="float: left">{{ item.name }}</span>
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item>
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
@@ -59,7 +58,7 @@
         <el-table-column label="设备领用记录号" prop="orderId"></el-table-column>
         <el-table-column label="领用部门" prop="fromDeptName"></el-table-column>
         <el-table-column label="领用仓库" prop="fromInvName"></el-table-column>
-        <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>
+<!--        <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>-->
         <el-table-column label="领用日期" prop="createTime"></el-table-column>
         <el-table-column label="领用人" prop="receiveUserName"></el-table-column>
         <el-table-column label="创建人" prop="createUser"></el-table-column>
@@ -101,16 +100,15 @@
         <el-table-column label="序号" type="index" width="50"></el-table-column>
         <el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
         <el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
-        <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="200"></el-table-column>
         <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
         <el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column  label="生产企业" prop="ylqxzcrbarmc"
-                         show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
       </el-table>
 
       <pagination
diff --git a/src/views/inventory/DeviceReceiveOrderCompleted.vue b/src/views/inventory/DeviceReceiveOrderCompleted.vue
index bcb973b9..0799520c 100644
--- a/src/views/inventory/DeviceReceiveOrderCompleted.vue
+++ b/src/views/inventory/DeviceReceiveOrderCompleted.vue
@@ -21,7 +21,6 @@
         </el-form-item>
         <el-form-item class="query-form-item" label="领用仓库:">
           <el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true"
-                     @change="invChange"
           >
             <el-option
               v-for="item in invList"
@@ -32,18 +31,18 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item class="query-form-item" label="领用货位:">
-          <el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true"
-          >
-            <el-option
-              v-for="item in spaceList"
-              :key="item.name"
-              :label="item.name"
-              :value="item.code">
-              <span style="float: left">{{ item.name }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
+        <!--        <el-form-item class="query-form-item" label="领用货位:">
+                  <el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true"
+                  >
+                    <el-option
+                      v-for="item in spaceList"
+                      :key="item.name"
+                      :label="item.name"
+                      :value="item.code">
+                      <span style="float: left">{{ item.name }}</span>
+                    </el-option>
+                  </el-select>
+                </el-form-item>-->
         <el-form-item>
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
@@ -59,7 +58,7 @@
         <el-table-column label="设备领用记录号" prop="orderId"></el-table-column>
         <el-table-column label="领用部门" prop="fromDeptName"></el-table-column>
         <el-table-column label="领用仓库" prop="fromInvName"></el-table-column>
-        <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>
+        <!--        <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>-->
         <el-table-column label="领用日期" prop="createTime"></el-table-column>
         <el-table-column label="领用人" prop="receiveUserName"></el-table-column>
         <el-table-column label="创建人" prop="createUser"></el-table-column>
@@ -83,16 +82,15 @@
         <el-table-column label="序号" type="index" width="50"></el-table-column>
         <el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
         <el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
-        <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="200"></el-table-column>
         <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
         <el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc"
-                         show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
       </el-table>
 
       <pagination
@@ -222,7 +220,11 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.fromInvCode,invStorageCode:this.filterQuery.fromInvCode.fromDeptCode, status: 1};
+      let params = {
+        invWarehouseCode: this.filterQuery.fromInvCode,
+        invStorageCode: this.filterQuery.fromInvCode.fromDeptCode,
+        status: 1
+      };
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
         this.getList();
diff --git a/src/views/inventory/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue
index 326f08be..6db75ce4 100644
--- a/src/views/inventory/DeviceReceiveOrderModify.vue
+++ b/src/views/inventory/DeviceReceiveOrderModify.vue
@@ -399,10 +399,6 @@ export default {
           this.getInvList();
         }
       });
-
-      if (!isBlank(this.formData.fromDeptCode)) {
-        this.getDeptUserList();
-      }
     },
     invChange() {
       this.formData.invSpaceCode = null;
@@ -679,6 +675,7 @@ export default {
       this.formData.fromInvSpaceCode = this.deviceReceiveOrder.fromInvSpaceCode;
       this.formData.receiveUser = this.deviceReceiveOrder.receiveUser;
       this.getList();
+      this.getDeptUserList();
     }
   },
 };
diff --git a/src/views/inventory/DeviceReceiveOrderNew.vue b/src/views/inventory/DeviceReceiveOrderNew.vue
index e9db84cb..b9b34bbd 100644
--- a/src/views/inventory/DeviceReceiveOrderNew.vue
+++ b/src/views/inventory/DeviceReceiveOrderNew.vue
@@ -58,7 +58,7 @@
         <el-table-column label="设备领用记录号" prop="orderId"></el-table-column>
         <el-table-column label="领用部门" prop="fromDeptName"></el-table-column>
         <el-table-column label="出库仓库" prop="fromInvName"></el-table-column>
-        <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>
+<!--        <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>-->
         <el-table-column label="领用日期" prop="createTime"></el-table-column>
         <el-table-column label="领用人" prop="receiveUserName"></el-table-column>
         <el-table-column label="创建人" prop="createUser"></el-table-column>