From 1060f6964273452bc89be1c84e10b18fc4aef33e Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 26 Aug 2020 11:48:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=97=B6=E6=9C=AA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A9=B3=E5=9B=9E=E7=9B=AE=E6=A0=87=E7=9A=84?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=8B=A6=E6=88=AA=EF=BC=8C=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=97=B6=E5=90=8E=E7=AB=AF=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           | 19 -------------------
 .../result/record/approval-add-or-update.vue  |  6 +++++-
 .../modules/result/record/recorddetail.vue    | 17 ++++++++++++-----
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 269fd58..4ec9914 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -32,12 +32,6 @@ const configRoutes = [
     component: _import('modules/result/record/recorddetail'),
     name: 'recorddetail',
     meta: {title: '业绩详情', isDynamic: true, isTab: true}
-  },
-  {
-    path: '/result-record-lzresultrecordapp',
-    component: _import('modules/result/record/lzresultrecordapp'),
-    name: 'recorddetail',
-    meta: {title: '业绩审批', isDynamic: true, isTab: true, keepAlive: false}
   }
 ]
 
@@ -114,19 +108,6 @@ function fnCurrentRouteType (route, globalRoutes = []) {
   return temp.length >= 1 ? fnCurrentRouteType(route, temp) : 'main'
 }
 
-/**
- * 判断是否为钉钉打开
- * @param {*} menuList
- * @param {*} routes
- */
-function isDingtalk () {
-  if (/(DingTalk)/i.test(navigator.userAgent)) {
-    return true
-  } else {
-    return false
-  }
-}
-
 /**
  * 添加动态(菜单)路由
  * @param {*} menuList 菜单列表
diff --git a/src/views/modules/result/record/approval-add-or-update.vue b/src/views/modules/result/record/approval-add-or-update.vue
index 00988e8..fb0e14d 100644
--- a/src/views/modules/result/record/approval-add-or-update.vue
+++ b/src/views/modules/result/record/approval-add-or-update.vue
@@ -4,7 +4,7 @@
     :close-on-click-modal="false"
     :visible.sync="visible">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="80px">
-      <el-form-item label="回滚到" v-if="status === 5 " >
+      <el-form-item label="驳回到" v-if="status === 5 " >
         <el-select v-model="dataForm.rollbackFlowId" placeholder="请选择">
           <el-option
             v-for="item in rollbackData"
@@ -90,6 +90,10 @@ export default {
       })
     },
     commitRecord (status) {
+      if(status === 5 && this.dataForm.rollbackFlowId === ''){
+        this.alertInfo("请选择驳回目标")
+        return;
+      }
       commitApproval({
         'recordResultId': this.recordResultId,
         'resultComment': Base64.encode(this.resultCommentEditor.txt.html()),
diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue
index 96cc48c..5bda1c9 100644
--- a/src/views/modules/result/record/recorddetail.vue
+++ b/src/views/modules/result/record/recorddetail.vue
@@ -71,8 +71,8 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="关键结果" prop="keyResult" width="800" align="left">
-          <template slot-scope="scope">
+        <el-table-column label="关键结果" prop="keyResult" align="left" width="350">
+          <template slot-scope="scope" >
             <div v-html="scope.row.keyResult"  class="rich">
             </div>
           </template>
@@ -85,13 +85,13 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="考核结果（员工填写）" prop="checkResult" width="800" align="left">
+        <el-table-column label="考核结果（员工填写）" prop="checkResult" width="350" align="left">
           <template slot-scope="scope">
             <div v-html="scope.row.checkResult" class="rich">
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="直属上级评分(100%）" prop="superScore"  align="left" width="300"></el-table-column>
+        <el-table-column label="直属上级评分(100%）" prop="superScore"  align="left" width="160"></el-table-column>
         <el-table-column label="得分" prop="acquireScore" align="center">
           <template slot-scope="scope">
             <div class="conatnt-name">
@@ -258,7 +258,8 @@ export default {
           'recordResultId': this.recordResultId,
           'status': 2
         }).then(data => {
-          if (data && data.code === 0) {
+          if (data){
+            if(data.code === 0) {
             this.getDataList()
             this.$message({
               message: data.msg,
@@ -267,7 +268,13 @@ export default {
               onClose: () => {
               }
             })
+            } else {
+              this.$message.error(data.msg)
+            }
+          } else {
+            this.$message.error('网络异常')
           }
+          
         })
       }).catch(() => {
       })

From a0b60da8afbdd90c13e22968ce49fc4136a9d9d6 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 26 Aug 2020 11:56:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/result/record/lzresultrecordapp.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/result/record/lzresultrecordapp.vue b/src/views/modules/result/record/lzresultrecordapp.vue
index 9c2c851..87975cf 100644
--- a/src/views/modules/result/record/lzresultrecordapp.vue
+++ b/src/views/modules/result/record/lzresultrecordapp.vue
@@ -276,6 +276,7 @@ export default {
           'recordIds': this.recordIdsSelect.join(',')
         }).then(data => {
           this.alertInfo(data.msg)
+          this.getDataList()
         })
       })
     },