From 61f21a5a979d06bf6804957681f76243d39a67ae Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 23 Nov 2022 09:50:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/establish.vue | 10 +++---- .../pages/creatProcess/qbzxdjhgk/step1.vue | 30 +++++++++++-------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index fb166c543..193c24f8e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -1021,16 +1021,14 @@ export default { this.$refs.qbfsForm.validateField('resPersonName'); } }, - validateForm () { - let flag = null + validateForm (callback) { this.$refs['qbfsForm'].validate((valid) => { if (valid) { - flag = true - } else { - flag = false + callback && callback() + } else{ + this.$message.warning("请完善基础信息"); } }) - return flag } }, }; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index e5ad5e621..5747e3e5c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -527,9 +527,8 @@ export default { this.$message.warning('企标名称已存在,请更改!') }else { if (this.$route.query.prcNum === undefined) { - let flag = this.$refs["childForm"].validateForm(); - let qbzxdFrom = this.$refs["childForm"].qbfsForm; - if (flag) { + this.$refs["childForm"].validateForm(()=>{ + let qbzxdFrom = this.$refs["childForm"].qbfsForm; this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; @@ -578,13 +577,16 @@ export default { this.$message.warning("请完善人员信息"); } }); - } else { - this.$message.warning("请完善基础信息"); - } + }); + + // if (flag) { + // + // } else { + // this.$message.warning("请完善基础信息"); + // } } else { - let flag = this.$refs["childForm"].validateForm(); - let qbzxdFrom = this.$refs["childForm"].qbfsForm; - if (flag) { + let flag = this.$refs["childForm"].validateForm(() => { + let qbzxdFrom = this.$refs["childForm"].qbfsForm; this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; @@ -609,9 +611,13 @@ export default { this.$message.warning("请完善人员信息"); } }); - } else { - this.$message.warning("请完善基础信息"); - } + }); + + // if (flag) { + // + // } else { + // this.$message.warning("请完善基础信息"); + // } } } }, From a450fd383567f3713cf9e4d2d3105f170d8c5261 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 23 Nov 2022 11:15:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E5=BE=85=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 11 +++++++++++ .../pages/creatProcess/qbzxdjhgk/component/cancel.vue | 10 ++++------ .../pages/creatProcess/qbzxdjhgk/component/delay.vue | 10 ++++------ .../creatProcess/qbzxdjhgk/component/establish.vue | 1 - .../pages/creatProcess/qbzxdjhgk/component/merge.vue | 10 ++++------ .../pages/creatProcess/qbzxdjhgk/component/rename.vue | 10 ++++------ 6 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index f5df18b37..db0b745db 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -1698,6 +1698,17 @@ export default { prcType: row.prcType } }) + }else if(row.taskInfo === '技术标准起草') { + this.$router.push({ + name: 'qbzxdjhgkStep6', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break; case "26": diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 949defe12..bde41ba03 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -403,16 +403,14 @@ export default { }) }, methods: { - validateForm () { - let flag = null + validateForm (callback) { this.$refs['qbfsForm'].validate((valid) => { if (valid) { - flag = true - } else { - flag = false + callback && callback() + } else{ + this.$message.warning("请完善基础信息"); } }) - return flag }, choiceShow(){ this.getStandDataBtn() diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 768aee1bc..63b309cd8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -425,16 +425,14 @@ export default { }) }, methods: { - validateForm () { - let flag = null + validateForm (callback) { this.$refs['qbfsForm'].validate((valid) => { if (valid) { - flag = true - } else { - flag = false + callback && callback() + } else{ + this.$message.warning("请完善基础信息"); } }) - return flag }, choiceShow(){ this.getStandDataBtn() diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 193c24f8e..5c1993936 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -446,7 +446,6 @@ export default { } }; const standNameVerify = async (rule, value, callback) => { - debugger if (value === '' || value === null) { return callback(new Error('请输入企标名称')) } else { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 729f642f2..a07e1dbc5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -1021,16 +1021,14 @@ export default { this.$refs.qbfsForm.validateField('resPersonName'); } }, - validateForm () { - let flag = null + validateForm (callback) { this.$refs['qbfsForm'].validate((valid) => { if (valid) { - flag = true - } else { - flag = false + callback && callback() + } else{ + this.$message.warning("请完善基础信息"); } }) - return flag }, choiceShow(){ this.showType = 'one' diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index a79fc8435..e23dc27c4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -412,16 +412,14 @@ export default { }) }, methods: { - validateForm () { - let flag = null + validateForm (callback) { this.$refs['qbfsForm'].validate((valid) => { if (valid) { - flag = true - } else { - flag = false + callback && callback() + } else{ + this.$message.warning("请完善基础信息"); } }) - return flag }, choiceShow(){ this.getStandDataBtn()