From 02d2d09a3927bea0e9a27adabb13e0c00393f916 Mon Sep 17 00:00:00 2001
From: xiongchengqiang <xiongchengqiang@linzikg.com>
Date: Fri, 11 Dec 2020 14:54:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/components/pinglun.vue        | 20 ++++++++++++----
 .../performance/components/process.vue        | 23 ++++++++++++-------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/views/kpi/assessment/performance/components/pinglun.vue b/src/views/kpi/assessment/performance/components/pinglun.vue
index 4e77d34..482f3a4 100644
--- a/src/views/kpi/assessment/performance/components/pinglun.vue
+++ b/src/views/kpi/assessment/performance/components/pinglun.vue
@@ -12,14 +12,18 @@
       </div>
       <div class="pinglunTem-right">
         <div class="pinglunTem-right-title">
-          <div><span>{{i.staffName}}</span><span class="beizhu">#
-              <span v-if="i.type===1">更新名称</span>
+          <div><span>{{i.staffName}}</span><span class="position" v-if="i.position">{{i.position}}</span><span v-if="i.typeDesc" class="beizhu">#
               {{i.typeDesc}}
               #</span></div>
           <div style="font-size:12px;">{{i.gmtCreate}}</div>
         </div>
-        <div class="pinglunTem-right-content">
-          {{i.label}}
+        <div class="pinglunTem-right-content pre">
+          <div v-if="i.taskName" class="content-top">
+            评论KR 「{{i.taskName}}」
+          </div>
+          <pre>
+            {{i.label}}
+          </pre>
         </div>
       </div>
     </div>
@@ -90,5 +94,13 @@ export default {
       color: @fontBlue;
     }
   }
+  .content-top{
+    padding: 4px 0;
+    border-bottom: 1px solid rgba(200, 200, 200,0.6);
+  }
+  .position{
+    font-size: 10px;
+    margin-left: 6px;
+  }
 }
 </style>
diff --git a/src/views/kpi/assessment/performance/components/process.vue b/src/views/kpi/assessment/performance/components/process.vue
index 9435bde..ea1af9f 100644
--- a/src/views/kpi/assessment/performance/components/process.vue
+++ b/src/views/kpi/assessment/performance/components/process.vue
@@ -180,9 +180,10 @@
                 <i @click="pinglunForm={}" class="el-icon-circle-close"> </i>
                 </div>
               <div class="pinglun-bottom-content">
-                <el-input type="textarea"
-                          clearable
-                        placeholder="请输入评论内容"
+              <el-input type="textarea"
+                        clearable
+                        ref="input"
+                        placeholder="请输入评论内容。。。"
                         v-model="form.content"></el-input>
               <el-button size="small"
                          @click="handleSendPingLun"
@@ -292,13 +293,16 @@ export default {
       let res = await apiTaskCommentList(params)
       if (res.code !== 200) {
         this.$message.error(res.msg)
+        return
       }
-      this.nowPingLunList = res.data.list
-      const pingList = this.$refs.pingList
-      pingList.scrollTop = pingList.scrollHeight
+      this.nowPingLunList = res.data.list.reverse()
+      this.$nextTick(() => {
+        const pingList = this.$refs.pingList
+        pingList.scrollTop = pingList.scrollHeight
+      })
     },
     // 发送评论
-    async handleSendPingLun () {
+    async handleSendPingLun (event) {
       let params = {}
       // debugger
       if (!this.form.content) return
@@ -307,6 +311,7 @@ export default {
       let res = await apiAddTaskComment(params)
       if (res.code !== 200) {
         this.$message.error(res.msg)
+        return
       }
       this.handleGetPingLunList()
       this.form.content = ''
@@ -316,6 +321,7 @@ export default {
       this.pinglunForm = Object.assign({}, item)
       const pingList = this.$refs.pingList
       pingList.scrollTop = pingList.scrollHeight
+      this.$refs.input.focus()
     },
     // 获取当前任务的评论
     async handleShowAll (i) {
@@ -343,7 +349,8 @@ export default {
       const params = {
         currPage: 1,
         detailId: this.taskInfo.detailId,
-        pageSize: 2300
+        pageSize: 2300,
+        useType: 0
       }
       this.pinglunList = []
       let res = await apiChangeTaskList(params)