完成维修提前交验订单流程

src/views/maintenance/repair/index.vue

@@ -414,7 +414,7 @@
                 </el-select>
               </el-form-item>
             </el-col> -->
-            <!-- TODO: -->
+        
             <el-col :span="8">
               <el-form-item label="维修人:" prop="pickId">
 
@@ -621,7 +621,7 @@
                   <!-- 维修及领用 -->
                   <el-button v-if="(seeTemp.orderStatue == 1 && seeTemp.SHStatue== 1 || seeTemp.SHStatue== 4 || seeTemp.SHStatue== 6) && isMaintenanceRequisition && (seeTemp.pickId == getdataListParm.parammaps.loginId)" style="display:inline-block" type="success" @click="handleMaintenanceRequisition()">维修及领用</el-button>
                   <el-button v-else style="display:none" @click="handleMaintenanceRequisition()">维修及领用</el-button>
-                  <!-- 完成维修 -->
+                  <!-- 完成维修 TODO: -->
                   <el-button v-if="(seeTemp.orderStatue == 1 && (seeTemp.SHStatue == 1 || seeTemp.SHStatue== 4 || seeTemp.SHStatue== 6)) && isRepairComplete && (seeTemp.pickId == getdataListParm.parammaps.loginId)" style="display:inline-block" type="success" @click="handleRepairComplete()">完成维修</el-button>
                   <el-button v-else style="display:none" @click="handleRepairComplete()">完成维修</el-button>
                 </el-form-item>
@@ -2006,7 +2006,8 @@ export default {
       percentage: 1,
       downLoadParm:{},
       downLoadList:[],
-      resubmit:{}
+      resubmit:{},
+      compateleMsg:''
     }
   },
   // computed: {
@@ -3374,40 +3375,97 @@ export default {
         })
       })
     },
-    // 完成维修
-    handleRepairComplete(row) {
-      console.log('点击了完成维修', row)
-      if (row == undefined) {
-        this.$set(this.seeTemp, 'isOldProducts', 0)
-        this.repairCompleteTemp = this.seeTemp
-      } else {
-        this.repairCompleteTemp = Object.assign({}, row)
-        this.$set(this.repairCompleteTemp, 'isOldProducts', 0)
+    
+    // TODO:
+    // 点击完成之前需要去查下 当前报修单号下的委外维修订单状态是否已 验收-审核通过状态
+    // 审核通知-可以完成维修
+    // 反之 -提示:当前订单无法完成维修
+    handleRepairComplete(row){
+      const requestBody = {
+        "name": "checkOutsourcingStatus",
+        "parammaps":{  "code": row.repairCode }
       }
-      this.No2 = false
-      this.dialogStatus = 'repairComplete'
-      this.dialogFormVisible_RepairComplete = true
-      this.getFaultList()
-
-      var send_data2 = {
-        "name": "getpartapplyListBybig",
-        "parammaps":{  "RUCode": row.repairCode }
-      }
-      GetDataByName(send_data2).then(response => {
-        console.log('自动带出旧品内容数据', response.data.list)
-        if (response.data.list !== null) {
-          this.listAdd = response.data.list
+      GetDataByName(requestBody).then(response => {
+        console.log('hss', response.data.list)
+        if (response.data.list != null) {
+          this.compateleMsg = response.data.list[0].vmsg;
+          this.$alert(this.compateleMsg, '维修进度通知', {
+          confirmButtonText: '确定',
+            callback: action => {
+              this.$message({
+                type: 'info',
+                message: '已关闭'
+              });
+              console.log('取消完成维修')
+            }
+          })
         } else {
-          this.listAdd = []
+          this.compateleMsg =  '';
+          if (row == undefined) {
+          this.$set(this.seeTemp, 'isOldProducts', 0)
+          this.repairCompleteTemp = this.seeTemp
+          } else {
+            this.repairCompleteTemp = Object.assign({}, row)
+            this.$set(this.repairCompleteTemp, 'isOldProducts', 0)
+          }
+          this.No2 = false
+          this.dialogStatus = 'repairComplete'
+          this.dialogFormVisible_RepairComplete = true
+          this.getFaultList()
+
+          var send_data2 = {
+            "name": "getpartapplyListBybig",
+            "parammaps":{  "RUCode": row.repairCode }
+          }
+          GetDataByName(send_data2).then(response => {
+            console.log('自动带出旧品内容数据', response.data.list)
+            if (response.data.list !== null) {
+              this.listAdd = response.data.list
+            } else {
+              this.listAdd = []
+            }
+            setTimeout(() => {
+              this.listLoading = false
+            }, 100)
+          })
+    
+        //
         }
-        setTimeout(() => {
-          this.listLoading = false
-        }, 100)
       })
-
-
-
+      
     },
+    // 完成维修
+    // handleRepairComplete(row) {
+      
+    //     if (row == undefined) {
+    //       this.$set(this.seeTemp, 'isOldProducts', 0)
+    //       this.repairCompleteTemp = this.seeTemp
+    //     } else {
+    //       this.repairCompleteTemp = Object.assign({}, row)
+    //       this.$set(this.repairCompleteTemp, 'isOldProducts', 0)
+    //     }
+    //     this.No2 = false
+    //     this.dialogStatus = 'repairComplete'
+    //     this.dialogFormVisible_RepairComplete = true
+    //     this.getFaultList()
+
+    //     var send_data2 = {
+    //       "name": "getpartapplyListBybig",
+    //       "parammaps":{  "RUCode": row.repairCode }
+    //     }
+    //     GetDataByName(send_data2).then(response => {
+    //       console.log('自动带出旧品内容数据', response.data.list)
+    //       if (response.data.list !== null) {
+    //         this.listAdd = response.data.list
+    //       } else {
+    //         this.listAdd = []
+    //       }
+    //       setTimeout(() => {
+    //         this.listLoading = false
+    //       }, 100)
+    //     })
+    
+    //   },
     changeIsOldProducts(val) {
       console.log(val)
       if (val == 1) {

src/views/maintenance/subcontractingMainten/tabPage/tab11.vue

@@ -6,7 +6,7 @@
         <el-option v-for="item in pastureNameList" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
 
-      <el-select v-model="tableObj1.getdataListParm.parammaps.departmentId" clearable style="width: 140px;" placeholder="部门" class="filter-item">
+      <el-select v-model="tableObj1.getdataListParm.parammaps.departmentId" clearable style="width: 140px;" placeholder="部门1" class="filter-item">
         <el-option v-for="item in departNameList1" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
  

src/views/maintenance/subcontractingMainten/tabPage/tab2.vue

@@ -65,17 +65,22 @@
             <span v-else>已验收</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="320" class-name="small-padding fixed-width" fixed="right">
+        <el-table-column label="单据状态" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.status == 0 ">正常</span>
+            <span v-else-if="scope.row.status == 1 ">关单</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="350" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
           <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
           <el-button  v-if="istab2Edit && row.isAcceptance == 0"  type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button v-if="istab2Del && row.isAcceptance == 0" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
-
           <el-button  v-if="row.isAcceptance == 0"  style="display:inline-block" type="success" size="mini" @click="form_submit(row)">提交</el-button>
+          <el-button  v-if="row.isAcceptance == 0"  style="display:inline-block" type="warning" size="mini" @click="form_submit(row)">关单</el-button>
           <el-button  v-if="istab2Shenhe1  && row.isAcceptance == 1 && (row.flowCompeleted == 1) "  style="display:inline-block" type="success" size="mini" @click="form_examine(row)">审核1</el-button>
           <el-button  v-if="istab2Shenhe2 && row.isAcceptance == 1 && (row.flowCompeleted == 2) "  style="display:inline-block" type="success" size="mini" @click="form_examine2(row)">审核2</el-button>
           <el-button  v-if="istab2Shenhe3 && row.isAcceptance == 1 && (row.flowCompeleted == 4) "  style="display:inline-block" type="success" size="mini" @click="form_examine3(row)">审核3</el-button>
-
         </template>
       </el-table-column>
 
@@ -164,13 +169,13 @@
                 <el-date-picker v-model="createTemp.hcdate" :picker-options="pickerOptions" type="date" placeholder="日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:100%" :disabled="dialogStatus==='see'"  />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="备注：" prop="remark">
-                <el-input ref="remark" v-model="createTemp.remark" :disabled="dialogStatus==='see'" />
-              </el-form-item>
-            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="备注：" prop="remark">
+                <el-input ref="remark" v-model="createTemp.remark" :disabled="dialogStatus==='see'" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-divider></el-divider>
 
@@ -739,7 +744,7 @@ export default {
         parammaps: { 'pastureId': Cookies.get('pastureid'), 'eId': Cookies.get('employeid') }
       },
       departNameList2: [],
-
+// TODO: 已关单状态
       // statuesNameList: [{ id: '0', name: '审核中' }, { id: '1', name: '已通过' }, { id: '2', name: '未通过' }],
       statuesNameList: [{ id: '0', name: '未离厂' }, { id: '1', name: '未回厂' }, { id: '2', name: '已回厂' }, { id: '3', name: '已验收' }],
       iscontractList:[{id: '0', name: '有合同'},{id: '1', name: '无合同'}],
@@ -1682,7 +1687,7 @@ export default {
 
         this.collectionSparePartsSeeTemp.empId =  this.collectionSparePartsSeeTemp.applicant
         this.collectionSparePartsSeeTemp.applyDate = parseTime(new Date(), '{y}-{m}-{d}')
-        this.dialogStatus = 'collectionSparePartsSee'
+        this.dialogStatus = 'collectionSparePartsSee'
         this.beforedialog = 'update'
         this.dialogFormVisible_CollectionSparePartsSee = true
         this.isCreatePartDelete = true