Browse Source

问题修改;

SunZehao 1 year ago
parent
commit
31cbb5b682

+ 6 - 31
src/components/assessment/evaluationAmendmentPage.vue

@@ -286,16 +286,16 @@ export default {
         //新增/修改考评启动数据
         saveAndEditIndicatorData() {
             let that = this
-            // let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
             let params = {
                 organizationType: that.ruleForm.organizationType,
                 checkCycle: that.ruleForm.evaluationCycle,
                 year: that.ruleForm.year,
                 des: that.ruleForm.desc,
-                // createOrgId: userMes.unitId,
-                // createOrgName: userMes.unitName,
-                // createBy: userMes.id,
-                // createName: userMes.name
+                createOrgId: userMes.unitId,
+                createOrgName: userMes.unitName,
+                createBy: userMes.id,
+                createName: userMes.name
             }
             if (that.isSave) {
                 params.id = this.evalradio.id
@@ -328,7 +328,7 @@ export default {
             let that = this
             let par = {
                 defKey: "dwkpmbxd",
-                businessKey: row.standbyId,
+                businessKey: row.id,
                 action: "start",
                 opinion: "考评目标修订",
                 iamCode: window.localStorage.getItem('code')
@@ -350,8 +350,6 @@ export default {
                         }
                     }
                 })
-            } else {
-                // that.getDeptresponsibility(row)
             }
         },
         // 修改状态
@@ -373,29 +371,6 @@ export default {
                 }
             })
         },
-        // 生成目标责任书
-        getDeptresponsibility(row) {
-            let that = this
-            let params = {
-                responsibilityIds: row.id
-            }
-            apiGetdeptresponsibilitygenerate(params).then(datas =>{
-                if (datas && datas.data) {
-                    if (!datas.success) {
-                        that.$message({
-                            message: datas.message,
-                            type: 'error'
-                        });
-                    } else {
-                        that.$message({
-                            message: '考评目标已启动',
-                            type: 'success'
-                        });
-                    }
-                    that.getevaluAmendmentList()
-                }
-            })
-        },
         clickDes(row, column, cell, event) {
             if (row.stage === '流程已结束') {
                 row.chngeDes = false

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

@@ -370,7 +370,7 @@ export default {
             apiGetUserPostList(params).then(datas =>{
                 if (datas.data && datas.data.records.length>0) {
                     datas.data.records.forEach(it =>{
-                        if (it.posName === '主任' || it.posName === '副主任' || it.deptName === '组织人事部(人力资源部)') {
+                        if (it.posName === '主任' || it.posName === '副主任' || it.posName.indexOf('组织人事部') !== -1) {
                             that.showMessage = true
                         }
                     })
@@ -570,7 +570,7 @@ export default {
                 })
             })
         },
-        deleteRowFn(row) {
+        deleteRowFn(row, index) {
             let that = this
             this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
                 confirmButtonText: '确定',

+ 1 - 16
src/views/Login.vue

@@ -59,7 +59,7 @@
 <script>
 import { ElMessage } from "element-plus";
 import JSEncrypt from 'jsencrypt'
-import { loginApi, apiGetCodeByToken, apiGetUserMsg,apiGetUserPostList, apiGetPrivilegesOfCurrentUserAll, apigetPublicKey } from '../api/api'
+import { loginApi, apiGetCodeByToken, apiGetUserMsg,apiGetPrivilegesOfCurrentUserAll, apigetPublicKey } from '../api/api'
 export default {
     data() {
         return {
@@ -180,21 +180,6 @@ export default {
                         id: datas.data.id
                     }
                     window.sessionStorage.setItem('user', JSON.stringify(obj))
-                    window.sessionStorage.setItem('ispersonDept', false)
-                    let params = {
-                        userId: datas.data.id,
-                        current: 1,
-                        size: 10
-                    }
-                    apiGetUserPostList(params).then(datas =>{
-                        if (datas.data && datas.data.records.length>0) {
-                            datas.data.records.forEach(it =>{
-                                if (it.deptName === '组织人事部(人力资源部)') {
-                                    window.sessionStorage.setItem('ispersonDept', true)
-                                }
-                            })
-                        }
-                    })
                     that.getApprverData()
                 }
             })

+ 21 - 1
src/views/homePage.vue

@@ -48,7 +48,7 @@
         removeToken
     } from '../api/auth'
     import {
-        apiPostremoveByToken,
+        apiPostremoveByToken,apiGetUserPostList,
         apiGetMenuData
     } from '../api/api'
     export default {
@@ -73,6 +73,7 @@
         },
         created() {
             this.getMenuData()
+
             // this.forecastDatas = [{
             //         index: '/home',
             //         name: '考评首页',
@@ -264,6 +265,7 @@
             if (window.sessionStorage.getItem('user')) {
                 let obj = JSON.parse(window.sessionStorage.getItem('user'))
                 this.userName = obj.name
+                this.getPersonMsg(obj.id)
             }
         },
         mounted() {
@@ -348,6 +350,24 @@
                     }
                 })
             },
+            // 获取人员岗位信息
+            getPersonMsg(id) {
+                window.sessionStorage.setItem('ispersonDept', false)
+                let params = {
+                    userId: id,
+                    current: 1,
+                    size: 10
+                }
+                apiGetUserPostList(params).then(datas =>{
+                    if (datas.data && datas.data.records.length>0) {
+                        datas.data.records.forEach(it =>{
+                            if (it.posName.indexOf('组织人事部') !== -1) {
+                                window.sessionStorage.setItem('ispersonDept', true)
+                            }
+                        })
+                    }
+                })
+            },
             changeMenuData(data) {
                 let childArr = []
                 data.forEach(item => {