From 14777e7b19b2f3fa3a4033d79e6f98370c6f643e Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 5 Jan 2023 17:00:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2-?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86=201.=E5=B0=86=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=88=A0=E9=99=A4=E4=B8=BA=E4=B8=80=E4=B8=AA=E5=90=8E?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=8D=E6=98=BE=E7=A4=BA=202.=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=96=87=E4=BB=B6=E5=90=8E=E5=9B=9E=E6=98=BE=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creatProcess/qbrk/common/formEditList.vue | 22 ++++++++++++++++ .../pages/creatProcess/qbrk/step12.vue | 24 ++++++++++++------ .../pages/creatProcess/qbrk/step13.vue | 25 +++++++++++++------ .../pages/creatProcess/qbrk/stepC6.vue | 21 ++++++++++------ 4 files changed, 70 insertions(+), 22 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index 94b5d7db2..4755a6067 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -1009,6 +1009,28 @@ export default { }, deep: true //对象的深度验证 }, + // 删除文件后监听已上传的文件 并回显 + FBGBUSSFileListSub:function(val){ + this.FBGBUSSFileList = val + }, + LSBBBUSSFileListSub:function(val) { + this.LSBBBUSSFileList = val + }, + BZSMBUSSFileListSub:function(val) { + this.BZSMBUSSFileList = val + }, + QTWJBUSSFileListSub:function(val) { + this.QTWJBUSSFileList = val + }, + GLWJBUSSFileListSub:function(val) { + this.GLWJBUSSFileList = val + }, + summaryFileListSub:function(val) { + this.summaryFileList = val + }, + madelSubListSub:function(val) { + this.madelSubList = val + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index afa81e31e..2341c2d5d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -2228,6 +2228,8 @@ break; default : ; } + // 刷新组件 + this.formKey++ }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { @@ -2382,25 +2384,33 @@ fileInfoHandle(){ //拼接文件名和id 提交到流程Activity - this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",") + // this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",") + // 修复将文件删除为一个后提交不显示的bug + this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",") - this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",") + // this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",") + this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",") - this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",") + // this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",") + this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",") - this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",") + // this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",") + this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",") - this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",") + // this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",") + this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") - this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",") + // this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",") + this.form.summaryFile=this.summaryFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.summaryFileName=this.summaryFileList.map(item => item.name).join(",") - this.form.madelSub=this.madelSubList.map(item => item.id).join(",") + // this.form.madelSub=this.madelSubList.map(item => item.id).join(",") + this.form.madelSub=this.madelSubList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.madelSubName=this.madelSubList.map(item => item.name).join(",") }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 741892a8f..dea4f6765 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2270,6 +2270,7 @@ break; default : ; } + this.formKey++ }, popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { @@ -2437,25 +2438,33 @@ fileInfoHandle(){ //拼接文件名和id 提交到流程Activity - this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",") + // this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",") + // 修复将文件删除为一个后提交不显示的bug + this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",") - this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",") + // this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",") + this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",") - this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",") + // this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",") + this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",") - this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",") + // this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",") + this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",") - this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",") + // this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",") + this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") - this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",") + // this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",") + this.form.summaryFile=this.summaryFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.summaryFileName=this.summaryFileList.map(item => item.name).join(",") - this.form.madelSub=this.madelSubList.map(item => item.id).join(",") + // this.form.madelSub=this.madelSubList.map(item => item.id).join(",") + this.form.madelSub=this.madelSubList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.madelSubName=this.madelSubList.map(item => item.name).join(",") }, @@ -2709,7 +2718,7 @@ this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName); this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName); this.madelSubList=this.assemble(item.madelSub,item.madelSubName); - + this.formKey++ this.getStandInfoByReviseStatus() }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index dbd98e7d9..7f6a4215b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -2811,23 +2811,30 @@ fileInfoHandle(){ //拼接文件名和id 提交到流程Activity - console.log(this.FBGBUSSFileList) - this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",") + + // 修复将文件删除为一个后提交不显示的bug + // this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",") + this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",") - this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",") + // this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",") + this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",") - this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",") + // this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",") + this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",") - this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",") + // this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",") + this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",") - this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",") + // this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",") + this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") - this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",") + // this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",") + this.form.summaryFile=this.summaryFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.summaryFileName=this.summaryFileList.map(item => item.name).join(",") },