1.优化设备养护功能

2.修复耗材摆放的重新摆放功能

src/views/inventory/InvGoodsPlacement.vue

@@ -517,7 +517,7 @@ export default {
                         cancelButtonText: '取消',
                         type: 'warning'
                     }).then(() => {
-                        this.codeArray.push(this.formData.code);
+                        this.codeArray.push({code: this.formData.code});
                     }).catch(() => {
                         this.loading = false;
                     });

src/views/inventory/deviceMAOrderCompleted.vue

@@ -4,11 +4,15 @@
             <el-form :inline="true" :model="filterQuery" size="mini">
                 <el-row style="width: 100%">
                     <el-form-item class="query-form-item">
-                        <el-input placeholder="请输入养护记录号" v-model="filterQuery.orderId"
+                        <el-input placeholder="设备编号" v-model="filterQuery.code"
                                   clearable="true"></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-input placeholder="请输入领用记录号" v-model="filterQuery.collOrderId"
+                        <el-input placeholder="养护记录号" v-model="filterQuery.orderId"
+                                  clearable="true"></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input placeholder="领用记录号" v-model="filterQuery.collOrderId"
                                   clearable="true"></el-input>
                     </el-form-item>
                     <el-form-item>
@@ -106,6 +110,7 @@ export default {
         return {
             filterQuery: {
                 status: 1,
+                code: null,
                 orderId: null,
                 collOrderId: null,
                 page: 1,
@@ -131,6 +136,7 @@ export default {
             });
             this.filterQuery = {
                 status: 1,
+                code: null,
                 orderId: null,
                 collOrderId: null,
                 page: 1,