1.修复查询货位相关的bug

package.bat

@@ -0,0 +1,5 @@
+rd /s /q UDI_WMS_NEW
+
+npm run build:prod
+
+exit

src/views/inout/IoCreateOrder.vue

@@ -162,6 +162,7 @@
           :closeDialog="closeDialog"
           :orderQuery="idQuery"
           :viewType="viewType"
+          :errView="errView"
         ></addOrder>
       </el-dialog>
       <el-dialog
@@ -306,6 +307,7 @@ export default {
           },
         ],
       },
+      errView: null
     };
   },
   components: {
@@ -373,6 +375,9 @@ export default {
     addOrders(row) {
       this.idQuery = {};
       this.idQuery = row;
+      if (row.status === 4) {
+        this.errView = 1;
+      }
       this.addOrderVisible = true;
     },
     closeDialog() {

src/views/inout/IoEditOrder.vue

@@ -510,6 +510,9 @@ export default {
       this.clearDetailList();
     },
     handleSelectionChange(val) {
+      if (null === val) {
+        return;
+      }
       this.currentRow = val;
       this.getOrderDetails();
     },
@@ -658,10 +661,6 @@ export default {
       this.getBizDetailList();
     },
     getBizDetailList() {
-      debugger
-      if (null == this.currentRow) {
-        return;
-      }
       if (isBlank(this.currentRow.billNo)) {
         this.$message.error("请先选择需要查询的单据！");
         return;
@@ -698,9 +697,6 @@ export default {
       this.getCodeDetailList();
     },
     getCodeDetailList() {
-      if (null == this.currentRow) {
-        return;
-      }
       if (isBlank(this.currentRow.billNo)) {
         this.$message.error("请先选择需要查询的单据！")
         return;
@@ -739,9 +735,6 @@ export default {
       this.getResultDetailList();
     },
     getResultDetailList() {
-      if (null == this.currentRow) {
-        return;
-      }
       if (isBlank(this.currentRow.billNo)) {
         this.$message.error("请先选择需要查询的单据！")
         return;

src/views/inventory/DeviceReceiveOrderAudit.vue

@@ -240,7 +240,7 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode};
+      let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
         this.getList();

src/views/inventory/DeviceReceiveOrderCompleted.vue

@@ -91,8 +91,8 @@
         <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"
+        <el-table-column label="生产厂家" prop="ylqxzcrbarmc"
-                          show-overflow-tooltip></el-table-column>
+                         show-overflow-tooltip></el-table-column>
       </el-table>
 
       <pagination
@@ -222,7 +222,7 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode};
+      let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
         this.getList();

src/views/inventory/DeviceReceiveOrderModify.vue

@@ -406,7 +406,7 @@ export default {
     getDeptUserList() {
       this.userList = [];
       let params = {deptId: this.formData.fromDeptCode};
-      listDeptUser(params).then((res) =>{
+      listDeptUser(params).then((res) => {
         this.userList = res.data.list || [];
       })
     },
@@ -426,7 +426,7 @@ export default {
     invChange() {
       this.formData.invSpaceCode = null;
       this.spaceList = [];
-      let params = {invStorageCode: this.formData.fromDeptCode};
+      let params = {invWarehouseCode: this.formData.fromInvCode, status: 1};
       getInvSpaceList(params).then((res) => {
         if (!isBlank(this.deviceReceiveOrder.fromInvSpaceCode)) {
           this.formData.fromInvSpaceCode = this.deviceReceiveOrder.fromInvSpaceCode;

src/views/inventory/DeviceReceiveOrderNew.vue

@@ -231,7 +231,7 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode};
+      let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
         this.getList();

src/views/inventory/InvCountOrderAudit.vue

@@ -261,7 +261,7 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode};
+      let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
         this.getList();

src/views/inventory/InvCountOrderCompleted.vue

@@ -242,7 +242,7 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode};
+      let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
         this.getList();

src/views/inventory/InvCountOrderModify.vue

@@ -338,7 +338,7 @@ export default {
       });
       this.formData.invSpaceCode = null;
       this.spaceList = [];
-      let params = {invWarehouseCode: this.formData.invCode};
+      let params = {invWarehouseCode: this.formData.invCode, status: 1};
       getInvSpaceList(params).then((res) => {
         if (!isBlank(this.countOrder.invSpaceCode)) {
           this.formData.invSpaceCode = this.countOrder.invSpaceCode;

src/views/inventory/InvCountOrderNew.vue

@@ -228,7 +228,7 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode};
+      let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
         this.getList();

src/views/inventory/InvMAOrderAudit.vue

@@ -229,7 +229,7 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode};
+      let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
       })

src/views/inventory/InvMAOrderCompleted.vue

@@ -212,7 +212,7 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode};
+      let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
       })

src/views/inventory/InvMAOrderModify.vue

@@ -318,7 +318,7 @@ export default {
     invChange() {
       this.formData.invSpaceCode = null;
       this.spaceList = [];
-      let params = {invWarehouseCode: this.formData.invCode};
+      let params = {invWarehouseCode: this.formData.invCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
       });
@@ -346,19 +346,31 @@ export default {
         //更新单据
         updateInvMAOrder(this.formData).then((res) => {
           if (!isBlank(this.formData.code)) {
-            //扫码添加库存养护记录详情
+            //判断此条码在列表中是否存在，如果已存在则表示已添加
-            let params = {
+            let flag = false;
-              orderIdFk: this.formData.orderId,
+            for (let i = 0; i < this.detailList.length; i++) {
-              code: this.formData.code
+              if (this.detailList[i].code === this.formData.code) {
-            }
+                flag = true;
-            addInvMAOrderDetail(params).then((res) => {
+                break;
-              if (res.code === 20000) {
-                this.$message.success("添加成功！");
-                this.getList();
-              } else {
-                this.$message.error(res.message);
               }
-            });
+            }
+
+            //此条码未保存，关闭弹窗之前调用接口添加详情记录
+            if (!flag) {
+              //扫码添加库存养护记录详情
+              let params = {
+                orderIdFk: this.formData.orderId,
+                code: this.formData.code
+              };
+              addInvMAOrderDetail(params).then((res) => {
+                if (res.code === 20000) {
+                  this.$message.success("添加成功！");
+                  this.getList();
+                } else {
+                  this.$message.error(res.message);
+                }
+              });
+            }
           }
         }).catch((error) => {
           this.$message.error("更新单据信息失败！");

src/views/inventory/InvMAOrderNew.vue

@@ -43,17 +43,17 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="养护记录号" prop="orderId" ></el-table-column>
+        <el-table-column label="养护记录号" prop="orderId"></el-table-column>
-        <el-table-column label="仓库" prop="invName" ></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
-        <el-table-column label="货位" prop="invSpaceName" ></el-table-column>
+        <el-table-column label="货位" prop="invSpaceName"></el-table-column>
-        <el-table-column label="养护日期" prop="createTime" ></el-table-column>
+        <el-table-column label="养护日期" prop="createTime"></el-table-column>
         <el-table-column label="养护人" prop="createUserName"></el-table-column>
         <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
           <template slot-scope="scope">
             <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" >
+        <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -198,7 +198,7 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode};
+      let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
       })