diff --git a/src/views/reportProcess/launch.vue b/src/views/reportProcess/launch.vue index 656de8d..57e01a2 100644 --- a/src/views/reportProcess/launch.vue +++ b/src/views/reportProcess/launch.vue @@ -180,19 +180,32 @@ export default { this.getReportDetail() }else{ this.prcType=4 + // 需要给部门带出来 + if(this.$store.getters.userInfo.orgEOList.length>0){ + let temp=this.$store.getters.userInfo.orgEOList + this.$set(this.processForm,'departmentName',temp[0].orgName) + this.$set(this.processForm,'department',temp[0].orgCode) + console.log(this.processForm,"wowowwoo") + } } - - } }, methods: { + // 查询文件名称 + getFileName(){ + this.$api.reportProcess.searchFile({fileId:this.processForm.fileId}).then(res=>{ + this.$set(this.processForm,'fileName',res.data) + }) + }, // 获取报告详情 getReportDetail(){ this.$api.report.getReportDetail(this.ids).then(res=>{ this.processForm=res.data this.processForm.reportId=this.processForm.id delete this.processForm['id'] - + if(this.processForm.fileId){ + this.getFileName() + } }) }, handleReset() { @@ -220,7 +233,7 @@ export default { twoApprove: '' } this.$nextTick(() => { - this.$refs.applicationFormRef.clearValidate() + this.$refs.assignFormRef.clearValidate() }) @@ -308,6 +321,7 @@ export default { let z=this.$refs.basMes.submit() if (v && z) { + this.processForm.createUserId=this.userId //如果不是第一次 if (this.initShow) { let flag=await this.JuggleSub(this.taskId) @@ -320,7 +334,7 @@ export default { taskId: this.taskId, userId: this.$store.getters.userInfo.usid, prcType: this.prcType, - reportId:'' + reportId: this.processForm.reportId|| '' }) } } else { @@ -351,7 +365,7 @@ export default { let dataJson = JSON.stringify(this.processForm) let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark}) this.$api.process.startProcess(form).then(({data}) => { - this.completeProcess({dataJson, submitJson, taskId: data.result, userId: form.userId, prcType: this.prcType}) + this.completeProcess({dataJson, submitJson, taskId: data.result, userId: form.userId, prcType: this.prcType, reportId: this.processForm.reportId|| ''}) }) }, //获取流程详细信息