Merge remote-tracking branch 'origin/dev' into dev

src/views/inventory/DeviceReceiveOrderModify.vue

@@ -279,7 +279,7 @@
         :total="productTotal"
         :limit.sync="filterQuery.limit"
         :page.sync="filterQuery.page"
-        @pagination="getList"
+        @pagination="queryInvProducts"
       ></pagination>
     </el-dialog>
   </div>
@@ -630,7 +630,7 @@ export default {
     },
     combine() {
       if (this.multiProduct.length === 0) {
-        this.$message.error("请选择养护产品！");
+        this.$message.error("请选择领用产品！");
         return;
       }
       let invProductIds = [];

src/views/inventory/DeviceRepairOrderModify.vue

@@ -298,7 +298,7 @@ export default {
         urgencyType: [{required: true, message: '请选择紧急程度', trigger: 'blur'}],
         planTime: [{required: true, message: '请选择计划完成日期', trigger: 'blur'}],
       },
-      check: true,
+      check: false,
       detailList: [],
       inputQuery: {},
       repairOrderSetVisible: false,
@@ -371,6 +371,7 @@ export default {
         return;
       }
       this.setDeptAnInvName();
+      this.check = false
       this.deviceDialogVisible = true;
       this.filterQuery = {
         code: null,
@@ -437,10 +438,14 @@ export default {
       this.selectRow = val[0];
     },
     combine() {
-      if (this.check) {
+      if (this.check == false) {
         this.$message.error("请勾选设备!")
         return;
       }
+      if (this.repairOrder.deviceName != null && this.repairOrder.deviceName != '') {
+        this.$message.error("该设备已选入!")
+        return
+      }
       this.deviceDialogVisible = false;
       this.repairOrder.code = this.selectRow.code;
       this.repairOrder.deviceName = this.selectRow.deviceName;