diff --git a/src/views/material/repair/repairManage/component/edit.vue b/src/views/material/repair/repairManage/component/edit.vue
index 77f0238c..8a4a4aed 100644
--- a/src/views/material/repair/repairManage/component/edit.vue
+++ b/src/views/material/repair/repairManage/component/edit.vue
@@ -218,6 +218,12 @@
             </div>
           </template>
         </el-table-column>
+        <!-- <el-table-column label="是否完成维修" prop="isFinished" align="center" width="150">
+          <template slot-scope="scope">
+            <div v-if="scope.row.isFinished==1" style="color: green;">{{ "已完成" }}</div>
+            <div v-if="scope.row.isFinished==0" style="color: red;">{{ "未完成" }}</div>
+          </template>
+       </el-table-column> -->
         <el-table-column label="操作" align="center" width="300px">
           <template slot-scope="scope">
             <el-button
@@ -1099,7 +1105,23 @@ export default {
         { label: "自然损坏", id: 0 },
         { label: "人为损坏", id: 1 },
       ], //自然损坏、人为损坏
-      scrapRules: {},
+      scrapRules: {
+        scrapType: [
+          {
+            required: true,
+            message: "请选择损坏原因",
+            trigger: "change",
+          },
+        ],
+        scrapReason: [
+          {
+            required: true,
+            message: "请输入报废原因",
+            trigger: "blur",
+          },
+        ],
+
+      },
       //树状勾选
       deviceTypeTree: [], // 设备 树结构数据
       // 设备 树显示 配置
@@ -1412,6 +1434,9 @@ export default {
         this.repairRowData.repairDeviceList.length > 0
       ) {
         this.repairDeviceList = this.repairRowData.repairDeviceList;
+        // this.repairDeviceList.forEach((item) => {
+        //   item.isFinished = item.status == 1 ? 1 : 0;
+        // });
       }
     },
     filterTree(nodes) {
@@ -1536,19 +1561,22 @@ export default {
       this.fileList.splice(sum, 1);
     },
     // 待报废保存按钮
-   async saveSubmit() {
+    saveSubmit() {
       this.uploadKey = Date.now();
-
-      if(this.fileList.length!=0){
-        await  this.getImaUpload(),
-        await this.addWaitRepairPic(this.scrapForm);
-      }else{
-          await this.addWaitRepairPic(this.scrapForm);
-      }
-      this.scrapRowData.repairType = 3
-      this.scrapRowData.codeScrapRepairPartList.push(this.scrapForm)
-
-      this.openScrap = false;
+      this.$refs["scrapForm"].validate(async(valid) => {
+          if(valid){
+            if(this.fileList.length!=0){
+            await  this.getImaUpload(),
+            await this.addWaitRepairPic(this.scrapForm);
+          }else{
+              await this.addWaitRepairPic(this.scrapForm);
+          }
+          this.scrapRowData.repairType = 3
+          this.scrapRowData.codeScrapRepairPartList.push(this.scrapForm)
+          this.scrapRowData.status = 1
+          this.openScrap = false;
+            }
+    })
       // this.reset();
     },
     
@@ -1597,6 +1625,7 @@ export default {
 
     //内部维修
     openInnerDialog(row) {
+      console.log('111111111',row)
       this.innerRowData = row;
       this.partTableList = [];
       if (
@@ -1719,8 +1748,13 @@ export default {
       this.innerRowData.partTableList.forEach((item) => {
         this.innerRowData.codeInRepairPartList.push(item);
       });
-
-      this.openInner = false;
+      if(this.partTableList.length==0) {
+        this.$message.error("请添加配件！");
+        return;
+      }else{
+        this.innerRowData.status = 1;
+        this.openInner = false;
+      }
       // console.log(this.equipmentList)
     },
 
@@ -1805,6 +1839,7 @@ export default {
             this.backRowData.backTableList.forEach((item) => {
               this.backRowData.codeOutRepairPartList.push(item);
             });
+            this.backRowData.status = 1;
             this.openBack = false;
           }
         });
@@ -1826,7 +1861,6 @@ export default {
 
     // 待报废-打开
     openScrapDialog(row) {
-      console.log('row11',row)
       this.scrapRowData = row;
       this.scrapForm = {};
       this.openScrap = true;