提交人瞩

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 菜单列表

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()),

src/views/modules/result/record/lzresultrecordapp.vue

@@ -277,6 +277,7 @@ export default {
           'recordIds': this.recordIdsSelect.join(',')
         }).then(data => {
           this.alertInfo(data.msg)
+          this.getDataList()
         })
       })
     },

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">
@@ -260,16 +260,20 @@ export default {
           'recordResultId': this.recordResultId,
           'status': 2
         }).then(data => {
-          if (data && data.code === 0) {
-            this.getDataList()
-          }
-          this.$message({
-            message: data.msg,
-            type: 'success',
-            duration: 3000,
-            onClose: () => {
+          if (data) {
+            if (data.code === 0) {
+              this.getDataList()
             }
-          })
+            this.$message({
+              message: data.msg,
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$message.error('网络异常')
+          }
         })
       }).catch(() => {
       })