From 94d19e446392bd69f6c434cd6d30c94329bb1b83 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Sun, 24 Apr 2022 14:31:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbfz/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index 3e4cabfe5..43cdc71f1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -647,7 +647,7 @@ export default { } else { this.isSubmit = true this.standardSearch.commentText = this.commentText - var json = Object.assign(this.standardSearch, this.roleForm) + var json = Object.assign(this.roleForm, this.standardSearch) this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, From 274cf8bdb1c07550c994a661226610b032f83f9e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 24 Apr 2022 15:04:55 +0800 Subject: [PATCH 2/6] feat: There is no way the, --- src/pages/processCenter/pages/creatProcess/qbfs/step3.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index b4a745973..a568ff255 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -307,7 +307,7 @@ export default { handler (val) { if (val !== '' && val !== null && typeof (val) !== 'undefined') { if(val === '1'){ - if (this.bpnId === undefined) { + if (this.bpnId === undefined || this.bpnId === "") { this.getFsFile() } } From 9e77733ee364c86d31277338fce342a969d8e2e2 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 24 Apr 2022 15:13:53 +0800 Subject: [PATCH 3/6] feat: There is no way the, --- .../pages/creatProcess/qbfs/common/formList.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbfs/step3.vue | 3 ++- src/pages/processCenter/pages/creatProcess/qbfs/step4.vue | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue index cff1b8221..d24a98a89 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue @@ -898,7 +898,7 @@ export default { form: { handler: function (val) { if(val){ - this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.FSDList,this.LXDList); + this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.LXDList,this.FSDList); } }, deep: true //对象的深度验证 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index a568ff255..a622f08c0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -178,6 +178,8 @@ export default { callback(new Error('请先在线编辑,再提交流程！')) } } + }else { + callback(new Error('请先在线编辑,再提交流程！')) } }; return { @@ -385,7 +387,6 @@ export default { this.choiceZRRList(type, title, id) }, formCancel (form, list1,list2,list3,list4,list5,list6,list7) { - console.log(form) this.qbfsForm = form this.FBGBUSSFileList = list1 this.LSBBBUSSFileList = list2 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue index 299341e8c..8069a53e0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue @@ -178,6 +178,8 @@ export default { callback(new Error('请先在线编辑,再提交流程！')) } } + }else { + callback(new Error('请先在线编辑,再提交流程！')) } }; const validateFsOnlineFile = async (rule, value, callback) => { @@ -192,6 +194,8 @@ export default { callback(new Error('请先在线编辑,再提交流程！')) } } + }else { + callback(new Error('请先在线编辑,再提交流程！')) } }; return { @@ -316,7 +320,7 @@ export default { this.qbfsForm.QCRBUSS=nameList; this.formKey++ } - if(data !== undefined && data && data.length > 0){ + if(data && data.length > 0){ const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") this.qbfsForm.QCDWID = institutionIdList From 93ae82b66f0730f2059c29017f575f580e71a9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 24 Apr 2022 15:35:03 +0800 Subject: [PATCH 4/6] =?UTF-8?q?52643=20=E3=80=90=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E3=80=91=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B-=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB-=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index b6cdc0327..d32931ae4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -970,7 +970,7 @@ .bzjdStep3 { .itemsTextBox { min-height: 300px; - max-height: 500px; + max-height: 835px; overflow: auto; line-height: 20px; /deep/ td { From c7632cb28d025ddd830137cf18dbe16daa44a505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 24 Apr 2022 16:03:26 +0800 Subject: [PATCH 5/6] =?UTF-8?q?52664=20=E3=80=90=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E3=80=91=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=EF=BC=8C=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=E7=9A=84=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=8E=86=E5=8F=B2=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20F12=E6=B2=A1=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue index 4d0be0df1..d8f886a62 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue @@ -316,7 +316,7 @@ From 0fc2e1b1728aad89e31d4806eeb07ea0a7d737a5 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 24 Apr 2022 17:13:58 +0800 Subject: [PATCH 6/6] feat: There is no way the, --- src/main.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main.js b/src/main.js index 803cf9d99..aeddc2492 100644 --- a/src/main.js +++ b/src/main.js @@ -71,6 +71,10 @@ router.beforeEach(function (to, from, next) { return } + if(webLoginType === 'idm' && toName === 'Login'){ + window.location.href = ssoLoginUrlDev + } + let fromName = from.name let token = store.state.token let path = to.path;