Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev

src/views/repair/tickets/Components/TicketWaresShow.vue

@@ -288,7 +288,6 @@ export default {
             remark: item.remark
           }
         })]
-        console.log(this.formData)
         await auditTicketWares(this.formData)
         this.dialogVisible = false
         this.$modal.msgSuccess("审核成功")

src/views/repair/tickets/form/UpdateRecord.vue

@@ -1,7 +1,25 @@
 <template>
   <div class="app-container">
     <el-dialog title="流程记录" :visible.sync="dialogVisible" width="60%" v-dialogDrag append-to-body>
-      <el-form :model="formData" ref="formRef" :rules="formRules" :loading="formLoading" :inline="true" label-width="15rem">
+      <el-row :gutter="1">
+        <el-col :span="24">
+          <span class="notice">{{
+              projectList.length === 0
+                ? (this.formData.recordType === 'kssg'
+                    ? "没有项目可以施工"
+                    : (this.formData.recordType === 'sgz')
+                      ? "没有项目在施工中"
+                      : (this.formData.recordType === 'sgwczj'
+                          ? "没有项目可以完成"
+                          : ''
+                      )
+                )
+                : ''
+            }}</span>
+        </el-col>
+      </el-row>
+      <el-form :model="formData" ref="formRef" :rules="formRules" :loading="formLoading" :inline="true"
+               label-width="15rem">
         <el-row :gutter="1">
           <el-col :span="24">
             <el-form-item v-if="formData.recordType !== 'zj'" label="维修项目" prop="item.id">
@@ -14,7 +32,8 @@
         <el-row :gutter="1">
           <el-col :span="24">
             <el-form-item label="描述" prop="remark">
-              <el-input style="width: 30rem" type="textarea" v-model="formData.remark" :autosize="{ minRows: 4, maxRows: 8}"/>
+              <el-input style="width: 30rem" type="textarea" v-model="formData.remark"
+                        :autosize="{ minRows: 4, maxRows: 8}"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -28,12 +47,22 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="formData.recordType !== 'sgwczj'" type="primary" @click="doUpdate">确 定</el-button>
-        <el-button v-if="formData.recordType === 'sgwczj'" type="primary" @click="doUpdate">部分完成</el-button>
-        <el-button v-if="formData.recordType === 'sgwczj'" type="success" @click="doFinish">
-          {{isNext ? "整体完成并指派下一项目" : (isEndCheck ? "整体完成并移交总检" : "整体完成")}}
+        <el-button v-if="formData.recordType !== 'sgwczj' && projectList.length > 0" type="primary" @click="doUpdate(null)">确
+          定
         </el-button>
-        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button v-if="formData.recordType === 'sgwczj' && projectList.length !== 0" type="primary" @click="doUpdate(null)">
+          部分完成
+        </el-button>
+        <el-button v-if="formData.recordType === 'sgwczj' && projectList.length !== 0" type="primary" @click="doFinish">
+          完成并移交下一班组
+        </el-button>
+        <el-button v-if="formData.recordType === 'sgwczj' && !isNext && projectList.length !== 0" type="primary"
+                   @click="doFinish">
+          {{ isEndCheck ? "完成并移交总检" : "完成工单" }}
+        </el-button>
+        <!--        <el-button v-if="formData.recordType === 'sgwczj'" type="success" @click="doFinish">-->
+        <!--          {{isNext ? "整体完成并指派下一项目" : (isEndCheck ? "整体完成并移交总检" : "整体完成")}}-->
+        <!--        </el-button>-->
       </div>
     </el-dialog>
 
@@ -100,6 +129,7 @@ export default {
     async open(row) {
       this.init()
       this.clickRow = row
+      // 是否需要总检
       this.isEndCheck = row.endCheck === '1'
       this.formData.id = row.id
       this.formData.recordType = row.clickType
@@ -113,21 +143,28 @@ export default {
         this.projectList = res.data
         this.formData.ticketsWorkStatus = "02"
         this.formData.item.itemStatus = "02"
-        if (this.formData.recordType === 'kssg') {
-          this.projectList = this.projectList.filter(item => item.itemStatus === '01')
-        }else if (this.formData.recordType === 'sgz'){
+        // 下面 01：未派工、02：施工中、03：已完成
+        // 开始施工展示所有的项目，方便返工
+        // 施工中的项目只展示施工中的项目，一是没施工就有施工记录不合理，二是防止项目太多员工选错，三已完成的项目需要重新就重新开始施工
+        // 施工完成同施工中
+        if (this.formData.recordType !== 'kssg') {
           this.projectList = this.projectList.filter(item => item.itemStatus === '02')
-        }else {
+          // 施工完成需要特殊计算一些东西
+          // 项目全完成需要总检、项目全完成不需要总检、项目没有全完成
+          if (this.formData.recordType !== 'sgz') {
             // 因为自己手里有一个项目，所以是>1
             this.isNext = this.projectList.filter(item => item.itemStatus !== '03').length > 1
-          this.projectList = this.projectList.filter(item => item.itemStatus === '02')
+          }
         }
       } finally {
         this.formLoading = false
       }
     },
-    async doUpdate(){
+    async doUpdate(nextName = null) {
       try {
+        if (nextName){
+          this.formData['nextName'] = nextName
+        }
         if (this.formData.recordType === 'zj') {
           this.formData.ticketsWorkStatus = '03'
           this.formData['isFinish'] = '1'
@@ -136,13 +173,17 @@ export default {
           await this.$refs.formRef.validate()
           this.formLoading = true
           await updateStatus(this.formData)
+          if (!nextName) {
             this.$modal.msgSuccess("操作成功")
+          }
           this.dialogVisible = false
           this.$emit("success")
         } else {
           this.formLoading = true
           await updateStatus(this.formData)
+          if (nextName) {
             this.$modal.msgSuccess("操作成功")
+          }
           this.dialogVisible = false
           this.$emit("success")
         }
@@ -157,25 +198,36 @@ export default {
         this.formData.item.itemStatus = "03"
         // 整体完成并指派下一个人
         if (this.isNext) {
+          this.formData['finishType'] = "01"
           await this.$refs.updateRepair.open(this.clickRow)
           return
         }
         // 整体完成并移交总检
         if (this.isEndCheck) {
+          this.formData['finishType'] = "02"
           this.formData.ticketsWorkStatus = "05"
           await this.doUpdate();
           return
         }
         // 整体完成,只有没有项目，不需要总检，这个工单才是完了
         this.formData.ticketsWorkStatus = "03"
+        this.formData['finishType'] = "03"
         this.formData['isFinish'] = '1'
         await this.doUpdate()
-      }catch{}
+      } catch {
+      }
     }
   }
 }
 </script>
 
 <style scoped lang="scss">
-
+.notice {
+  display: inline-block;
+  width: 100%;
+  text-align: center;
+  margin: 1rem 0;
+  font-size: 18px;
+  color: red;
+}
 </style>

src/views/repair/tickets/form/UpdateRepair.vue

@@ -208,7 +208,7 @@ export default {
         await updateRepair(this.formData)
         this.$modal.msgSuccess("指派成功")
         this.dialogVisible = false
-        this.$emit("success")
+        this.$emit("success", this.formData.nowRepairName)
       } catch {
 
       }