diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue index d472429..ad843fb 100644 --- a/src/views/reportProcess/components/reportForm.vue +++ b/src/views/reportProcess/components/reportForm.vue @@ -297,6 +297,7 @@ export default { watch: { processForm: { handler(val) { + console.log(this.formControl,"jajjajajajajj") this.form = this.processForm console.log("变化了", this.form) if (this.form.secrecyLast) { @@ -317,16 +318,19 @@ export default { this.$refs.processFormRef.clearValidate() }) } - if(this.processForm.fileList.length>0){ - - this.fileList=this.processForm.fileList.map(item=>{ - return { - name:item.fileName, - id:item.fileId - } - }) - this.handleCurrentChange(1) + console.log(this.processForm,"this.processForm.fileList.length") + if(this.processForm.fileList){ + if(this.processForm.fileList.length>0){ + this.fileList=this.processForm.fileList.map(item=>{ + return { + name:item.fileName, + id:item.fileId + } + }) + this.handleCurrentChange(1) + } } + }, immediate: true } diff --git a/src/views/reportProcess/launch.vue b/src/views/reportProcess/launch.vue index 82ade44..63b0bbf 100644 --- a/src/views/reportProcess/launch.vue +++ b/src/views/reportProcess/launch.vue @@ -116,6 +116,7 @@ export default { } }, async created() { + debugger // 如果是从草稿进入的 if (this.$route.query.isDraft) { this.isShowSave = true @@ -152,13 +153,19 @@ export default { this.$set(this.assignForm,'oneApprove',submitJson.oneApprove) this.$set(this.assignForm,'oneApproveName',submitJson.oneApproveName) this.getLearder() + if (this.$route.query.type == 'yiban'){ + this.formControl = true + this.initShow = true + this.showTableD = true + } } else if (this.$route.query.type == 'yiban') { - this.taskId = this.$store.getters.handleProcess.taskId - this.prcNum = this.$store.getters.handleProcess.prcNum - this.prcId = this.$store.getters.handleProcess.prcId + 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