1.调整养护功能货位联动

2.修复单据备注编辑无法生效问题

src/api/inout/order.js

@@ -368,3 +368,11 @@ export function uploadSpms(query) {
         }
     );
 }
+
+export function updateOrderPrintRemark(data) {
+    return axios({
+        url: "/udiwms/inout/order/updateOrderPrintRemark",
+        method: "post",
+        data: data
+    });
+}

src/views/business/stockOrderInvSearch.vue

@@ -285,7 +285,7 @@
                 :closeDialog="closeDialog"
                 :detailList="detailList"
                 :billData="curRow"
-
+                :isShow="true"
             ></StockOrderEdit>
         </el-dialog>
 

src/views/business/stockOrderUpdate.vue

@@ -28,8 +28,10 @@
         <el-card class="el-card">
             <el-row style="margin-bottom: 20px;">
                 <el-button type="primary" @click="batchSetParams(null,'salesListNo')">批量设置销售清单</el-button>
-                <el-button type="primary" @click="batchSetParams(null, 'firstSalesInvNo')">批量设置销售发票第一票</el-button>
+                <el-button type="primary" @click="batchSetParams(null, 'firstSalesInvNo')">批量设置销售发票第一票
-                <el-button type="primary" @click="batchSetParams(null, 'secSalesInvNo')">批量设置销售发票第二票</el-button>
+                </el-button>
+                <el-button type="primary" @click="batchSetParams(null, 'secSalesInvNo')">批量设置销售发票第二票
+                </el-button>
             </el-row>
 
             <el-table v-loading="detailLoading"
@@ -155,7 +157,7 @@
 
 <script>
 import {stockOrderDetail, updateStockOrderDetail, findOrderByStockOrder} from "@/api/inout/stockOrder";
-import {updateOrder} from "@/api/inout/order";
+import {updateOrderPrintRemark} from "@/api/inout/order";
 
 export default {
     name: "stockOrderEdit",
@@ -336,12 +338,14 @@ export default {
 
 
         updateOrderRemark() {
-
+            let params = {
-
+                id: this.billData.orderIdFk,
-            updateOrder(this.orderQuery).then((response) => {
+                printRemark: this.orderQuery.printRemark
+            }
+            updateOrderPrintRemark(params).then((response) => {
                 if (response.code == 20000) {
                     this.$message.success("保存成功!");
-                    this.getByStockOrder();
+                    // this.getByStockOrder();
                 }
             }).catch(() => {
             })
@@ -349,6 +353,7 @@ export default {
     },
     created() {
         // this.getByStockOrder();
+        this.orderQuery.printRemark = this.billData.printRemark;
     }
 }
 </script>

src/views/inventory/addDeviceCollectOrder.vue

@@ -391,7 +391,6 @@ export default {
                         this.getAllWarehouse();
                         this.warehouseChange();
                     }
-                    this.getList();
                 }
             }).catch((error) => {
             });

src/views/inventory/invMAOrderAudit.vue

@@ -22,6 +22,7 @@
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择当前货位" clearable="true"
+                                   :disabled="disableSpace"
                                    size="mini">
                             <el-option
                                 v-for="item in spaceCodeList"
@@ -29,7 +30,7 @@
                                 :label="item.name"
                                 :value="item.code">
                                 <span style="float: left">{{ item.name }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.invSubStorageName }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -190,6 +191,7 @@ export default {
                 1: "未审核",
                 2: "已完成"
             },
+            disableSpace: false,
         };
     },
     methods: {
@@ -205,6 +207,8 @@ export default {
                 page: 1,
                 limit: 20
             };
+            this.spaceCodeList = [];
+            this.disableSpace = true;
             this.getList();
         },
         onSubmit() {
@@ -260,6 +264,10 @@ export default {
         invWarehouseChange() {
             this.filterQuery.invSpaceCode = null;
             this.spaceCodeList = [];
+            if (isBlank(this.filterQuery.invWarehouseCode)) {
+                this.disableSpace = true;
+            } else {
+                this.disableSpace = false;
                 let params = {
                     invStorageCode: this.filterQuery.invStorageCode,
                     invWarehouseCode: this.filterQuery.invWarehouseCode,
@@ -268,6 +276,7 @@ export default {
                 getSpaceCodeList(params).then((res) => {
                     this.spaceCodeList = res.data || [];
                 })
+            }
         },
         auditOrder(row) {
             this.$confirm('请选择审核意见', '提示', {

src/views/inventory/invMAOrderCompleted.vue

@@ -22,6 +22,7 @@
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择当前货位" clearable="true"
+                                   :disabled="disableSpace"
                                    size="mini">
                             <el-option
                                 v-for="item in spaceCodeList"
@@ -29,7 +30,7 @@
                                 :label="item.name"
                                 :value="item.code">
                                 <span style="float: left">{{ item.name }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.invSubStorageName }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -166,6 +167,7 @@ export default {
                 1: "未审核",
                 2: "已完成"
             },
+            disableSpace: false,
         };
     },
     components: {
@@ -184,9 +186,12 @@ export default {
                 page: 1,
                 limit: 20
             };
+            this.spaceCodeList = [];
+            this.disableSpace = true;
             this.getList();
         },
         onSubmit() {
+            this.filterQuery.page = 1;
             this.getList();
         },
         handleSizeChange(val) {
@@ -246,6 +251,10 @@ export default {
         invWarehouseChange() {
             this.filterQuery.invSpaceCode = null;
             this.spaceCodeList = [];
+            if (isBlank(this.filterQuery.invWarehouseCode)) {
+                this.disableSpace = true;
+            } else {
+                this.disableSpace = false;
                 let params = {
                     invStorageCode: this.filterQuery.invStorageCode,
                     invWarehouseCode: this.filterQuery.invWarehouseCode,
@@ -254,6 +263,7 @@ export default {
                 getSpaceCodeList(params).then((res) => {
                     this.spaceCodeList = res.data || [];
                 })
+            }
         },
         auditOrder(row) {
             this.$confirm('请选择审核意见', '提示', {

src/views/inventory/invMAOrderNew.vue

@@ -22,6 +22,7 @@
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择当前货位" clearable="true"
+                                   :disabled="disableSpace"
                                    size="mini">
                             <el-option
                                 v-for="item in spaceCodeList"
@@ -29,7 +30,7 @@
                                 :label="item.name"
                                 :value="item.code">
                                 <span style="float: left">{{ item.name }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.invSubStorageName }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -154,7 +155,8 @@ export default {
                 add: "新增养护记录",
                 edit: "编辑养护记录"
             },
-            maOrder: null
+            maOrder: null,
+            disableSpace: false
         };
     },
     components: {
@@ -173,6 +175,8 @@ export default {
                 page: 1,
                 limit: 20,
             };
+            this.spaceCodeList = [];
+            this.disableSpace = true;
             this.getList();
         },
         onSubmit() {
@@ -212,6 +216,10 @@ export default {
         invWarehouseChange() {
             this.filterQuery.invSpaceCode = null;
             this.spaceCodeList = [];
+            if (isBlank(this.filterQuery.invWarehouseCode)) {
+                this.disableSpace = true;
+            } else {
+                this.disableSpace = false;
                 let params = {
                     invStorageCode: this.filterQuery.invStorageCode,
                     invWarehouseCode: this.filterQuery.invWarehouseCode,
@@ -220,6 +228,7 @@ export default {
                 getSpaceCodeList(params).then((res) => {
                     this.spaceCodeList = res.data || [];
                 })
+            }
         },
         closeDialog() {
             this.formVisible = false;