Merge branch 'dev-shuju' into test

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

@@ -138,32 +138,44 @@
                 @click="handleAppoint(scope.row, 'appoint')"
                 >指派</el-button>
                 <!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
-              <el-button
+              <template v-if="(scope.row.serviceShowFlag && scope.row.serviceType !== 'volunteer')">
-                v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scope.row.status == 'finished' && !scope.row.evaluateFlag)"
+                <el-button
-                type="text"
+                  v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scope.row.status == 'finished' && !scope.row.evaluateFlag)"
-                size="small"
-                @click="handleFinish(scope.row, 'finish')"
-                >完成情况</el-button>
-              <el-button
-                  v-if="scope.row.status === 'pending'"
-                  @click="handleEdit(scope.row, 'edit')"
                   type="text"
                   size="small"
-                  class="btn-color-edit"
+                  @click="handleFinish(scope.row, 'finish')"
-                  >编辑</el-button>
+                  >完成情况</el-button>
-              <el-popconfirm
+              </template>
-                title="取消之后无法恢复，确认取消？"
+              <!-- <template v-else>
-                @onConfirm="handleDel(scope.row)"
-              >
                 <el-button
-                  v-if="scope.row.status !== 'finished' && scope.row.status !== 'canceled'"
+                  v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scope.row.status == 'finished' && !scope.row.evaluateFlag)"
-                  slot="reference"
                   type="text"
                   size="small"
-                  class="btn-color-del"
+                  @click="handleFinish(scope.row, 'finish')"
-                  >取消</el-button
+                  >完成情况</el-button>
+              </template> -->
+              <template v-if="scope.row.reportType != 'self_help'">
+                <el-button
+                    v-if="scope.row.status === 'pending'"
+                    @click="handleEdit(scope.row, 'edit')"
+                    type="text"
+                    size="small"
+                    class="btn-color-edit"
+                    >编辑</el-button>
+                <el-popconfirm
+                  title="取消之后无法恢复，确认取消？"
+                  @onConfirm="handleDel(scope.row)"
                 >
-              </el-popconfirm>
+                  <el-button
+                    v-if="scope.row.status !== 'finished' && scope.row.status !== 'canceled'"
+                    slot="reference"
+                    type="text"
+                    size="small"
+                    class="btn-color-del"
+                    >取消</el-button
+                  >
+                </el-popconfirm>
+              </template>
             </template>
             <el-button
               @click="handleLook(scope.row, 'look')"
@@ -341,7 +353,8 @@
         <el-form-item v-if="addType == 'look' && form.status == 'canceled'" label="取消时间" prop="cancelTime">
           <span>{{ form.cancelTime }}</span>
         </el-form-item>
-        <template v-if="addType == 'finish' || (addType == 'look' && form.status == 'finished')">
+        <template 
+        v-if="(addType == 'finish' && form.reportType != 'self_help') || (addType == 'look' && form.status == 'finished')">
           
           <el-form-item label="实际服务时间" prop="serviceStartTime">
             <el-date-picker
@@ -375,6 +388,23 @@
               class="input-width-textarea" placeholder="请输入内容"></el-input>
           </el-form-item>
         </template>
+        <template v-if="(addType == 'finish' && form.reportType == 'self_help')">
+          <el-form-item label="实际服务时间" prop="serviceStartTime">
+            <el-date-picker
+              v-model="finishServiceTime"
+              class="input-width-min"
+              clearable
+              :disabled="disabled && addType != 'finish'"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              @change="handelBlurServiceTime"
+              >
+            </el-date-picker>
+          </el-form-item>
+        </template>
 
       </el-form>
       <div class="resi-btns">
@@ -743,6 +773,7 @@ export default {
         if (row.serviceStartTime) this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime]
         
         this.form.finishResult = 'resolved'
+        this.form.score = 5
       }
       if (addType == 'appoint' && row.serviceType) {
         await this.getServiceuserList(row.serviceType)
@@ -823,14 +854,15 @@ export default {
         this.btnLoading = false
     },
     async finishAjax() {
+      const { reportType, serviceShowFlag, serviceType } = this.form
       const _form = {
         demandRecId: this.form.demandRecId,
         serviceStartTime: this.form.serviceStartTime,
         serviceEndTime: this.form.serviceEndTime,
-        finishResult: this.form.finishResult,
+        finishResult: reportType == 'self_help' ? '' : this.form.finishResult,
-        finishDesc: this.form.finishDesc,
+        finishDesc: reportType == 'self_help' ? '' : this.form.finishDesc,
         serviceId: this.form.serviceId,
-        score: this.form.score
+        score: reportType == 'self_help' ? 0 : this.form.score
       }
       await this.$http
         .post('/heart/userdemand/finish', _form)