diff --git a/src/components/ProcessMixin.vue b/src/components/ProcessMixin.vue index 4a1b7c3..da270e3 100644 --- a/src/components/ProcessMixin.vue +++ b/src/components/ProcessMixin.vue @@ -110,10 +110,11 @@ prcId: this.prcId, prcType: this.prcType }).then(res=>{ + let that=this let data=res.data this.processOld=data console.log( this.processOld,"processOld") - resolve(this) + resolve(that) }).catch(err=>{ reject() }) diff --git a/src/views/permissionApplication/examine.vue b/src/views/permissionApplication/examine.vue index 42dcdc8..ac98d78 100644 --- a/src/views/permissionApplication/examine.vue +++ b/src/views/permissionApplication/examine.vue @@ -161,15 +161,15 @@ export default { this.disabled=true } this.getProcessDetail(params).then(res=>{ - this.tableData = JSON.parse(this.processOld.dataJson) - this.applicationForm.power = this.tableData[0].power - this.applicationForm.applyReason = this.tableData[0].applyReason - this.processForm.prcName = this.prcName + this.tableData = JSON.parse(res.processOld.dataJson) + this.applicationForm.power = res.tableData[0].power + this.applicationForm.applyReason = res.tableData[0].applyReason + this.processForm.prcName = res.prcName this.disabled=false this.formControl= true if(this.$route.query.type=='yiban'){ this.disabled=true - this.submitjson=JSON.parse(this.processOld.submitJson) + this.submitjson=JSON.parse(res.processOld.submitJson) }else{ } diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue index b538bfc..7fb36d2 100644 --- a/src/views/permissionApplication/launch.vue +++ b/src/views/permissionApplication/launch.vue @@ -219,11 +219,15 @@ export default { if(tableData[0].reportId){ this.tableData=tableData } - debugger if(this.processOld.submitJson !== '{}'){ this.assignForm =JSON.parse(this.processOld.submitJson) } + this.$nextTick(()=>{ + this.$refs.applicationFormRef.clearValidate() + this.$refs.assignFormRef.clearValidate() + }) }) + } if (this.$route.query.taskDefinitionKey == 'aid4' ) { this.taskId = this.$store.getters.handleProcess.taskId @@ -237,8 +241,9 @@ export default { console.log("122") this.getProcessDetail().then(res => { //基础信息 - this.tableData = JSON.parse(this.processOld.dataJson) - this.applicationForm.power = this.tableData[0].power + console.log(res.prcName) + this.tableData = JSON.parse(res.processOld.dataJson) + this.applicationForm.power = res.tableData[0].power this.applicationForm.applyReason = this.tableData[0].applyReason //指派信息 @@ -253,18 +258,17 @@ export default { this.formControl = true this.initShow = true this.showTableD = true - this.getProcessDetail().then(() => { - this.tableData = JSON.parse(this.processOld.dataJson) - this.applicationForm.power = this.tableData[0].power - this.applicationForm.applyReason = this.tableData[0].applyReason - this.processForm.prcName = this.prcName + this.getProcessDetail().then((res) => { + res.tableData = JSON.parse(res.processOld.dataJson) + res.applicationForm.power = res.tableData[0].power + res.applicationForm.applyReason = res.tableData[0].applyReason + res.processForm.prcName = res.prcName //指派信息 // ({ name: a.name, age: a.age } = b) - this.assignForm = JSON.parse(this.processOld.submitJson) + this.assignForm = JSON.parse(res.processOld.submitJson) }) } - console.log(this.PERMISSION, 'ddd') }, methods: { handleCheck(name) {