From 1be47710b206a581dc7ef2971a78888322b8335a Mon Sep 17 00:00:00 2001
From: xiongchengqiang <xiongchengqiang@linzikg.com>
Date: Tue, 15 Dec 2020 10:53:20 +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

---
 src/views/kpi/assessment/goals/index.vue      |  8 +-
 .../performance/components/process.vue        |  2 +-
 src/views/kpi/tablePrint/index.vue            | 92 ++++++++++++++++---
 .../edit/components/templateSet.vue           |  2 +-
 4 files changed, 84 insertions(+), 20 deletions(-)

diff --git a/src/views/kpi/assessment/goals/index.vue b/src/views/kpi/assessment/goals/index.vue
index cf7a005..c7f5574 100644
--- a/src/views/kpi/assessment/goals/index.vue
+++ b/src/views/kpi/assessment/goals/index.vue
@@ -18,10 +18,10 @@
                        :name="String(i.id)">
             <div class="goals-content-tabbar-table">
               <div class="goals-content-tabbar-table-header commonFont">
-                <span style="flex:1 0 auto;">指标名称</span>
+                <span style="width:200px;">指标名称</span>
                 <span class="kaohe"
                       style="flex:1 0 auto;">考核标准</span>
-                <span style="flex:1 0 auto;">权重</span>
+                <span style="width:100px;">权重</span>
                 <span style="width:240px;">操作</span>
               </div>
               <div style="justify-content:center;"
@@ -35,7 +35,7 @@
                      v-for="(j,indexJ) in handleFilter(i.detailDtos)"
                      :key="indexJ">
                   <div class="goals-content-tabbar-table-content-top">
-                    <div style="flex:1 0 auto;"
+                    <div style="width:200px;"
                          class="my-handle"><img style="width:20px;height:20px;"
                            src="@/assets/img/yidong.png"
                            alt="">{{j.target}}</div>
@@ -43,7 +43,7 @@
                          class="kaohe">
                       <pre>{{j.keyResult}}</pre>
                     </div>
-                    <div style="flex:1 0 auto;">{{ Math.round((j.checkWeight * 100)*1000)/1000}}%</div>
+                    <div style="width:100px;">{{ Math.round((j.checkWeight * 100)*1000)/1000}}%</div>
                     <div style="width:240px;">
                       <el-button @click="hanidleAddTask(j,0)"
                                  type="primary" plain
diff --git a/src/views/kpi/assessment/performance/components/process.vue b/src/views/kpi/assessment/performance/components/process.vue
index bc1f09a..9bd993b 100644
--- a/src/views/kpi/assessment/performance/components/process.vue
+++ b/src/views/kpi/assessment/performance/components/process.vue
@@ -142,7 +142,7 @@
                   <span v-if="!i.showTask">{{i.staffName}}:</span>
                   <span class="label"
                         style="word-wrap:break-word;"
-                        v-if="!i.showTask">{{i.typeDesc}}</span>
+                        v-if="!i.showTask">{{(i.typeDesc && i.typeDesc.length>10)?(i.typeDesc.substring(0,8)+'...'):i.typeDesc}}</span>
                 </div>
                 <div style="user-select:none;">
                   <i :class="{rate:!i.showTask}"
diff --git a/src/views/kpi/tablePrint/index.vue b/src/views/kpi/tablePrint/index.vue
index 38a95eb..4d551c3 100644
--- a/src/views/kpi/tablePrint/index.vue
+++ b/src/views/kpi/tablePrint/index.vue
@@ -34,7 +34,7 @@
         一级部门
       </div>
       <div class="tablePint-aboult-item"
-           style="width:80px">
+           style="width:120px">
         设计部
       </div>
       <div class="tablePint-aboult-item"
@@ -42,7 +42,7 @@
         二级部门
       </div>
       <div class="tablePint-aboult-item"
-           style="width:50px">
+           style="width:100px">
         /
       </div>
       <div class="tablePint-aboult-item"
@@ -66,36 +66,65 @@
         直属上级
       </div>
       <div class="tablePint-aboult-item"
-           style="width:100px">
+           style="width:140px">
         杨洋
       </div>
     </div>
     <div class="tablePint-top">
-      <div class="tablePint-top-weidu">
+      <div class="tablePint-top-weidu" style="width:100px">
         考核维度
       </div>
-      <div class="tablePint-top-mubiao">
+      <div class="tablePint-top-mubiao" style="width:110px">
         目标/指标
       </div>
-      <div class="tablePint-top-guanjian">
+      <div class="tablePint-top-guanjian" style="width:310px">
         关键结果
       </div>
-      <div class="tablePint-top-quanzhong">
+      <div class="tablePint-top-quanzhong" style="width:100px">
         考核权重
       </div>
-      <div class="tablePint-top-kaohe">
+      <div class="tablePint-top-kaohe" style="width:500px">
         考核结果(员工填写)
       </div>
-      <div class="tablePint-top-zhishu">
-        直属上级评分(100%)
+      <div class="tablePint-top-zhishu" style=" width:100px;flex-direction: column;">
+        <div>直属上级</div> <div>评分(100%)</div>
       </div>
-      <div class="tablePint-top-defen">
+      <div class="tablePint-top-defen" style="width:100px">
         得分
       </div>
-      <div class="tablePint-top-pingfen">
+      <div class="tablePint-top-pingfen" style="width:140px">
         评分说明
       </div>
     </div>
+    <div v-for="i in 2">
+      <div class="tablePint-content">
+        <div class="tablePint-content-left item" style="width:100px;">
+          业绩
+        </div>
+        <div class="tablePint-content-right">
+          <div v-for="i in 10" class="tablePint-content-right-item">
+            <div class="item" style="width:110px;">几月交易额</div>
+            <div class="item" style="width:310px">几月交易额</div>
+            <div class="item" style="width:100px">几月交易额</div>
+            <div class="item" style="width:500px">几月交易额</div>
+            <div class="item" style="width:100px">几月交易额</div>
+            <div class="item" style="width:100px">几月交易额</div>
+            <div class="item" style="width:140px">几月交易额</div>
+          </div>
+        </div>
+      </div>
+      <div class="flex ">
+        <div class="item bg" style="width:520px;">业务考核结果</div>
+        <div class="item bg" style="width:100px;">70%</div>
+        <div class="item bg" style="width:500px;">/</div>
+        <div class="item bg" style="width:100px;">/</div>
+        <div class="item bg" style="width:100px;">2.512</div>
+        <div class="item bg" style="width:140px;">/</div>
+      </div>
+    </div>
+    <div>
+      <div>zui</div>
+    </div>
   </div>
 </template>
 
@@ -119,15 +148,23 @@ export default {
 
 <style lang="less" scoped>
 .tablePint {
-  width: 1500px;
+  div{
+    box-sizing: border-box;
+  }
+  .flex{
+    display: flex;
+  }
   margin: 10px 10px;
   font-size: 12px;
+
   color: #5c5c5c;
-  border-top: 1px solid #666666;
+
   border-left: 1px solid #666666;
   &-title {
     .center();
+    width: 1460px;
     height: 50px;
+    border-top: 1px solid #666666;
     border-right: 1px solid #666666;
     border-bottom: 1px solid #666666;
   }
@@ -153,5 +190,32 @@ export default {
       width: 100px !important;
     }
   }
+  &-content{
+    display: flex;
+    &-left{
+      box-sizing: border-box;
+      padding:4px 6px;
+    }
+    &-right{
+      flex: 1 0 auto;
+      &-item{
+        display: flex;
+        >div{
+          padding:4px 6px;
+          box-sizing: border-box;
+        }
+      }
+    }
+  }
+  .item {
+      flex-shrink: 0;
+      .center();
+      padding: 6px 10px;
+      border-right: 1px solid #666666;
+      border-bottom: 1px solid #666666;
+    }
+  .bg{
+    background: rgb(245, 187, 120);
+  }
 }
 </style>
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
index 54ec3e0..e1c99aa 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
@@ -289,6 +289,7 @@ export default {
   computed: {},
   beforeMount () {},
   mounted () {
+    this.info = this.templateForm
     const id = this.$route.query.id || ''
     this.id = id
     if (id) {
@@ -308,7 +309,6 @@ export default {
           evaluationGroupId: res.id,
           calculateId: 1 }
         )
-        this.info = res
         this.$forceUpdate()
       } catch (error) {
         this.$message.error(error.msg)