diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue index ec8cb8a..5e9ee12 100644 --- a/src/views/Report/ReportManager.vue +++ b/src/views/Report/ReportManager.vue @@ -874,29 +874,13 @@ export default { }, // 打开报告上传 openReportModify(mode, row) { - this.reportF = { - name: '', // 报告名称 - mainContent: '', // 内容摘要 - department: '', // 报告所属部门 - fileName: '', // 文件上传 - fileId: '', - year: '', // 报告年份 - privacyLevel: undefined, //报告隐私等级 - reportUserIdList: [], // 权限 - confidentialLevel:undefined, //涉密等级 - labelList:[] //标签 - }; - this.tags = [] - this.mode = mode; - // this.labelList(); - let rowData = JSON.parse(JSON.stringify(row)); - console.log('rowData',rowData); - this.reportF = rowData; - // this.reportF.tags=JSON.parse(rowData.keyContent) - this.tags=JSON.parse(rowData.keyContent) - if(this.tags == '') this.tags =[] - this.$forceUpdate() - this.dialogReport = true; + this.$router.push({ + path:'/reportprocess/launch', + query:{ + id:this.$route.query.id, + ids:row.id + } + }) }, // 获取所有用户 sysUserList() { diff --git a/src/views/reportProcess/examine.vue b/src/views/reportProcess/examine.vue index a23006c..cc8e61b 100644 --- a/src/views/reportProcess/examine.vue +++ b/src/views/reportProcess/examine.vue @@ -89,7 +89,7 @@ export default { }, PERMISSION, submitjson:{}, - prcType: 4 + prcType: '' } }, created () { @@ -98,7 +98,7 @@ export default { this.prcNum=this.$store.getters.handleProcess.prcNum this.prcId=this.$store.getters.handleProcess.prcId this.prcName=this.$store.getters.handleProcess.prcName - + this.prcType = this.$store.getters.handleProcess?.prcType let params={ prcId: this.prcId, diff --git a/src/views/reportProcess/launch.vue b/src/views/reportProcess/launch.vue index abbe21a..7b448fe 100644 --- a/src/views/reportProcess/launch.vue +++ b/src/views/reportProcess/launch.vue @@ -110,18 +110,12 @@ export default { trigger: 'change' }], }, - prcType: 4, - prcName:'' + prcType: '', + prcName:'', + ids:'' } }, async created() { - - // if (this.$route.query.isBegin) { - // if (this.$route.query.ids.split(',').length > 0) { - // this.reportList(this.$route.query.ids) - // } - - // 如果是从草稿进入的 if (this.$route.query.isDraft) { this.isShowSave = true @@ -130,6 +124,7 @@ export default { this.prcNum = this.$store.getters.handleProcess?.prcNum this.prcId = this.$store.getters.handleProcess?.prcId this.prcName = this.$store.getters.handleProcess?.prcName + this.prcType = this.$store.getters.handleProcess?.prcType this.getProcessDetail().then(res => { if(this.processOld.submitJson !== '{}'){ let submitJson=JSON.parse(this.processOld.submitJson) @@ -147,6 +142,7 @@ export default { this.taskId = this.$store.getters.handleProcess.taskId this.prcNum = this.$store.getters.handleProcess.prcNum this.prcId = this.$store.getters.handleProcess.prcId + this.prcType = this.$store.getters.handleProcess?.prcType this.initShow = true this.formControlname = true await this.getProcessDetail() @@ -161,6 +157,7 @@ export default { this.taskId = this.$store.getters.handleProcess.taskId this.prcNum = this.$store.getters.handleProcess.prcNum this.prcId = this.$store.getters.handleProcess.prcId + this.prcType = this.$store.getters.handleProcess?.prcType this.formControl = true this.initShow = true this.showTableD = true @@ -172,13 +169,29 @@ export default { this.$set(this.assignForm,'oneApproveName',submitJson.oneApproveName) }) }else{ - // 第一次进入此页面 需要清楚校验 this.isShowSave = true this.$store.commit('setHandleProcess','') this.handleReset() + // 第一次进入此页面 需要依据ids区分是新增还是编辑流程 + if(this.$route.query.ids){ + this.prcType=5 + // 调用接口 + this.ids=this.$route.query.ids + this.getReportDetail() + }else{ + this.prcType=4 + } + + } }, methods: { + // 获取报告详情 + getReportDetail(){ + this.$api.report.getReportDetail(this.ids).then(res=>{ + this.processForm=res.data + }) + }, handleReset() { this.processForm={ departmentName:'',