From 377f38cc7baac57ff56ae216efc19f3e37529288 Mon Sep 17 00:00:00 2001
From: xiongchengqiang <xiongchengqiang@linzikg.com>
Date: Mon, 7 Dec 2020 15:39:52 +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 +++-
 src/views/kpi/tablePrint/index.vue       | 51 ++++++++++++++++--------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/views/kpi/assessment/goals/index.vue b/src/views/kpi/assessment/goals/index.vue
index 22d86e0..b164a6f 100644
--- a/src/views/kpi/assessment/goals/index.vue
+++ b/src/views/kpi/assessment/goals/index.vue
@@ -235,18 +235,22 @@ export default {
       const obj = { status: 1, menuName: '制定了' }
       const params = Object.assign({}, { resultRecordId: this.$route.query.id || '' }, obj)
       let res = await apiSaveapproval(params)
+      console.log("🚀 ~ file: index.vue ~ line 238 ~ handleGetNext ~ res", res)
       if (res.code !== 200) {
         this.$message.error(res.msg || '出错了 ')
+        return
       }
-      let res1 = await apiSaveDetail(Object.assign({}, { commentId: res.commentId }, this.obj))
+      this.obj.commentId = res.commentId
+      let res1 = await apiSaveDetail(this.obj)
       if (res1.code !== 200) {
         this.$message.error(res1.msg)
+        return
       }
       this.$message({
         message: res.msg,
         type: 'success'
       })
-      history.go(-1)
+      // history.go(-1)
     },
     handleGetWeight1 () {
       let num = 0
diff --git a/src/views/kpi/tablePrint/index.vue b/src/views/kpi/tablePrint/index.vue
index f4d7be7..29d45e1 100644
--- a/src/views/kpi/tablePrint/index.vue
+++ b/src/views/kpi/tablePrint/index.vue
@@ -5,52 +5,68 @@
       员工月度绩效计划与评估表员工月度绩效计划与评估表 --部门负责人部门负责人
     </div>
     <div class="tablePint-aboult">
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:100px">
         考核月份
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:110px">
         2020年9月
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:50px">
         工号
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:50px">
         LY81
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:80px">
         员工姓名
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:50px">
         熊成强
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:80px">
         一级部门
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:80px">
         设计部
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:80px">
         二级部门
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:50px">
         /
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:100px">
         三级部门
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:100px">
         /
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:100px">
         职位
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:100px">
         前端工程师
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:100px">
         直属上级
       </div>
-      <div class="tablePint-aboult-item">
+      <div class="tablePint-aboult-item"
+           style="width:100px">
         杨洋
       </div>
     </div>
@@ -103,6 +119,7 @@ export default {
 
 <style lang="less" scoped>
 .tablePint {
+  width: 1500px;
   margin: 10px 10px;
   font-size: 12px;
   color: #5c5c5c;
@@ -118,7 +135,7 @@ export default {
     height: 30px;
     display: flex;
     &-item {
-      flex: 1;
+      flex-shrink: 0;
       .center();
       border-right: 1px solid #666666;
       border-bottom: 1px solid #666666;