Merge branch 'feature_bug' into dev

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

@@ -213,17 +213,9 @@
                 >指派</el-button
               >
               <!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
-              <template
+              <template v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'">
-                v-if="
-                  scope.row.reportType == 'self_help' &&
-                  scope.row.serviceShowFlag
-                "
-              >
                 <el-button
-                  v-if="
+                  v-if="scope.row.status !== 'finished'"
-                    scope.row.serviceType !== 'volunteer' &&
-                    scope.row.status !== 'finished'
-                  "
                   type="text"
                   size="small"
                   @click="handleFinish(scope.row, 'finish')"
@@ -239,8 +231,8 @@
                   "
                   type="text"
                   size="small"
-                  @click="handleFinish(scope.row, 'finish')"
+                  @click="handleFinish(scope.row, 'finishNoEvaluate')"
-                  >完成情况</el-button
+                  >评价</el-button
                 >
               </template>
               <template v-if="scope.row.reportType != 'self_help'">
@@ -538,7 +530,8 @@
         <template
           v-if="
             (addType == 'finish' && form.reportType != 'self_help') ||
-            (addType == 'look' && form.status == 'finished')
+            (addType == 'look' && form.status == 'finished')||
+            (addType == 'finishNoEvaluate' && !form.evaluateFlag)
           "
         >
           <el-form-item label="实际服务时间" prop="serviceStartTime">
@@ -546,7 +539,7 @@
               v-model.trim="finishServiceTime"
               class="u-item-width-normal"
               clearable
-              :disabled="disabled && addType != 'finish'"
+              :disabled="disabled && addType != 'finish' || (addType === 'finishNoEvaluate')"
               type="datetimerange"
               range-separator="至"
               start-placeholder="开始日期"
@@ -574,7 +567,6 @@
             <el-rate
               v-model.trim="form.score"
               :allow-half="true"
-              :disabled="disabled && addType != 'finish'"
             ></el-rate>
           </el-form-item>
           <el-form-item
@@ -582,12 +574,19 @@
               label-width="150px"
               style="display: block"
               prop="attachments"
+              v-if="addType != 'finishNoEvaluate'"
           >
-
             <UploadImages :fileList="form.attachments" @change="(val) => form.attachments = val" :limit="3"/>
-
           </el-form-item>
-
+          <el-form-item
+              label="上传图片"
+              label-width="150px"
+              style="display: block"
+              prop="attachments"
+              v-else
+          >
+            <el-image :src="item.url" v-for="(item,index) in form.finishAttachments" :key="index" ></el-image>
+          </el-form-item>
           <el-form-item label="备注" prop="finishDesc">
             <el-input
               v-model.trim="form.finishDesc"
@@ -909,6 +908,7 @@ export default {
       currDemandId: "",
       infoAddType: "look",
       detailShow: false,
+      detailObj:{}
     };
   },
   computed: {
@@ -1065,9 +1065,14 @@ export default {
       if (addType == "finish") {
         if (row.serviceStartTime)
           this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime];
-
+          this.form.finishResult = "resolved";
-        this.form.finishResult = "resolved";
+          this.form.score = 5;
-        this.form.score = 5;
+      }
+      if(addType == 'finishNoEvaluate'){
+        this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime];
+        this.form.finishResult = row.finishResult;
+        this.form.finishDesc = row.finishDesc;
+        this.form.finishAttachments = row.finishAttachments;
       }
       if (addType == "appoint" && row.serviceType) {
         const type = row.serviceType == "social_org" ? "add_demand" : "";