1.修复耗材字典等页面的bug

src/views/basic/BasicEntrutsRece.vue

@@ -26,10 +26,8 @@
       <el-table v-loading="loading" :data="list" style="width: 100%">
         <el-table-column label="序号" type="index" width="60" fixed></el-table-column>
         <el-table-column label="扫码单据类型" prop="curName" fixed></el-table-column>
-        <el-table-column label="当前仓库" prop="curInvName" fixed></el-table-column>
-        <el-table-column label="当前分库" prop="invWarehouseName" fixed></el-table-column>
-        <el-table-column label="委托验收仓库" prop="entrustInvName" fixed></el-table-column>
-        <el-table-column label="委托验收分库" prop="entrustSubInvName" fixed></el-table-column>
+        <el-table-column label="当前仓库" prop="invWarehouseName" fixed></el-table-column>
+        <el-table-column label="委托验收仓库" prop="entrustSubInvName" fixed></el-table-column>
         <el-table-column label="委托验收人" prop="employeeName" fixed>
         </el-table-column>
         <el-table-column label="操作" fixed="right">

src/views/basic/BasicEntrutsReceModify.vue

@@ -86,7 +86,7 @@
                         <div class="itemTag">
                             <span>生成单据类型:&nbsp;</span>
                         </div>
-                        <el-select v-model="inputQuery.entrustAction" placeholder="单据类型" clearable>
+                        <el-select v-model="inputQuery.entrustAction" placeholder="单据类型" @change="entrustActionChange" clearable>
                             <el-option
                                 v-for="item in entrustBusArray"
                                 :key="item.action"
@@ -273,6 +273,9 @@ export default {
                 this.$message.error("单据类型数据加载失败")
             });
         },
+        entrustActionChange() {
+            this.inputQuery.entrustUser = "";
+        },
 
     },
     computed: {

src/views/basic/UdiInfoManage.vue

@@ -1224,10 +1224,10 @@ export default {
         },
 
         handleDetail(row) {
-            let rlId = this.editQuery.rlId;
+            let relId = this.editQuery.relId;
             this.editQuery = row;
-            this.editQuery.rlId = rlId;
-            this.editQuery.id = rlId;
+            this.editQuery.rlId = relId;
+            this.editQuery.id = relId;
         },
 
 

src/views/inventory/InvProducts.vue

@@ -63,8 +63,7 @@
 <!--                        </el-select>-->
 <!--                    </el-form-item>-->
                     <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
-                                   :disabled="invWarehouseDisabled"
+                        <el-select v-model="filterQuery.invWarehouseCode" @change="invWarehouseChange" placeholder="请选择当前仓库" clearable="true"
                                    size="mini">
                             <el-option
                                 v-for="item in subInvList"
@@ -238,7 +237,6 @@ export default {
                 page: 1,
                 limit: 20,
             };
-            this.invChange();
             this.getList();
         },
         onSubmit() {
@@ -365,7 +363,6 @@ export default {
             this.filterQuery.invWarehouseCode = "";
             this.subInvList = [];
             if (this.filterQuery.invStorageCode != null && this.filterQuery.invStorageCode != "") {
-                this.invWarehouseDisabled = false;
                 let query = {
                     filter: 3,
                 };
@@ -375,8 +372,6 @@ export default {
                     })
                     .catch(() => {
                     });
-            } else {
-                this.invWarehouseDisabled = true;
             }
         },
         intentDetail(row) {
@@ -389,7 +384,14 @@ export default {
             if (isBlank(value)) {
                 this.findMethod();
             }
-        }
+        },
+        invWarehouseChange(invWarehouseCode) {
+            this.subInvList.forEach(item => {
+                if (item.code === invWarehouseCode) {
+                    this.filterQuery.invStorageCode = item.parentId;
+                }
+            });
+        },
     },
     filters: {
         statusFilterType(status) {

src/views/inventory/sickerUdiTraceOrder.vue

@@ -45,6 +45,11 @@
                         <span>{{ fromTypeMap[scope.row.fromType] }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="单据状态" prop="status">
+                    <template slot-scope="scope">
+                        <span>{{ orderStatus[scope.row.status] }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </el-table-column>
                 <el-table-column
@@ -280,6 +285,11 @@ export default {
             deleteLoading: false,
             addDialogVisible: false,
             errDialogVisible: false,
+            orderStatus: {
+                1: "等待处理",
+                3: "校验失败",
+                4: "已校验"
+            }
         };
     },
     components: {

src/views/warehouse/IONewOrder.vue

@@ -431,7 +431,11 @@ export default {
             }
         },
         getBusType() {
-            this.filterQuery.locStorageCode= this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
+            this.subInvList.forEach(item => {
+                if (item.code === this.filterQuery.invWarehouseCode) {
+                    this.filterQuery.locStorageCode = item.parentId;
+                }
+            })
             let query = {
                 code: this.filterQuery.invWarehouseCode,
                 enabled: true,