From 14777e7b19b2f3fa3a4033d79e6f98370c6f643e Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 5 Jan 2023 17:00:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86=201.=E5=B0=86?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=A0=E9=99=A4=E4=B8=BA=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=90=8E=E6=8F=90=E4=BA=A4=E4=B8=8D=E6=98=BE=E7=A4=BA=202.?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=E5=90=8E=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E9=94=99=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(",") }, From 954c8d287a2f2f21ec4ac2066b4610806f22ed8e Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 6 Jan 2023 11:02:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=20=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1-?= =?UTF-8?q?=E8=B5=B7=E8=8D=89=E7=95=8C=E9=9D=A2-=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E4=BC=81=E6=A0=87-=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=90=8E=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=20=E6=B8=85=E7=A9=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbfs/step1.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 17d9a9777..809d17518 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -886,6 +886,9 @@ export default { this.getReplaceLawsNumRow() }, replaceLawsNumModelCancel () { + this.replaceLawsNumForm.standCode = '' + this.replaceLawsNumForm.issueTimeArr = '' + this.replaceLawsNumForm.reviewTimeArr = '' // this.replaceLawsNumModel = false this.$refs.selections.clearSelection() }, From 9c7f1a92a3f1d16050c4a66e554a92c4874f00fd Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Fri, 6 Jan 2023 11:21:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/step1.vue | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index ed50d676f..85134bb16 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -592,21 +592,21 @@ export default { qbzxdFrom.commentText = this.commentText; qbzxdFrom.addFlag = '0' let json = Object.assign(qbzxdFrom, this.roleForm); - this.$http.post("lawss/activiti/startProcessRollBack", { - createUser: this.$store.getters.userInfo.userId, - createUserName: this.$store.getters.userInfo.userName, - type: '25', - json: JSON.stringify({ - roleForm: this.roleForm, - qbfsForm: qbzxdFrom, - commentText: this.commentText - }) - }, { - _this: this - }, res => { - if (res.ok) { + // this.$http.post("lawss/activiti/startProcessRollBack", { + // createUser: this.$store.getters.userInfo.userId, + // createUserName: this.$store.getters.userInfo.userName, + // type: '25', + // json: JSON.stringify({ + // roleForm: this.roleForm, + // qbfsForm: qbzxdFrom, + // commentText: this.commentText + // }) + // }, { + // _this: this + // }, res => { + // if (res.ok) { this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, + taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, json: JSON.stringify(json) }, { @@ -628,8 +628,8 @@ export default { this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } }); - } - }); + // } + // }); }else { this.$refs["roleForm"].validate((valid) => { if (valid) { From 181c8af20e2145f62c632aa9cb7e9975a8398aae Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 6 Jan 2023 14:56:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92-=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E6=A0=87=E5=87=86=E8=B5=B7=E8=8D=89=E8=8A=82=E7=82=B9?= =?UTF-8?q?-=E7=BC=96=E5=88=B6=E8=AF=B4=E6=98=8E=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index c83de9a6e..676c82575 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -3406,4 +3406,7 @@ export default { } } } +/deep/ .el-form-item__error{ + right:50px !important; +}