维修完善

src/views/repair/application-form/modules/DetailRepair.vue

@@ -316,7 +316,7 @@
     </div>
     <check-form ref="checkForm" @ok="handleOk" />
     <base-out-form ref="outForm" @ok="handleCancel" />
-    <finish-form ref="finishForm" @ok="handleOk" />
+    <finish-form ref="finishForm" @ok="handleCancel" />
     <dispatch-form ref="dispatchForm" @ok="handleCancel" />
     <assign-form ref="assignForm" @ok="handleCancel" />
     <spare-pick-base-form ref="baseModal" @ok="handleOk"/>

src/views/workplace/backlog/WorkplaceBacklog.vue

@@ -274,7 +274,8 @@ export default {
         }
         if (record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE, 'REPAIR_APPLICATION') ||
           record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE, 'REPAIR_DISPATCH') ||
-          record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE, 'REPAIR_BACK')) {
+          record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE, 'REPAIR_BACK') ||
+          record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE, 'REPAIR_RECEIVE')) {
           fetchRepairApplicationForm({ id: record.otherId }).then(res => {
             this.visible = false
             const modal = this.$refs.detailRepairApplicationFormRepairModal
@@ -284,14 +285,15 @@ export default {
         if (record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE, 'REPAIR_OK')) {
           fetchRepairApplicationForm({ id: record.otherId }).then(res => {
             this.visible = false
-            const modal = this.$refs.detailRepairApplicationFormModal
+            const modal = this.$refs.detailRepairApplicationFormRepairModal
             modal.base(res.data)
           })
         }
         if (record.detailType === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE, 'REPAIR_FINISH')) {
           fetchRepairApplicationForm({ id: record.otherId }).then(res => {
             this.visible = false
-            const modal = this.$refs.detailRepairApplicationFormCheckModal
+            // const modal = this.$refs.detailRepairApplicationFormCheckModal
+            const modal = this.$refs.detailRepairApplicationFormRepairModal
             modal.base(res.data)
           })
         }