diff --git a/src/views/permissionApplication/examine.vue b/src/views/permissionApplication/examine.vue index 585872f..17b4444 100644 --- a/src/views/permissionApplication/examine.vue +++ b/src/views/permissionApplication/examine.vue @@ -162,14 +162,15 @@ export default { } this.getProcessDetail(params).then(res=>{ 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.$set(this.applicationForm,'power',this.tableData[0].power) + this.$set(this.applicationForm,'applyReason',this.tableData[0].applyReason) + this.$set(this.processForm,'prcName',this.prcName) + this.disabled=false this.formControl= true if(this.$route.query.type=='yiban'){ this.disabled=true - this.submitjson=JSON.parse(res.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 f256032..90c1eb0 100644 --- a/src/views/permissionApplication/launch.vue +++ b/src/views/permissionApplication/launch.vue @@ -212,10 +212,10 @@ export default { this.prcId = this.$store.getters.handleProcess?.prcId this.prcName = this.$store.getters.handleProcess?.prcName this.getDraftDetail().then(res => { + this.$set(this.processForm,'prcName', this.prcName) let tableData = JSON.parse(this.processOld.dataJson) - this.processForm.prcName = this.prcName - this.applicationForm.power = tableData[0].power - this.applicationForm.applyReason = tableData[0].applyReason + this.$set(this.applicationForm,'power',tableData[0].power) + this.$set(this.applicationForm,'applyReason',tableData[0].applyReason) if(tableData[0].reportId){ this.tableData=tableData } @@ -238,17 +238,20 @@ export default { this.prcName = JSON.stringify(this.prcName) this.initShow = true this.formControlname = true - this.processForm.prcName = this.$route.query.prcName - console.log("122") + this.$set(this.processForm,'prcName',this.$route.query.prcName) await this.getProcessDetail() - let applyReason = JSON.parse(this.processOld.dataJson) + let submitJson = JSON.parse(this.processOld.submitJson) + // this.applicationForm.applyReason = applyReason.applyReason this.tableData = JSON.parse(this.processOld.dataJson) - this.applicationForm.power = this.tableData[0].power - debugger - this.applicationForm.applyReason = applyReason[0].applyReason - + this.$set(this.applicationForm,'power',this.tableData[0].power) + this.$set(this.applicationForm,'applyReason',this.tableData[0].applyReason) + this.$set(this.assignForm,'oneApprove',submitJson.oneApprove) + this.$set(this.assignForm,'oneApproveName',submitJson.oneApproveName) + this.$set(this.assignForm,'twoApprove',submitJson.twoApprove) + this.$set(this.assignForm,'twoApproveName',submitJson.twoApproveName) + this.$set(this.assignForm,'remark',submitJson.remark) //指派信息 - ({oneApprove:this.assignForm.oneApprove,oneApproveName:this.assignForm.oneApproveName,twoApprove:this.assignForm.twoApprove,twoApproveName:this.assignForm.twoApproveName,remark:this.assignForm.remark}= JSON.parse(this.processOld.submitJson)) + // ({oneApprove:this.assignForm.oneApprove,oneApproveName:this.assignForm.oneApproveName,twoApprove:this.assignForm.twoApprove,twoApproveName:this.assignForm.twoApproveName,remark:this.assignForm.remark}= JSON.parse(this.processOld.submitJson)) // this.getProcessDetail().then(res => { // //基础信息 // let applyReason = JSON.parse(res.processOld.dataJson) @@ -270,14 +273,16 @@ export default { this.initShow = true this.showTableD = true 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(res.processOld.submitJson) - + let submitJson = JSON.parse(this.processOld.submitJson) + // this.applicationForm.applyReason = applyReason.applyReason + this.tableData = JSON.parse(this.processOld.dataJson) + this.$set(this.applicationForm,'power',this.tableData[0].power) + this.$set(this.applicationForm,'applyReason',this.tableData[0].applyReason) + this.$set(this.assignForm,'oneApprove',submitJson.oneApprove) + this.$set(this.assignForm,'oneApproveName',submitJson.oneApproveName) + this.$set(this.assignForm,'twoApprove',submitJson.twoApprove) + this.$set(this.assignForm,'twoApproveName',submitJson.twoApproveName) + this.$set(this.assignForm,'remark',submitJson.remark) }) } }, @@ -378,7 +383,8 @@ export default { createUserName: this.$store.getters.userInfo.usname, createUser: this.$store.getters.userInfo.usid, submitJson, - dataJson + dataJson, + id: this.$store.getters.handleProcess?.id } this.saveProcess(params).then( ()=>{