diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue index 3f8d46f..fce3b77 100644 --- a/src/views/permissionApplication/launch.vue +++ b/src/views/permissionApplication/launch.vue @@ -112,6 +112,7 @@ export default { } }, async created() { + // 第一次进入此页面 需要清楚校验 if (this.$route.query.isBegin) { // if (this.$route.query.ids.split(',').length > 0) { @@ -188,8 +189,23 @@ export default { } }, methods: { - getV(newValue,jiaVlue) - { + // 获取领导 + getLearder(id){ + console.log("获取领导") + return new Promise((resolve,reject)=>{ + this.$api.reportProcess.getLeader({ + userId:id + }).then(res=>{ + if(res.data.length>0){ + resolve(res.data) + }else{ + resolve('') + + } + }) + }) + }, + getV(newValue,jiaVlue) { if(jiaVlue &&jiaVlue.length > 0){ jiaVlue.forEach(item=>{ this.delData.push({ @@ -214,6 +230,14 @@ export default { this.tableData = data.records.map(item => { item.oneApprove = item.createUserId || '' item.oneApproveName= item.uploader || '' + if(item.createUserId){ + this.getLearder(item.createUserId).then(res=>{ + if(res){ + item.twoApprove = res[0].userId + item.twoApproveName= res[0].userName + } + }) + } item.reportId = item['id'] delete item['id'] return item diff --git a/src/views/reportProcess/launch.vue b/src/views/reportProcess/launch.vue index e490339..f0cf67c 100644 --- a/src/views/reportProcess/launch.vue +++ b/src/views/reportProcess/launch.vue @@ -175,9 +175,9 @@ export default { this.isShowSave = true this.$store.commit('setHandleProcess','') this.handleReset() - if(this.$store.getters.userInfo.levelId=='1' || this.$store.getters.userInfo.levelId=='2' + if((this.$store.getters.userInfo.levelId=='1' || this.$store.getters.userInfo.levelId=='2' ||this.$store.getters.userInfo.levelId=='3' || this.$store.getters.userInfo.levelId=='4' - ||this.$store.getters.userInfo.employeeTypeId=='1' ){ + )&& this.$store.getters.userInfo.employeeTypeId=='1' ){ this.isShowSave = false this.isLevel=false }else{