From d3740a81c8c2e2e12adf7cd8442b738af406a28c Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Sat, 2 Apr 2022 15:41:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 2f90ea679..3b2f41c00 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -161,12 +161,12 @@ clearable > - - + + { + this.$refs.form.validateField('treeListName') + }) this.modalShowTree = false } From 9315a37032722fb7e59e186d452efbfaf0accf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 2 Apr 2022 16:24:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A6=85=E9=81=93bug=2052401=2052408=20524?= =?UTF-8?q?07=2052404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzjd/step1-1.vue | 11 ++++++++++- .../processCenter/pages/creatProcess/bzjd/step1.vue | 1 - .../processCenter/pages/creatProcess/bzqdfb/step3.vue | 4 ++-- .../processCenter/pages/creatProcess/bzrk/step1.vue | 3 +++ .../pages/creatProcess/qbzxdjhgk/step1.vue | 1 + 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index f96bd01c6..dad1a6582 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -1103,7 +1103,16 @@ } else { this.isSubmit = true this.$http.post('lawss/activiti/startProcessRollBack', { - type: '9' + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '9', + json: JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText1: this.commentText1, + itemList: this.itemList, + sarType: this.sarType + }) }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index f3e40a0db..6e0476ced 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -1112,7 +1112,6 @@ export default { } else { this.isSubmit = true this.$http.post('lawss/activiti/startProcessRollBack', { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '9', diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index d5c5515a1..484587e3b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -9,7 +9,7 @@
基础信息
审批历史
-
+
@@ -817,7 +817,7 @@ export default { this.listForm.commentText = this.commentText this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); - // this.isSubmit = true + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 3b2f41c00..225356f6a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1669,6 +1669,9 @@ export default { ], }, rules: { + standSystem: [ + {required: true, message: '请选择标准体系', trigger: 'change'} + ], treeListName: [ {required: true, message: '请选择归档位置', trigger: 'blur'} ], diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index c26568a79..48cd54c04 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -469,6 +469,7 @@ export default { qbzxdFrom.type = this.toggleType this.saveLoading = true let _formData = new FormData() + console.log(qbzxdFrom); _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.userName) From 16b37e009f74c75c62012f129537aa0ffe04b69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 2 Apr 2022 16:27:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?52411=20=E9=A1=B9=E7=9B=AE=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B--=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=E6=94=B9=E6=88=90=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BA=BA=E6=94=B9=E6=88=90=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step1.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 1e3af279e..9c95ed934 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -3,7 +3,7 @@
- +
基础信息
@@ -191,13 +191,13 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - + -

流程发起人

+

标准法规工程师

- +