From 196c942bfd64a5434e0b13f39cd5d09a8108f9ed Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 15 Dec 2021 10:34:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=88=86=E6=9E=90bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/measure/index.vue        | 19 +++++---
 src/views/modules/visual/cpts/analyse.vue     | 44 ++++++++++++-------
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 32600962..8da78a93 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -299,7 +299,7 @@
           type="textarea" clearable class="input-width-textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
         <el-form-item 
-        v-if="addType === 'appoint' || addType == 'finish' || addType == 'look'" 
+        v-if="addType === 'appoint' || addType == 'finish' || (addType == 'look' && form.serviceShowFlag)" 
         label="服务方" prop="serviceType">
           <template v-if="disabled && addType !== 'appoint'">
             <el-input v-model="form.serviceShowName" :disabled="disabled"  class="input-width"></el-input>
@@ -337,7 +337,10 @@
             </el-select>
           </template>
         </el-form-item>
-        <template v-if="addType == 'finish' || addType == 'look'">
+        <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')">
           <el-form-item label="完成情况" prop="finishResult">
             <el-radio v-model="form.finishResult" 
             label="resolved" :disabled="disabled && addType != 'finish'" >已解决</el-radio>
@@ -360,7 +363,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="评价" prop="score" class="form-score">
-              <el-rate v-model="form.score" :disabled="disabled && addType != 'finish'" ></el-rate>
+              <el-rate v-model="form.score" :allow-half="true" :disabled="disabled && addType != 'finish'" ></el-rate>
           </el-form-item>
           <el-form-item label="备注" prop="finishDesc">
             <el-input v-model="form.finishDesc" :autosize="{ minRows: 2, maxRows: 10}" 
@@ -373,9 +376,9 @@
         
       </el-form>
       <div class="resi-btns">
-        <el-button size="small" @click="handlerCancle">取消</el-button>
+        <el-button size="small" @click="handlerCancle">{{ addType != 'look' ? '取消' : '关闭'}}</el-button>
         <el-button
-          v-if="!disabled"
+          v-if="addType != 'look'"
           type="primary"
           size="small"
           :loading="btnLoading"
@@ -592,7 +595,7 @@ export default {
         serviceType: [{ required: true, message: '服务方不能为空', trigger: 'blur' }],
         serviceStartTime: [{ required: true, message: '实际服务时间不能为空', trigger: 'blur' }],
         score: [{ required: true, message: '评分不能为空', trigger: 'blur' }],
-        finishDesc: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+        // finishDesc: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
         finishResult: [{ required: true, message: '完成情况不能为空', trigger: 'blur' }],
       }
     }
@@ -715,6 +718,7 @@ export default {
       // this.form.demandUserId = ''
       this.$delete(this.form, 'demandRecId')
       this.selectDemandUser = ''
+      this.finishServiceTime = ''
       for(const n in this.form) {
         this.form[n] = ''
       }
@@ -733,6 +737,9 @@ export default {
       if (addType == 'look') {
         this.finishServiceTime = row.serviceStartTime && [row.serviceStartTime, row.serviceEndTime] || ''
       }
+      if (addType == 'finish') {
+        this.form.finishResult = 'resolved'
+      }
       if (addType == 'appoint' && row.serviceType) {
         await this.getServiceuserList(row.serviceType)
       }
diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue
index acc1bbab..43777c25 100644
--- a/src/views/modules/visual/cpts/analyse.vue
+++ b/src/views/modules/visual/cpts/analyse.vue
@@ -109,14 +109,17 @@
                 <div class="cate-list-w0"
                      :class="item.showItem && 'cate-list-w100'">
                   <div class="list list-wr">
-                    <div v-for="(n, i) in item.projectList"
+                    <template v-if="item.projectList && item.projectList.length > 0">
+                      <div v-for="(n, i) in item.projectList"
                          :key="i"
                          class="item"
                          @click="handleProject(n)">
-                      <div class="item-status"
-                           :class="'item-status-'+n.status">{{filterStatus(n.status)}}</div>
-                      <div class="item-content">{{n.title}}</div>
-                    </div>
+                        <div class="item-status"
+                            :class="'item-status-'+n.status">{{filterStatus(n.status)}}</div>
+                        <div class="item-content">{{n.title}}</div>
+                      </div>
+                    </template>
+                    <div v-else class="no-data">暂无数据</div>
                     <!-- <div class="item">
                       <div class="item-status">已结案</div>
                       <div class="item-content">合肥路与安宁路交合肥路与安宁路交</div>
@@ -187,16 +190,19 @@
                 <div class="cate-list-w0"
                      :class="item.showItem && 'cate-list-w100'">
                   <div class="list list-wr">
-                    <div v-for="(n, i) in item.projectList"
+                    <template v-if="item.projectList && item.projectList.length > 0">
+                      <div v-for="(n, i) in item.projectList"
                          :key="i"
                          class="item"
                          @click="handleProject(n)">
-                      <div class="item-status"
-                           :class="'item-status-'+n.status">
-                        {{ n.statusName || filterStatus(n.status)}}
+                        <div class="item-status"
+                            :class="'item-status-'+n.status">
+                          {{ n.statusName || filterStatus(n.status)}}
+                        </div>
+                        <div class="item-content">{{n.title}}</div>
                       </div>
-                      <div class="item-content">{{n.title}}</div>
-                    </div>
+                    </template>
+                    <div v-else class="no-data">暂无数据</div>
                     <!-- <div class="item">
                       <div class="item-status">已结案</div>
                       <div class="item-content">合肥路与安宁路交合肥路与安宁路交</div>
@@ -242,13 +248,13 @@ export default {
     },
     moreTitle: String, // hasEvent 为true 时 传入
     moreList: Array, // hasEvent 为true 时 传入
-    singleTitle: { // 默认，必传
+    singleTitle: { // 默认，必传 单个来源或多个来源
       type: String,
       default: '楼院小组'
     },
-    userList: Array, // 默认，必传
-    userName: String, // 默认，必传
-    singleList: Array, // 默认，必传
+    userList: Array, // 默认，必传 单个来源或多个来源
+    userName: String, // 默认，必传 单个来源或多个来源
+    singleList: Array, // 默认，必传 单个来源或多个来源
 
   },
   data () {
@@ -541,6 +547,14 @@ export default {
     }
   }
 }
+.no-data {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  text-align: center;
+  line-height: 100%;
+}
 .pad10 {
   padding-top: 10px;
 }