Browse Source

任务中心关于部门的业绩指标计划与业绩指标考核详情页面根据甲方需求进行功能修改,与后端服务联调;

SunZehao 1 year ago
parent
commit
d8215674aa

+ 9 - 0
src/api/api.js

@@ -155,6 +155,15 @@ export function apiPostScoreCountSave(params) {
 }
 
 
+// 部门业绩指标计划 部门业绩指标考评同意前判断接口
+export function apiGetcheckAuditStatus(params) {
+    return httpRequest({
+        url: `evaluation-dept-plan/checkAuditStatus/${params.id}/${params.deptId}`,
+        method: 'get'
+    })
+}
+
+
 //----------------------------------------通告管理------------------------------------------------
 //---------列表
 export function apiGetevaluationdeptnoticeList(params) {

+ 19 - 5
src/components/assessment/evaluationDeptBusinessFrom.vue

@@ -64,7 +64,7 @@
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                     <el-tab-pane label="考评指标项内容" name="first">
                         <el-table :data="quantifiedList.slice((pageLeft.currentPage-1)*pageLeft.pagesize, pageLeft.currentPage*pageLeft.pagesize)"
-                         style="width: 100%" @select="rowClick" @select-all="rowClick">
+                         style="width: 100%" @select="rowClick" @select-all="rowClick" :row-class-name="tableRowClassName">
                             <el-table-column label="序号" type="index" width="80" />
                             <el-table-column label="部门名称" prop="deptName" width="260">
                                 <template #default="scope">
@@ -199,10 +199,6 @@ export default {
             {
                 name: '未通过',
                 id: '-2'
-            },
-            {
-                name: '已批准',
-                id: '1'
             }
         ]
     },
@@ -240,6 +236,15 @@ export default {
         handleClick() {
             this.changeDateSelect = []
         },
+        tableRowClassName(row, rowIndex) {
+            if (row.row.auditStatus === '-1') {
+                return 'warning-row'
+            } else if (row.row.auditStatus === '0') {
+                return 'success-row'
+            } else {
+                return 'error-row'
+            }
+        },
         rowClick(selection, row) {
             this.changeDateSelect = selection
         },
@@ -493,6 +498,15 @@ export default {
                                     }
                                 }
                             }
+                            .warning-row {
+                                --el-table-tr-bg-color: #fdf6ec;
+                            }
+                            .success-row {
+                                --el-table-tr-bg-color: #f1f9ec;
+                            }
+                            .error-row {
+                                --el-table-tr-bg-color: #fdecec;
+                            }
                         }
                     }
                 }

+ 0 - 4
src/components/assessment/evaluationDeptStartFrom.vue

@@ -216,10 +216,6 @@ export default {
             {
                 name: '未通过',
                 id: '-2'
-            },
-            {
-                name: '已批准',
-                id: '1'
             }
         ]
     },

+ 26 - 5
src/components/taskCenter/taskCenterDeptBusinessFrom.vue

@@ -136,7 +136,8 @@
 
 <script>
 import importDailog from '../importPage/importDailog.vue'
-import {apiGetevaluationdeptplanDetail,apiGetevaluationdeptplanUpdate, apiPostIsdoAction, apiGetevaluationdeptassessmentDetailHeader} from '../../api/api'
+import {apiGetevaluationdeptplanDetail,apiGetevaluationdeptplanUpdate, apiPostIsdoAction, apiGetcheckAuditStatus,
+apiGetevaluationdeptassessmentDetailHeader} from '../../api/api'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
 import addIcon from '../../assets/btnIcon/add.png'
@@ -207,10 +208,6 @@ export default {
             {
                 name: '未通过',
                 id: '-2'
-            },
-            {
-                name: '已批准',
-                id: '1'
             }
         ]
     },
@@ -326,6 +323,30 @@ export default {
                 defKey: that.instanceChild.defKey,
                 bizKey: that.instanceChild.bizKey
             }
+            if (type === 'agree') {
+                let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+                let paramsob = {
+                    id: that.rowMsg.id,
+                    deptId: userMes.deptId
+                }
+                apiGetcheckAuditStatus(paramsob).then(datas =>{
+                    if (datas) {
+                        if (datas.success) {
+                             that.IsdoActionFn(params)
+                        } else {
+                            that.$message({
+                                message: datas.data,
+                                type: 'error'
+                            })
+                        }
+                    }
+                })
+            } else {
+                that.IsdoActionFn(params)
+            }
+        },
+        IsdoActionFn(params) {
+            let that = this
             apiPostIsdoAction(params).then(datas =>{
                 if (datas && datas.data) {
                     if (datas.data.isOk) {

+ 25 - 5
src/components/taskCenter/taskCenterDeptStartFrom.vue

@@ -152,7 +152,7 @@
 
 <script>
 import importDailog from '../importPage/importDailog.vue'
-import {apiGetevaluationdeptplanDetail,apiGetevaluationdeptplanUpdate, apiGetdatadictionaryList,
+import {apiGetevaluationdeptplanDetail,apiGetevaluationdeptplanUpdate, apiGetdatadictionaryList,apiGetcheckAuditStatus,
 apiPostIsdoAction, apiGetevaluationdeptplanDetailHeader} from '../../api/api'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
@@ -222,10 +222,6 @@ export default {
             {
                 name: '未通过',
                 id: '-2'
-            },
-            {
-                name: '已批准',
-                id: '1'
             }
         ]
     },
@@ -383,6 +379,30 @@ export default {
                 defKey: that.instanceChild.defKey,
                 bizKey: that.instanceChild.bizKey
             }
+            if (type === 'agree') {
+                let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+                let paramsob = {
+                    id: that.rowMsg.id,
+                    deptId: userMes.deptId
+                }
+                apiGetcheckAuditStatus(paramsob).then(datas =>{
+                    if (datas) {
+                        if (datas.success) {
+                             that.IsdoActionFn(params)
+                        } else {
+                            that.$message({
+                                message: datas.data,
+                                type: 'error'
+                            })
+                        }
+                    }
+                })
+            } else {
+                that.IsdoActionFn(params)
+            }
+        },
+        IsdoActionFn(params) {
+            let that = this
             apiPostIsdoAction(params).then(datas =>{
                 if (datas && datas.data) {
                     if (datas.data.isOk) {

+ 8 - 7
src/components/taskCenter/taskCenterEvlNewFrom.vue

@@ -128,7 +128,7 @@
 import importDailog from '../importPage/importDailog.vue'
 import {apiGetEvaluationIndicatorList,apiGetgetEvaluationInfoDataList,apiGetbinsectionList, apiGetbinstageList,
 apiPostorganizationUpdateEvaluationInfo, apiPostorganizationUpdateAddEvaluationInfo,apiGetHeaderOrganizationEvaluation,
-apiGetHeaderDeptResponsibility, apiPostgetInstanceAndChildren} from '../../api/api'
+apiGetHeaderDeptResponsibility, apiPostgetInstanceAndChildren, apiPostIsdoAction} from '../../api/api'
 import * as XLSX from 'xlsx'
 import { saveAs } from 'file-saver'
 import  * as XLSXD from 'xlsx-js-style'
@@ -176,7 +176,8 @@ export default {
             addstageId: '',
             tastbizKey: '',
             userMes: {},
-            instanceChild: {}
+            instanceChild: {},
+            descMsg: ''
         }
     },
     created() {
@@ -184,8 +185,8 @@ export default {
     methods: {
         init(row) {
             this.dialogVisible = true
-            // this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
-            // this.getTaskId(row)
+            this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            this.getTaskId(row)
             this.rowMsg = row
         },
         // 根据流程ID获取业务ID
@@ -202,13 +203,13 @@ export default {
                     let defKey = datas.data.data.bpmInstance.defKey
                     that.tastbizKey = datas.data.data.bpmInstance.bizKey
                     // that.taskDefKey = datas.data.data.bpmInstance.defKey
-                    that.getevalHeaderDetails(bizKey)
+                    that.getevalHeaderDetails(bizKey, defKey)
                     that.getModelData(defKey)
                 }
             })
         },
         //获取头部详情
-        getevalHeaderDetails(id) {
+        getevalHeaderDetails(id, defKey) {
             let that = this
             let params = {
                 id: id
@@ -230,7 +231,7 @@ export default {
                     code: types === 'dwkpmbqd'?item.responsibilityCode:item.organizationEvaluationCode,
                     des: item.des,
                     stage: item.stage,
-                    creator: item.createBy,
+                    createName: item.createName,
                     createDate: item.createTime,
                     type: item.checkCycle === 'YDKP'?'月度考评':item.checkCycle === 'JDKP'?'季度考评':'年度考评',
                     year: item.year,

+ 2 - 2
src/components/taskCenter/taskCenterPage.vue

@@ -136,11 +136,11 @@ export default {
         },
         handleSizeChange(val){
             this.page.pagesize = val
-            this.getEvaluationData('seach')
+            this.getEvaluationData()
         },
         handleCurrentChange(val){
             this.page.currentPage =val
-            this.getEvaluationData('seach')
+            this.getEvaluationData()
         },
         approveMsg(val) {
             if (val) {