Merge branch 'dev-shuju' into test

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

@@ -138,22 +138,22 @@
                 @click="handleAppoint(scope.row, 'appoint')"
                 >指派</el-button>
                 <!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
-              <template v-if="(scope.row.serviceShowFlag && scope.row.serviceType !== 'volunteer')">
+              <template v-if="(scope.row.reportType == 'self_help' && scope.row.serviceShowFlag)">
                 <el-button
-                  v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scope.row.status == 'finished' && !scope.row.evaluateFlag)"
+                  v-if="scope.row.serviceType !== 'volunteer' && scope.row.status !== 'finished'"
                   type="text"
                   size="small"
                   @click="handleFinish(scope.row, 'finish')"
                   >完成情况</el-button>
               </template>
-              <!-- <template v-else>
+              <template v-else>
                 <el-button
                   v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scope.row.status == 'finished' && !scope.row.evaluateFlag)"
                   type="text"
                   size="small"
                   @click="handleFinish(scope.row, 'finish')"
                   >完成情况</el-button>
-              </template> -->
+              </template>
               <template v-if="scope.row.reportType != 'self_help'">
                 <el-button
                     v-if="scope.row.status === 'pending'"