From 1749f197524f14b727d8b57bf0c1f5b006a140ba Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 28 Dec 2021 15:23:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/measure/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 8da78a93..c324dc42 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -137,6 +137,7 @@
                 size="small"
                 @click="handleAppoint(scope.row, 'appoint')"
                 >指派</el-button>
+                <!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
               <el-button
                 v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'"
                 type="text"
@@ -738,6 +739,8 @@ export default {
         this.finishServiceTime = row.serviceStartTime && [row.serviceStartTime, row.serviceEndTime] || ''
       }
       if (addType == 'finish') {
+        if (row.serviceStartTime) this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime]
+        
         this.form.finishResult = 'resolved'
       }
       if (addType == 'appoint' && row.serviceType) {

From f9ecf3bd10c24a6655f4650599973697697bb20e Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 28 Dec 2021 16:05:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9C=80=E6=B1=82=E8=AF=84=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/measure/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index c324dc42..7d7b032f 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -139,7 +139,7 @@
                 >指派</el-button>
                 <!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
               <el-button
-                v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'"
+                v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scoped.row.status == 'finished' && !scoped.row.evaluateFlag)"
                 type="text"
                 size="small"
                 @click="handleFinish(scope.row, 'finish')"