From 30f7abd974cb7e310fd7065949b20fdc7c861f4c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 24 Oct 2022 16:28:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B-?= =?UTF-8?q?=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9c=E7=B1=BB=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E4=B8=8D=E8=B0=83=E5=8F=96=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbfs/step5.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbfs/step6.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue index 85adde837..561b329e2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue @@ -656,7 +656,7 @@ export default { }, res => { if (res.success) { this.isSubmit = false - if(this.qbfsForm.approvalOpinion === 0){ + if(this.qbfsForm.approvalOpinion === 0 && this.qbfsForm.standSort.indexOf("Q/QCBFC") == -1){ this.processCreateFsBuss(json) } this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue index d0b8f6c5f..0d915c543 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue @@ -3031,7 +3031,6 @@ export default { _this: this }, res => { if (res.ok) { - return this.$http.post("lawss/activiti/completeTask", { taskIds: res.data, userId: this.$store.getters.userInfo.userId, From f5a837060d6f778185b200fb0b3952532621b2da Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 24 Oct 2022 17:50:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbfs/step3.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index 9de4f49b6..8a36121e1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -294,9 +294,9 @@ export default { releaseTime: [ {required: true, message: "请选择计划标准发布日期", trigger: "change"} ], - // FSDName: [ - // { required: true, validator: validateFsOnlineFile, trigger: 'blur' } - // ], + FSDName: [ + { required: true, validator: validateFsOnlineFile, trigger: 'blur' } + ], }, } },