Bladeren bron

任务中心关于单位考评月,季,年详情页面根据甲方需求进行重新设计并开发,与后端服务联调(进行中);
本部部门业绩考核详情页面功能修改;

SunZehao 1 jaar geleden
bovenliggende
commit
97b1b1c9e2

+ 20 - 0
src/api/api.js

@@ -112,6 +112,17 @@ export function apiGettaskevalStartDetail(params) {
         params: params
     })
 }
+
+//----------任务处理-获取考评启动头部详情
+export function apiGetHeaderDeptResponsibility(params) {
+    return httpRequest({
+        url: 'dept-responsibility/getDeptResponsibility',
+        method: 'get',
+        params: params
+    })
+}
+
+
 //----------任务处理-获取考评启动详情
 export function apiGettaskmothAyearDetail(params) {
     return httpRequest({
@@ -121,6 +132,15 @@ export function apiGettaskmothAyearDetail(params) {
     })
 }
 
+//----------任务处理-获取单位月季年头部的详情
+export function apiGetHeaderOrganizationEvaluation(params) {
+    return httpRequest({
+        url: 'organization-evaluation/getOrganizationEvaluation',
+        method: 'get',
+        params: params
+    })
+}
+
 //考评得分统计查询
 export function apiGetscoreCountList(params) {
     return httpRequest({

+ 1 - 1
src/components/assessment/assessmentApplicationFrom.vue

@@ -328,7 +328,7 @@ export default {
                 { header: 'ID', key: 'id', width: 26 },
                 { header: '申报ID', key: 'assessmentDeclarationId', width: 26 },
                 { header: '人员编号', key: 'employeeNo', width: 26 },
-                { header: '员工ID', key: 'employeeId', width: 26 },
+                // { header: '员工ID', key: 'employeeId', width: 26 },
                 { header: '员工名称', key: 'employeeName', width: 26 },
                 { header: '序号', key: 'serialNumber', width: 26 },
                 { header: '建议值', key: 'suggestedValue', width: 26 },

+ 19 - 1
src/components/assessment/evaluationDeptStartFrom.vue

@@ -68,7 +68,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="300">
                                 <template #default="scope">
@@ -269,6 +269,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
         },
@@ -537,6 +546,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;
+                            }
                         }
                     }
                 }

+ 60 - 38
src/components/taskCenter/taskCenterEvlNewFrom.vue

@@ -127,7 +127,8 @@
 <script>
 import importDailog from '../importPage/importDailog.vue'
 import {apiGetEvaluationIndicatorList,apiGetgetEvaluationInfoDataList,apiGetbinsectionList, apiGetbinstageList,
-apiPostorganizationUpdateEvaluationInfo, apiPostorganizationUpdateAddEvaluationInfo} from '../../api/api'
+apiPostorganizationUpdateEvaluationInfo, apiPostorganizationUpdateAddEvaluationInfo,apiGetHeaderOrganizationEvaluation,
+apiGetHeaderDeptResponsibility, apiPostgetInstanceAndChildren} from '../../api/api'
 import * as XLSX from 'xlsx'
 import { saveAs } from 'file-saver'
 import  * as XLSXD from 'xlsx-js-style'
@@ -173,6 +174,7 @@ export default {
             exportIcon: exportIcon,
             importIcon: importIcon,
             addstageId: '',
+            tastbizKey: '',
             userMes: {},
             instanceChild: {}
         }
@@ -180,29 +182,68 @@ export default {
     created() {
     },
     methods: {
-        init(row, type) {
+        init(row) {
             this.dialogVisible = true
-            this.receiptMsg = {
-                code: row.organizationEvaluationCode,
-                des: row.des,
-                stage: row.stage,
-                createName: row.createName,
-                createDate: row.createTime,
-                type: row.checkCycle === 'YDKP'?'月度考评':row.checkCycle === 'JDKP'?'季度考评':'年度考评',
-                year: row.year,
-                recStage: '有效'
-            }
-            
-            this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
-            this.getModelData(type)
+            // this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            // this.getTaskId(row)
             this.rowMsg = row
         },
+        // 根据流程ID获取业务ID
+        getTaskId(row) {
+            let that = this
+            let params = {
+                id: row.instId,
+                iamCode: window.localStorage.getItem('code')
+            }
+            apiPostgetInstanceAndChildren(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.instanceChild = datas.data.data.bpmInstance
+                    let bizKey = datas.data.data.bpmInstance.bizKey
+                    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.getModelData(defKey)
+                }
+            })
+        },
+        //获取头部详情
+        getevalHeaderDetails(id) {
+            let that = this
+            let params = {
+                id: id
+            }
+            if (defKey === 'yddwkplc' || defKey === 'jddwkplc' || defKey === 'nddwkplc') {
+                apiGetHeaderOrganizationEvaluation(params).then(datas =>{
+                    that.getDataMsg(defKey, datas)
+                })
+            } else if(defKey === 'dwkpmbqd') {
+                apiGetHeaderDeptResponsibility(params).then(datas =>{
+                    that.getDataMsg('dwkpmbqd', datas)
+                })
+            }
+        },
+        getDataMsg(types, datas) {
+            if (datas && datas.data) {
+                let item = datas.data
+                this.receiptMsg = {
+                    code: types === 'dwkpmbqd'?item.responsibilityCode:item.organizationEvaluationCode,
+                    des: item.des,
+                    stage: item.stage,
+                    creator: item.createBy,
+                    createDate: item.createTime,
+                    type: item.checkCycle === 'YDKP'?'月度考评':item.checkCycle === 'JDKP'?'季度考评':'年度考评',
+                    year: item.year,
+                    recStage: '有效'
+                }
+            }
+        },
         // 获取业务属性
         getModelData(type) {
             let that = this
             that.titleMsgArr = []
             let params = {
-                type: type === '年度' ? '3' : '2'
+                type: type === 'nddwkplc' ? '3' : '2'
             }
             apiGetbinsectionList(params).then(datas =>{
                 if (datas && datas.data) {
@@ -244,7 +285,7 @@ export default {
             that.monthQuarterYearData = []
             that.isClickTagId = ''
             let params = {
-                organizationEvaluationId: that.rowMsg.id,
+                organizationEvaluationId: that.tastbizKey,
                 binSection: that.binSectionStr,
                 binStage: id
             }
@@ -258,24 +299,6 @@ export default {
                 }
             })
         },
-        // 根据流程ID获取业务ID
-        // getTaskId(row) {
-        //     let that = this
-        //     let params = {
-        //         id: row.instId,
-        //         iamCode: window.localStorage.getItem('code')
-        //     }
-        //     apiPostgetInstanceAndChildren(params).then(datas =>{
-        //         if (datas && datas.data) {
-        //             that.instanceChild = datas.data.data.bpmInstance
-        //             let keyId = datas.data.data.bpmInstance.bizKey  
-        //             that.tastbizKey = datas.data.data.bpmInstance.bizKey
-        //             that.taskDefKey = datas.data.data.bpmInstance.defKey
-        //             that.getevalStartDetails(keyId, that.instanceChild.defKey)
-        //             that.getOrgRule(keyId, that.instanceChild.defKey)
-        //         }
-        //     })
-        // },
         handleClick(val) {
             let stageId = ''
             this.stageData.forEach(it =>{
@@ -289,7 +312,7 @@ export default {
         getTableData(id) {
             let that = this
             let params = {
-                organizationEvaluationId: that.rowMsg.id,
+                organizationEvaluationId: that.tastbizKey,
                 indicatorId: id
             }
             apiGetgetEvaluationInfoDataList(params).then(datas =>{
@@ -365,8 +388,7 @@ export default {
             let saveParams = []
             let addObj = {
                 organizationId: that.userMes.unitId,
-                // organizationId: "23079300",
-                organizationEvaluationId: that.rowMsg.id,
+                organizationEvaluationId: that.tastbizKey,
                 indicatorId: that.isClickTagId,
                 binSection: that.binSectionStr,
                 binStage: that.addstageId,

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

@@ -64,7 +64,7 @@
 
 <script>
 import {apiPostTodoTaskList, apiPostgetInstanceAndChildren} from '../../api/api'
-import taskCenterEvl from './taskCenterEvlFrom.vue'
+import taskCenterEvl from './taskCenterEvlNewFrom.vue'
 import taskCenterDeptEvl from './taskCenterDeptStartFrom.vue'
 import taskCenterDeptBusinessEvl from './taskCenterDeptBusinessFrom.vue'
 export default {