From 9b7f2bc10441861fa1341f658f52d808b8eaedfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 17 Nov 2021 10:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfz/step1.vue | 14 +- .../pages/creatProcess/qbfz/step2.vue | 28 +- .../pages/creatProcess/qbfz/step3.vue | 16 +- .../pages/creatProcess/qbfz/step4.vue | 622 ++++++++++++++++++ .../tabComponents/processCenter/index.vue | 37 ++ src/router/index.js | 9 + 6 files changed, 706 insertions(+), 20 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbfz/step4.vue diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index 4655f8afd..93f144a02 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -496,7 +496,7 @@ export default { this.getStandDataBtn() this.ListModel = true; }, - //企业标准查询this.standardSearch, + //企业标准查询 getStandDataBtn(){ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ standCode: this.standardSearch.standCode, @@ -570,7 +570,7 @@ export default { _formData.append('prcType', '23') _formData.append('json', JSON.stringify({ roleForm: this.roleForm, - qbfsForm: this.qbfsForm, + qbfsForm: this.standardSearch, commentText: this.commentText })) saveTaskFirst(_formData).then(res => { @@ -589,9 +589,9 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - this.qbfsForm.commentText = this.commentText - var json = Object.assign(this.qbfsForm, this.roleForm) - this.$http.get('lawss/activiti/startProcess', {type: '23'}, { + this.standardSearch.commentText = this.commentText + var json = Object.assign(this.standardSearch, this.roleForm) + this.$http.get('lawss/activiti/startProcess', {type: '24'}, { _this: this }, res => { if (res.ok) { @@ -624,8 +624,8 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - this.qbfsForm.commentText = this.commentText - var json = Object.assign(this.qbfsForm, this.roleForm) + this.standardSearch.commentText = this.commentText + var json = Object.assign(this.standardSearch, this.roleForm) this.$http.post('lawss/activiti/completeTask', { taskIds: res.data, userId : this.$store.getters.userInfo.userId, diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue index 30c7c4a51..e4355ac77 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue @@ -22,18 +22,18 @@ > - + - + @@ -309,11 +309,29 @@ export default { }, //流程驳回 beforeBack(){ - + this.isSubmit = true + this.qbfsForm.passFlag = '1' + this.qbfsForm.commentText = this.commentText + let json = JSON.stringify(this.qbfsForm); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); }, //流程提交 handleSubmit(){ this.isSubmit = true + this.qbfsForm.passFlag = '0' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue index 5a771a8ee..7d09cb7ab 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue @@ -22,18 +22,18 @@ > - + - + @@ -191,14 +191,12 @@ @@ -250,8 +248,8 @@ export default { modalshowflag: false, // drawer开关 loading: false, qbfsForm:{ - entNumber: '', - cnName: '', + standCode: '', + standName: '', enName: '', entCategory: '', replaceNumber: '', @@ -325,6 +323,8 @@ export default { handleSubmit(){ this.isSubmit = true this.qbfsForm.commentText = this.commentText + this.qbfsForm.presentPeople = this.$store.getters.userInfo.userName + this.qbfsForm.presentPeopleId = this.$store.getters.userInfo.userId let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { taskIds: this.$route.query.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue new file mode 100644 index 000000000..7cf58a79f --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue @@ -0,0 +1,622 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 190ceff58..f3a79ea35 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -1570,6 +1570,43 @@ export default { }) } break + case '24': + if (row.taskInfo === '标准法规部部长审核') { + this.$router.push({ + name: 'qbfzStep2', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '会签并填写意见') { + this.$router.push({ + name: 'qbfzStep3', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + // else if(row.taskInfo === '工作组组长审批') { + // this.$router.push({ + // name: 'qbfsStep4', + // query:{ + // taskIds: row.taskIds, + // prcId: row.prcId, + // prcNum: row.prcNum, + // prcName: row.prcName, + // prcType: row.prcType + // } + // }) + // } + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index 78653f5fb..244374c0a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1476,6 +1476,15 @@ const routes = [ title: '企标废止流程' } }, + { + path: '/qbfzStep4', + name: 'qbfzStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfz/step4.vue'), + meta: { + requireAuth: true, + title: '企标废止流程' + } + }, //企标制修订计划管控流程 { path: '/qbzxdjhgkStep1',