修复bug

src/views/property/complaint/complaint.vue

@@ -11,7 +11,7 @@
           </a-col>
           <a-col :md="6" :sm="8">
             <a-form-model-item label="状态">
-              <a-select style="width: 100%" v-model="queryParam.chargeType" placeholder="请选择状态">
+              <a-select style="width: 100%" v-model="queryParam.handleStatus" placeholder="请选择状态">
                 <a-select-option v-for="item in dictOptions" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
               </a-select>
             </a-form-model-item>

src/views/property/maintenance/maintenance-detail.vue

@@ -63,12 +63,6 @@
                   <a-input v-model="model.maintenanceName" placeholder="请输入"></a-input>
                 </a-form-model-item>
               </a-col>
-              <a-col :span="12">
-                <a-form-model-item label="工单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairStatusName">
-                  <a-input v-model="model.repairStatusName" placeholder="请输入"></a-input>
-                </a-form-model-item>
-              </a-col>
-
               <a-col :span="24">
                 <a-form-model-item label="维修记录" :labelCol="{ xs:{ span: 24 }, sm:{ span: 2 } }" :wrapperCol="wrapperCol"
                   prop="maintenancePhoto">
@@ -77,10 +71,22 @@
                 </a-form-model-item>
               </a-col>
             </template>
+            <a-col :span="12">
+              <a-form-model-item label="工单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairStatusName">
+                <a-input v-model="model.repairStatusName" placeholder="请输入"></a-input>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="24"
+              v-if="(model.repairStatus === 'initiateRefuse' || model.repairStatus === 'finishRefuse') && model.auditOpinion">
+              <a-form-model-item label="驳回理由" :labelCol="{ xs: { span: 24 }, sm: { span: 2 } }" :wrapperCol="wrapperCol"
+                prop="auditOpinion">
+                <a-textarea v-model="model.auditOpinion" placeholder="请输入" style="width:80%" />
+              </a-form-model-item>
+            </a-col>
           </a-row>
         </a-form-model>
       </j-form-container>
-      <j-form-container v-if="!formDisabled">
+      <j-form-container v-if="formShow">
         <a-form-model ref="form" :model="form" slot="detail">
           <a-row>
             <a-col :span="24">
@@ -98,7 +104,7 @@
                 </a-select>
               </a-form-model-item>
             </a-col>
-            <a-col :span="24" v-if="form.repairStatus === 'initiateRefuse'">
+            <a-col :span="24" v-if="form.repairStatus === 'initiateRefuse' || form.repairStatus === 'finishRefuse'">
               <a-form-model-item label="驳回理由" :labelCol="{ xs: { span: 24 }, sm: { span: 2 } }" :wrapperCol="wrapperCol"
                 prop="auditOpinion">
                 <a-textarea v-model="form.auditOpinion" placeholder="请输入" style="width:80%" />
@@ -110,7 +116,7 @@
 
       <div style="text-align:center">
         <a-button @click="onReturn">返回</a-button>
-        <a-button style="margin-left: 16px" type="primary" v-if="!formDisabled" @click="onSubmit">提交</a-button>
+        <a-button style="margin-left: 16px" type="primary" v-if="formShow" @click="onSubmit">提交</a-button>
       </div>
     </a-spin>
   </div>
@@ -137,7 +143,7 @@ export default {
       currentStep: 1,
       model: {},
       form: {
-        repairStatus: 'waitDispatch',
+        repairStatus: '',
         auditOpinion: '',
       },
       labelCol: {
@@ -152,8 +158,8 @@ export default {
     }
   },
   computed: {
-    formDisabled() {
-      return this.$route.query.type === '1'
+    formShow() {
+      return this.$route.query.type === 'audit'
     },
   },
   created() {
@@ -171,39 +177,43 @@ export default {
       if (result.repairStatus === 'initiateWaitAudit') {
         initiatewaitAuditList[0].time = '提交成功' + result.createTime
         this.auditList = [...initiatewaitAuditList]
-      }else if (result.repairStatus === 'waitDispatch') {
+      } else if (result.repairStatus === 'waitDispatch') {
         initiatewaitAuditList[0].time = '提交成功' + result.createTime
         initiatewaitAuditList[1].time = '审核通过' + result.initiateAuditTime
         this.auditList = [...initiatewaitAuditList]
         this.currentStep = 2
-      }else if (result.repairStatus === 'waitReceive') {
+      } else if (result.repairStatus === 'waitReceive') {
         initiatewaitAuditList[0].time = '提交成功' + result.createTime
         initiatewaitAuditList[1].time = '审核通过' + result.initiateAuditTime
         initiatewaitAuditList[2].time = '派单成功待接收' + result.updateTime
         this.auditList = [...initiatewaitAuditList]
         this.currentStep = 2
-      }else if (result.repairStatus === 'inRepair') {
+      } else if (result.repairStatus === 'inRepair') {
         initiatewaitAuditList[0].time = '提交成功' + result.createTime
         initiatewaitAuditList[1].time = '审核通过' + result.initiateAuditTime
         initiatewaitAuditList[2].time = '派单成功待接收' + result.updateTime
         this.auditList = [...initiatewaitAuditList]
         this.currentStep = 3
-      }else if (result.repairStatus === 'finishWaitAudit' || result.repairStatus === 'finishRefuse' || result.repairStatus === 'finishAuditPass') {
+      } else if (
+        result.repairStatus === 'finishWaitAudit' ||
+        result.repairStatus === 'finishRefuse' ||
+        result.repairStatus === 'finishAuditPass'
+      ) {
         initiatewaitAuditList[0].time = '提交成功' + result.createTime
         initiatewaitAuditList[1].time = '审核通过' + result.initiateAuditTime
         initiatewaitAuditList[2].time = '派单成功待接收' + result.updateTime
         this.auditList = [...initiatewaitAuditList]
         this.currentStep = 4
-      }else if (result.repairStatus === 'finish') {
+      } else if (result.repairStatus === 'finish') {
         initiatewaitAuditList[0].time = '提交成功' + result.createTime
         initiatewaitAuditList[1].time = '审核通过' + result.initiateAuditTime
         initiatewaitAuditList[2].time = '派单成功待接收' + result.updateTime
         this.auditList = [...initiatewaitAuditList]
         this.currentStep = 5
-      }else{
+      } else {
         initiatewaitAuditList[0].time = '提交成功' + result.createTime
         this.auditList = [...initiatewaitAuditList]
-        this.currentStep = 0  
+        this.currentStep = 0
       }
     },
     onReturn() {
@@ -211,13 +221,17 @@ export default {
       this.$router.go(-1)
     },
     async onSubmit() {
-      let res = await auditCommunityRepairApi({
-        id: this.$route.query.id,
-        repairStatus: this.form.repairStatus,
-        auditOpinion: this.form.repairStatus === 'waitDispatch' ? '' : this.form.repairStatus,
-      })
-      this.$message.success(res.message)
-      this.onReturn()
+      if (this.form.repairStatus) {
+        let res = await auditCommunityRepairApi({
+          id: this.$route.query.id,
+          repairStatus: this.form.repairStatus,
+          auditOpinion: this.form.auditOpinion,
+        })
+        this.$message.success(res.message)
+        this.onReturn()
+      }else{
+        this.$message.warning('请选择审核意见');
+      }
     },
   },
 }

src/views/property/maintenance/maintenance.vue

@@ -69,7 +69,7 @@
           
           <template v-if="record.repairStatus === 'initiateWaitAudit'">
             <a-divider type="vertical"/>
-            <a @click="onDetail(record.id)">报单审核</a>
+            <a @click="onDetail(record.id, 'audit')">报单审核</a>
           </template>
           <template v-if="record.repairStatus === 'waitDispatch'">
             <a-divider type="vertical"/>
@@ -77,7 +77,7 @@
           </template>
           <template v-if="record.repairStatus === 'finishWaitAudit'">
             <a-divider type="vertical"/>
-            <a @click="onDetail(record.id)">回单审核</a>
+            <a @click="onDetail(record.id, 'audit')">回单审核</a>
           </template>
         </span>
       </a-table>