diff --git a/src/views/mes/pms/inspect/order/execute.vue b/src/views/mes/pms/inspect/order/execute.vue
index 0bd7722..dafa6e0 100644
--- a/src/views/mes/pms/inspect/order/execute.vue
+++ b/src/views/mes/pms/inspect/order/execute.vue
@@ -403,6 +403,20 @@ export default {
               }).then(() => {
                 this.formObj.stateName = 'COMPLETE'
                 checkObj.checkResult = 'Y'
+
+                showLoading()
+                inspectCheck(checkObj).then(res => {
+                  hideLoading()
+                  if (res.data.code !== 0) {
+                    return me.$message.error('操作失败：' + res.data.msg);
+                  }
+                  this.$message.success("验收完成")
+                  me.handleClose()
+                }).catch((e) => {
+                  hideLoading()
+                  this.$message.error('操作失败：' + e)
+                })
+                return true;
               })
             // } else {
             //   getRepairOrderStatus({num:this.formObj.repairNum}).then(resp => {
@@ -427,6 +441,7 @@ export default {
             //     }
             //   })
             // }
+            return true;
           } else {
             this.formObj.stateName = 'COMPLETE'
             checkObj.checkResult = 'Y'
@@ -437,18 +452,20 @@ export default {
           checkObj.checkResult = 'N'
         }
 
-        showLoading()
-        inspectCheck(checkObj).then(res => {
-          hideLoading()
-          if (res.data.code !== 0) {
-            return me.$message.error('操作失败：' + res.data.msg);
-          }
-          this.$message.success("验收完成")
-          me.handleClose()
-        }).catch((e) => {
-          hideLoading()
-          this.$message.error('操作失败：' + e)
-        })
+        if (me.formObj.result === '0') {
+          showLoading()
+          inspectCheck(checkObj).then(res => {
+            hideLoading()
+            if (res.data.code !== 0) {
+              return me.$message.error('操作失败：' + res.data.msg);
+            }
+            this.$message.success("验收完成")
+            me.handleClose()
+          }).catch((e) => {
+            hideLoading()
+            this.$message.error('操作失败：' + e)
+          })
+        }
       }
     },
     getDateTime() {
diff --git a/src/views/mes/pms/maintenance/execute/order-implement/index.vue b/src/views/mes/pms/maintenance/execute/order-implement/index.vue
index ad638f7..a2cfac7 100644
--- a/src/views/mes/pms/maintenance/execute/order-implement/index.vue
+++ b/src/views/mes/pms/maintenance/execute/order-implement/index.vue
@@ -6,7 +6,8 @@
       <input-select-dialog
           :modal-fetch-fun='getPartList' :modal-obj="partDialogObj"
           :modal-show.sync="partDialogVisible"
-          @inputDialogSelected="partDialogSelected"></input-select-dialog>
+          @inputDialogSelected="partDialogSelected">
+      </input-select-dialog>
       <!-- 图片预览弹出框 -->
       <FileView :open.sync="dialogImgVisible" :url="previewUrl"/>
       <el-form ref="formObj" :model="formObj" :rules="formRules">
@@ -355,6 +356,7 @@ export default {
         }
       ],
       consumableRecord: [],
+      lastSelectedPart: { partId: null, time: 0 }, // 记录上次选择的备件和时间
     }
   },
   computed: {
@@ -473,11 +475,21 @@ export default {
     },
     // 耗材弹出框选择
     partDialogSelected(row) {
+      const now = Date.now();
+      // 如果同一备件在1秒内重复选择，则忽略
+      if (row.partId === this.lastSelectedPart.partId && now - this.lastSelectedPart.time < 1000) {
+        return;
+      }
+      // 更新最后选择的备件和时间
+      this.lastSelectedPart = { partId: row.partId, time: now };
       if (this.consumeIndex >= 0) {
         let me = this
+        if (row.qtyOnHand < 0 ){
+          return me.$message.warning(`【${row.partName}】该备件数量不足，请重新选择！`)
+        }
         // 判断被选中的备件是否已在备件清单中
         if (me.consumableRecord.find(obj => obj.partId === row.partId)) {
-          return me.$message.warning('该备件已存在备件清单中，请重新选择！')
+          return me.$message.warning(`【${row.partName}】该备件已存在备件清单中，请重新选择！`)
         }
         me.$set(me.consumableRecord[me.consumeIndex], "partId", row.partId)
         me.$set(me.consumableRecord[me.consumeIndex], "partName", row.partName)
@@ -526,7 +538,7 @@ export default {
           me.$message.success('操作成功')
         }).catch((e) => {
           hideLoading()
-          this.$message.error('操作失败：' + e)
+          // this.$message.error('操作失败：' + e)
         })
       }
       if (type === 'success' || type === 'fail') {
diff --git a/src/views/mes/pms/repair/repair-order-execution/order-info/execute.vue b/src/views/mes/pms/repair/repair-order-execution/order-info/execute.vue
index 8315a28..c0247b0 100644
--- a/src/views/mes/pms/repair/repair-order-execution/order-info/execute.vue
+++ b/src/views/mes/pms/repair/repair-order-execution/order-info/execute.vue
@@ -558,6 +558,7 @@ export default {
           {required: true, message: "请填写验收意见", trigger: "focus"},
         ],
       },
+      lastSelectedPart: { partId: null, time: 0 }, // 记录上次选择的备件和时间
     }
   },
   created() {
@@ -915,11 +916,21 @@ export default {
       }
     },
     partDialogSelected(row) {
+      const now = Date.now();
+      // 如果同一备件在1秒内重复选择，则忽略
+      if (row.partId === this.lastSelectedPart.partId && now - this.lastSelectedPart.time < 1000) {
+        return;
+      }
+      // 更新最后选择的备件和时间
+      this.lastSelectedPart = { partId: row.partId, time: now };
       if (this.consumeIndex >= 0) {
         let me = this
+        if (row.qtyOnHand < 0 ){
+          return me.$message.warning(`【${row.partName}】该备件数量不足，请重新选择！`)
+        }
         // 判断被选中的备件是否已在备件清单中
         if (me.consumableRecord.find(obj => obj.partId === row.partId)) {
-          return me.$message.warning('该备件已存在备件清单中，请重新选择！')
+          return me.$message.warning(`【${row.partName}】该备件已存在备件清单中，请重新选择！`)
         }
         me.$set(me.consumableRecord[me.consumeIndex], "partId", row.partId)
         me.$set(me.consumableRecord[me.consumeIndex], "partName", row.partName)