From 4b59f3956efa9d0557ad39870dd685b56dff57ec Mon Sep 17 00:00:00 2001
From: xiongchengqiang <xiongchengqiang@linzikg.com>
Date: Tue, 15 Dec 2020 17:09:03 +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        | 14 +++++---
 .../performance/components/process.vue        | 34 ++++++++++++++-----
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/views/kpi/assessment/performance/components/pinglun.vue b/src/views/kpi/assessment/performance/components/pinglun.vue
index fdb79b2..bed0405 100644
--- a/src/views/kpi/assessment/performance/components/pinglun.vue
+++ b/src/views/kpi/assessment/performance/components/pinglun.vue
@@ -22,7 +22,7 @@
               #</span></div>
           <div v-if="!isJilu" style="font-size:12px;">{{i.gmtCreate}}</div>
         </div>
-        <div class="pinglunTem-right-content pre">
+        <div class="pinglunTem-right-content pre" :style="{background:(background&&(i.useType !== 0 && i.taskName))?background:'#cfe5fc'}">
           <div v-if="i.useType !== 0 && i.taskName" class="content-top">
             评论 「{{i.taskName}}」
           </div>
@@ -46,6 +46,10 @@ export default {
     isJilu: {
       type: Boolean,
       default: false
+    },
+    background: {
+      type: String,
+      default: '#cfe5fc'
     }
   },
   // 1，修改名称，2修改进度 ，3名称和进度都修改
@@ -71,6 +75,8 @@ export default {
 
 <style lang='less' scoped>
 .pinglunTem {
+  max-height: 300px;
+  overflow: auto;
   .pingcontent:first-child{
     margin-top: 10px;
   }
@@ -121,13 +127,12 @@ export default {
       margin-bottom: 10px;
     }
     &-content {
-      border: 1px solid #bdd7f4;
-      background: #cfe5fc;
+      border: 1px solid #eff4fa;
       border-radius: 0 6px 6px 6px;
       color: #313841;
       font-size: 12px;
       max-width: 400px;
-      padding: 4px 6px;
+      padding: 8px 6px;
     }
     .beizhu {
       margin-left: 10px;
@@ -137,6 +142,7 @@ export default {
   }
   .content-top{
     padding: 4px 0;
+    margin-bottom: 6px;
     border-bottom: 1px solid rgba(200, 200, 200,0.6);
   }
   .position{
diff --git a/src/views/kpi/assessment/performance/components/process.vue b/src/views/kpi/assessment/performance/components/process.vue
index c90a8b5..86dad9d 100644
--- a/src/views/kpi/assessment/performance/components/process.vue
+++ b/src/views/kpi/assessment/performance/components/process.vue
@@ -9,7 +9,7 @@
         <div class="drawer-content-left">
           <div class="drawer-content-left-jiaoyi">
             <div class="title">
-              <span>名称：{{(taskInfo.target && taskInfo.target.length>10)?(taskInfo.target.substring(0,8)+'...'):taskInfo.target}}</span>
+              <span>名称: {{(taskInfo.target && taskInfo.target.length>10)?(taskInfo.target.substring(0,8)+'...'):taskInfo.target}}</span>
             </div>
             <div class="process">
               <span>
@@ -30,17 +30,21 @@
               <div style="padding:20px;">
                 <el-form :model="form"
                         ref="form"
+                        label-width="80px"
                         :rules="formRules">
                   <el-form-item prop="name"
                                 label='任务名称'>
                     <el-input clearable
+                              type="textarea"
+                              :row='2'
                               size="small"
                               placeholder="请输入任务名称"
                               v-model="form.name"></el-input>
                   </el-form-item>
-                  <el-form-item label="任务进度:"
+                  <el-form-item label="任务进度"
                                 prop="weight">
                     <el-input size="small"
+                               style="width:200px;"
                               @blur="$handleBlur('form.processRate')"
                               @input.native="$handleInputInt('form.processRate')"
                               v-model="form.processRate">
@@ -66,14 +70,16 @@
           <div v-for="(i,index) in handleFilter(taskInfo.resultTasks)"
                :key="i.id"
                class="boderAndRadius drawer-content-left-content">
-            <div :style="{border:!(!i.updateProcess && i.label)?'none':''}"
+            <div :style="{border:!(!i.showTask)?'none':''}"
                  class="drawer-content-left-content-top">
               <div class="drawer-content-left-content-top-process">
-                <el-progress type="circle"
+                <div>
+                  <el-progress type="circle"
                              :width='50'
                              :stroke-width='4'
                              :percentage="Math.round((i.processRate * 100)*1000)/1000 "></el-progress>
-                <div style="margin-left:10px;">
+                </div>
+                <div style="margin:0 30px 0 10px;">
                   <span v-if="!i.editProcess">KR{{index+1}} : {{i.name}}</span>
                   <el-input v-if="i.editProcess"
                             size="small"
@@ -152,6 +158,7 @@
                 </div>
               </div>
               <pinglun v-if="i.showTask"
+                        background='#fff'
                        :pinglunList='i.taskList' />
             </div>
             <div v-if="i.updateProcess"
@@ -166,6 +173,7 @@
                                 :step="10">
                               </el-slider> -->
                   <el-input size="small"
+                            style="width:200px;"
                             @blur="$handleBlur('form.processRate')"
                             @input.native="$handleInputInt('form.processRate')"
                             v-model="form.processRate">
@@ -420,6 +428,7 @@ export default {
         this.$forceUpdate()
         return
       }
+
       const params = {
         currPage: 1,
         taskId: i.id,
@@ -431,6 +440,11 @@ export default {
         this.$message.error(res.msg)
         return
       }
+      this.taskInfo.resultTasks.map(j => {
+        j.updateProcess = false
+        j.editProcess = false
+        j.showTask = false
+      })
       i.showTask = true
       i.taskList = res.data.list
       this.$forceUpdate()
@@ -626,20 +640,22 @@ export default {
          box-shadow: 0 1px 6px 0 rgba(0,0,0,.12), 0 1px 6px 0 rgba(0,0,0,.12);
         &-top {
           display: flex;
-          align-content: center;
+          // align-content: center;
           justify-content: space-between;
           border-bottom: 1px solid @borderColor;
           margin: 20px 20px 0;
           padding-bottom: 12px;
           &-process {
             display: flex;
-            align-content: center;
+            // align-content: center;
             > div {
-              .center();
+
+              // .center();
             }
           }
           .right {
-            .center();
+            // .center();
+            font-size: 16px;
             &-item {
               cursor: pointer;
               border: 1px solid @borderColor;