From 3e9ba12ee80545521aa5278213ca8a781aaf04ef Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sat, 25 Mar 2023 16:50:04 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=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/DeviceReceiveOrderModify.vue    | 42 ++++++++++---------
 src/views/inventory/DeviceReceiveOrderNew.vue |  9 ++--
 vue.config.js                                 |  4 +-
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/views/inventory/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue
index b65e93b2..40c72b67 100644
--- a/src/views/inventory/DeviceReceiveOrderModify.vue
+++ b/src/views/inventory/DeviceReceiveOrderModify.vue
@@ -54,10 +54,9 @@
           </el-col>
 
           <el-col :span="10">
-            <el-form-item class="query-form-item" label="领用仓库:">
-              <el-select v-model="formData.fromInvCode" placeholder="领用仓库信息"
+            <el-form-item class="query-form-item" label="出库仓库:">
+              <el-select v-model="formData.fromInvCode" placeholder="出库仓库信息"
                          :disabled="detailList.length >0 "
-                         @change="invChange"
                          style="width: 90%"
                          clearable>
                 <el-option
@@ -74,7 +73,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="10">
+<!--          <el-col :span="10">
             <el-form-item class="query-form-item" label="领用货位:">
               <el-select v-model="formData.fromInvSpaceCode" placeholder="领用货位信息"
                          :disabled="detailList.length >0 "
@@ -90,7 +89,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col>-->
 
           <el-col :span="10">
             <el-form-item class="query-form-item" label="领用人:">
@@ -146,7 +145,7 @@
                   highlight-current-row
                   border max-height="300" height="300">
           <el-table-column label="序号" type="index" width="50"></el-table-column>
-          <el-table-column label="条码" width="180" prop="originCode" show-overflow-tooltip></el-table-column>
+<!--          <el-table-column label="条码" width="180" prop="originCode" show-overflow-tooltip></el-table-column>-->
           <el-table-column width="150"
                            label="产品通用名"
                            prop="productName"
@@ -154,18 +153,15 @@
           ></el-table-column>
           <el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
           <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
-          <el-table-column width="150" label="序列号" prop="serialNo">
-            <template slot-scope="scope">
-              <el-input :disabled="scope.$index != currentIndex" v-model="scope.row.serialNo"></el-input>
-            </template>
-          </el-table-column>
+          <el-table-column width="150" label="序列号" prop="serialNo"></el-table-column>
           <el-table-column label="生产日期(yyMMdd)" prop="productionDate"></el-table-column>
           <el-table-column label="失效日期(yyMMdd)" prop="expireDate" 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-column label="操作">
             <template slot-scope="scope">
-              <el-button
+<!--              <el-button
                 type="text"
                 size="small"
                 v-if="scope.row.serialNo === null"
@@ -181,7 +177,7 @@
                 @click.native="updateOrderDetail(scope.row)"
               >保存
               </el-button
-              >
+              >-->
               <el-button
                 type="text"
                 size="small"
@@ -223,7 +219,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item class="query-form-item" prop="invSpaceCode">
+<!--          <el-form-item class="query-form-item" prop="invSpaceCode">
             <el-select v-model="filterQuery.invSpaceCode" placeholder="领用货位信息"
                        :disabled="true"
                        clearable>
@@ -235,7 +231,7 @@
                 <span style="float: left">{{ item.name }}</span>
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item class="query-form-item" label="产品标识DI:">
             <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
           </el-form-item>
@@ -275,6 +271,7 @@
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
+        <el-table-column label="供应商" prop="supName" width="120"></el-table-column>
       </el-table>
 
       <pagination
@@ -373,8 +370,10 @@ export default {
       //查询此部门下的仓库和用户
       this.formData.fromInvCode = null;
       this.formData.fromInvSpaceCode = null;
+      this.formData.receiveUser = null;
       this.invList = [];
       this.spaceList = [];
+      this.userList = [];
       this.getInvList();
 
       //拉取部门用户列表
@@ -382,7 +381,12 @@ export default {
     },
     getDeptUserList() {
       this.userList = [];
-      let params = {deptId: this.formData.fromDeptCode};
+      let params = {deptId: null};
+      this.deptList.forEach((item) => {
+        if (item.code === this.formData.fromDeptCode) {
+          params.deptId = item.id;
+        }
+      });
       listDeptUser(params).then((res) => {
         this.userList = res.data.list || [];
       })
@@ -425,7 +429,7 @@ export default {
       this.onReset();
       this.selectInvProductVisible = true;
       this.filterQuery.invCode = this.formData.fromInvCode;
-      this.filterQuery.invSpaceCode = this.formData.fromInvSpaceCode;
+      // this.filterQuery.invSpaceCode = this.formData.fromInvSpaceCode;
     },
     saveMAOrder() {
       this.saveOrder();
@@ -499,8 +503,6 @@ export default {
         return "请选择领用部门！";
       } else if (isBlank(this.formData.fromInvCode)) {
         return "请选择领用仓库！";
-      } else if (isBlank(this.formData.fromInvSpaceCode)) {
-        return "请选择领用货位！";
       } else if (isBlank(this.formData.receiveUser)) {
         return "请选择领用人！";
       }
@@ -614,7 +616,7 @@ export default {
     },
     queryInvProducts() {
       this.filterQuery.invCode = this.formData.fromInvCode;
-      this.filterQuery.invSpaceCode = this.formData.fromInvSpaceCode;
+      // this.filterQuery.invSpaceCode = this.formData.fromInvSpaceCode;
       getInvMAProducts(this.filterQuery).then((res) => {
         if (res.code === 20000) {
           this.productList = res.data.list || [];
diff --git a/src/views/inventory/DeviceReceiveOrderNew.vue b/src/views/inventory/DeviceReceiveOrderNew.vue
index 54badb4b..e9db84cb 100644
--- a/src/views/inventory/DeviceReceiveOrderNew.vue
+++ b/src/views/inventory/DeviceReceiveOrderNew.vue
@@ -19,9 +19,8 @@
             </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.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>
@@ -58,7 +57,7 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <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="fromInvName"></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>
diff --git a/vue.config.js b/vue.config.js
index 952e764e..3cfb4098 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -31,11 +31,11 @@ module.exports = {
   devServer: {
     host: '0.0.0.0',
     port: port,
-    open: true,
+    open: false,
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.0.166:9991`,
+        target: `http://192.168.0.180:9991`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''