Merge branch 'dev-shuju' into test

src/views/modules/communityService/measure/index.vue

@@ -137,8 +137,9 @@
                 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'"
+                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')"
@@ -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) {