bug修改

src/views/businessManagement/inspection/repair.vue

@@ -962,7 +962,7 @@ export default {
     handleConfirm() {
       if (this.errorForm.approveResult1 == 0) {//否
         if(this.errorForm.approveRemark ==''){
-          this.$message.success('请输入原因！')
+          this.$message.error('请输入原因！')
           return false
         }
         let query = {

src/views/businessManagement/ordinary.vue

@@ -12,7 +12,8 @@
       </template>
       <template slot-scope="{row}" slot="overStatusSearch">
         <el-select placeholder="请选择完成状态" v-model="searchForm.overStatus">
-          <el-option v-for="item in overStatusList" :key="item.value" :label="item.name" :value="item.value"></el-option>
+          <el-option v-for="item in overStatusList" :key="item.value" :label="item.name"
+            :value="item.value"></el-option>
         </el-select>
       </template>
       <template slot="fillingTimeSearch">
@@ -594,7 +595,8 @@
           </el-form-item>
         </div>
         <!-- 维修人员  上传维修完成图片列表 403 104 202 203 204 400-->
-        <div v-show="repairForm.status == 403 || repairForm.status == 103|| repairForm.status == 104 || repairForm.status == 202|| repairForm.status == 203|| repairForm.status == 204|| repairForm.status == 400">
+        <div
+          v-show="repairForm.status == 403 || repairForm.status == 103 || repairForm.status == 104 || repairForm.status == 202 || repairForm.status == 203 || repairForm.status == 204 || repairForm.status == 400">
           <el-form-item label="维修完成图片" prop="signaturePerson" v-if="repairForm.status == 103">
             <el-upload action="/api/blade-resource/oss/endpoint/put-file" list-type="picture-card" :headers="headers"
               accept=".jpeg,.jpg,.png,.pdf" :file-list="completeImgList" :on-success="handleSuccess"
@@ -1744,6 +1746,16 @@ export default {
                   query.discount = 0
 
                 }
+                let query1 = {
+                  details: data,
+                  applyUserId: this.userInfo.user_id,							//申领人Id
+                  applyUser: this.userInfo.user_name,								//申领人
+                  applyTime: moment().format('YYYY-MM-DD HH:mm:ss'),							//申领时间(yyyy-MM-dd HH:mm:ss)
+                  status: 0,
+                  workId: this.addForm.id,
+                  remark:'维修单申领'
+                }
+
                 editData(query).then(res => {
                   if (res.data.code == 200) {
                     servicemanSubmit({
@@ -1752,9 +1764,14 @@ export default {
                       deviceName: this.repairForm.deviceName,
                       repairType: this.repairForm.repairType
                     }).then(res => {
+                      applyGoods(query1).then(res => {
+                        if (res.data.code == 200) {
                           this.$message.success("提交成功")
                           this.repairVisible = false
                           this.onLoad()
+                        }
+                      })
+
                     })
                   }
                 })
@@ -1997,7 +2014,7 @@ export default {
                   status: 0,
                   workId: this.addForm.id,
                 }
-                applyGoods(query1).then(res => {
+                // applyGoods(query1).then(res => {
                   if (res.data.code == 200) {
                     servicemanReceive({ id: this.addForm.id }).then(res => {
                       if (res.data.code == 200) {
@@ -2007,7 +2024,7 @@ export default {
                       }
                     })
                   }
-                })
+                // })
               }
             } else {
               // 维修人员接单