diff --git a/src/views/permissionApplication/components/reportDrawer.vue b/src/views/permissionApplication/components/reportDrawer.vue index 326df05..dd528f7 100644 --- a/src/views/permissionApplication/components/reportDrawer.vue +++ b/src/views/permissionApplication/components/reportDrawer.vue @@ -165,6 +165,8 @@ export default { this.PERMISSION = this.PERMISSION.map(item=>{ if(item.value == oldPower){ item.disabled=true + }else{ + item.disabled=false } return item }) diff --git a/src/views/permissionApplication/examine.vue b/src/views/permissionApplication/examine.vue index 4503fd2..66aa6df 100644 --- a/src/views/permissionApplication/examine.vue +++ b/src/views/permissionApplication/examine.vue @@ -22,7 +22,7 @@ - + @@ -49,9 +49,9 @@ class="label-input-form no_border" size="medium" :disabled="formControl"> - + - + @@ -249,6 +249,12 @@ export default { } - diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue index 8a35615..f08ec59 100644 --- a/src/views/permissionApplication/launch.vue +++ b/src/views/permissionApplication/launch.vue @@ -8,7 +8,7 @@
- 基础信息 + 报告信息 diff --git a/src/views/reportProcess/launch.vue b/src/views/reportProcess/launch.vue index 9e3a1ef..4dc0c45 100644 --- a/src/views/reportProcess/launch.vue +++ b/src/views/reportProcess/launch.vue @@ -31,7 +31,7 @@ - 选取 + 选取 @@ -78,6 +78,7 @@ export default { mixins: [processMixin], data() { return { + checkBtn:false, isLevel: true, dataId:'', showTableD: false, @@ -137,7 +138,7 @@ export default { this.$refs.assignFormRef.clearValidate() }) }) - + this.getLearder() } else if (this.$route.query.taskDefinitionKey == 'reEdit' ) { this.taskId = this.$store.getters.handleProcess.taskId @@ -152,6 +153,7 @@ export default { this.processForm=JSON.parse(this.processOld.dataJson) this.$set(this.assignForm,'oneApprove',submitJson.oneApprove) this.$set(this.assignForm,'oneApproveName',submitJson.oneApproveName) + this.getLearder() } else if (this.$route.query.type == 'yiban') { @@ -173,10 +175,13 @@ export default { this.isShowSave = true this.$store.commit('setHandleProcess','') this.handleReset() - if(this.$store.getters.userInfo.levelId=='0.5'){ + 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.isShowSave = false this.isLevel=false }else{ + this.getLearder() this.isLevel = true this.isShowSave = true } @@ -201,6 +206,22 @@ export default { } }, methods: { + // 获取领导 + getLearder(){ + console.log("获取领导") + this.$api.reportProcess.getLeader({ + userId:this.userId + }).then(res=>{ + debugger + }) + // if(res.data){ + // this.assignForm.oneApprove=res.userId + // this.assignForm.oneApproveName=res.userName + // this.checkBtn=true + // }else{ + // this.checkBtn=false + // } + }, // 查询文件名称 getFileName(){ this.$api.reportProcess.searchFile({fileId:this.processForm.fileId}).then(res=>{