Merge remote-tracking branch 'origin/master'

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

@@ -29,7 +29,7 @@
               v-if="$auth('repair-application-forms-transfer') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status"
               style="margin-left: 8px" type="default" @click="handleTransfer">转派</a-button>
             <a-button
-              v-if="$auth('repair-application-forms-finish') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status"
+              v-if="$auth('repair-application-forms-finish') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status && DictCache.VALUE.REPAIR_ASSISTANT_STATUS.repair === model.assistantStatus "
               style="margin-left: 8px" type="default" @click="handleFinish()">完成</a-button>
             <!-- 新增维修开始、暂停、继续维修、结束按钮 -->
             <a-button v-if=" DictCache.VALUE.REPAIR_ASSISTANT_STATUS.init === model.assistantStatus "
@@ -38,8 +38,8 @@
                       style="margin-left: 8px" @click="handlePauseRepair">暂停维修</a-button>
             <a-button v-if=" DictCache.VALUE.REPAIR_ASSISTANT_STATUS.pause === model.assistantStatus "
                       style="margin-left: 8px" @click="handleContinueRepair">继续维修</a-button>
-            <a-button v-if=" DictCache.VALUE.REPAIR_ASSISTANT_STATUS.repair === model.assistantStatus "
-                      style="margin-left: 8px" @click="handleEndRepair">结束维修</a-button>
+<!--            <a-button v-if=" DictCache.VALUE.REPAIR_ASSISTANT_STATUS.repair === model.assistantStatus "
+                      style="margin-left: 8px" @click="handleEndRepair">结束维修</a-button>-->
             <!-- 隐藏查看工单中的修改按钮 -->
             <!-- <a-button v-if="$auth('repair-application-forms-edit')" style="margin-left: 8px" type="default" @click="handleEdit()">修改</a-button> -->
             <a-popconfirm v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.WAIT_SUBMIT === model.status"