From dcda6be44b44e525785188eca2d123b2da23a348 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Sun, 5 Dec 2021 14:58:52 +0800 Subject: [PATCH 1/5] feat: There is no way the, BUSS PROCESS --- .../pages/components/ProcessMixin.vue | 4 + .../pages/creatProcess/qbrk/step1.vue | 17 +- .../pages/creatProcess/qbrk/step10.vue | 2758 ++++++++++++++++ .../pages/creatProcess/qbrk/step11.vue | 2758 ++++++++++++++++ .../pages/creatProcess/qbrk/step12.vue | 2713 ++++++++++++++++ .../pages/creatProcess/qbrk/step3.vue | 2713 ++++++++++++++++ .../pages/creatProcess/qbrk/step4.vue | 2773 +++++++++++++++++ .../pages/creatProcess/qbrk/step5.vue | 2713 ++++++++++++++++ .../pages/creatProcess/qbrk/step6.vue | 2713 ++++++++++++++++ .../pages/creatProcess/qbrk/step7.vue | 2713 ++++++++++++++++ .../pages/creatProcess/qbrk/step8.vue | 2758 ++++++++++++++++ .../pages/creatProcess/qbrk/step9.vue | 2758 ++++++++++++++++ .../pages/creatProcess/qbrk/stepC3.vue | 2713 ++++++++++++++++ .../pages/creatProcess/qbrk/stepC6.vue | 2713 ++++++++++++++++ .../pages/creatProcess/qbrk/stepDetail.vue | 2713 ++++++++++++++++ .../pages/processDetail/index.vue | 6 + src/router/index.js | 202 +- 17 files changed, 35632 insertions(+), 106 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step10.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step11.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step12.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step3.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step4.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step5.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step6.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step7.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step8.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step9.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index 808fcac93..e3167ef54 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -21,6 +21,10 @@ export default { label: "政策入库流程", value: "laws1" }, + { + label: "企标制修订流程及企业标准库流程", + value: "buss1" + }, { label: "标准征求意见流程", value: "3" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 74786f723..994fa5ce4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1697,6 +1697,11 @@ let mes = JSON.parse(res.mes) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.form = mes.form + this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); + this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); + this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); + this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); + this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); this.roleForm = mes.roleForm this.commentText = mes.commentText }) @@ -2498,16 +2503,10 @@ // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) - _formData.append('prcType', 'laws1') - _formData.append('prcName', '政策入库流程') + _formData.append('prcType', 'buss1') + _formData.append('prcName', '企标制修订流程及企业标准库流程') _formData.append('json', JSON.stringify({ - // prcForm: this.prcForm, - // sarAccessInfoList: this.sarAccessInfoList, - // sarAccessInfoListADMIN: this.sarAccessInfoListADMIN, - // bzqdForm: this.bzqdForm, - // listInfo: this.listInfo, - // id: this.id - taskInfo: '申请人发起', + taskInfo: '发起企标制修订流程', form: this.form, roleForm: this.roleForm, commentText: this.commentText diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue new file mode 100644 index 000000000..0a9274da0 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -0,0 +1,2758 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue new file mode 100644 index 000000000..9635ea314 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -0,0 +1,2758 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue new file mode 100644 index 000000000..acae858f6 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -0,0 +1,2713 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue new file mode 100644 index 000000000..567943f56 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -0,0 +1,2713 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue new file mode 100644 index 000000000..860ad47b4 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -0,0 +1,2773 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue new file mode 100644 index 000000000..e44a9097c --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -0,0 +1,2713 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue new file mode 100644 index 000000000..49028e9ac --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -0,0 +1,2713 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue new file mode 100644 index 000000000..7c855f9a4 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -0,0 +1,2713 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue new file mode 100644 index 000000000..f6be43a03 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -0,0 +1,2758 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue new file mode 100644 index 000000000..25f890753 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -0,0 +1,2758 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue new file mode 100644 index 000000000..5d8f1c6a9 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -0,0 +1,2713 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue new file mode 100644 index 000000000..8c80bb053 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -0,0 +1,2713 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue new file mode 100644 index 000000000..b860db0f0 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue @@ -0,0 +1,2713 @@ + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 586eed8cc..12cd6fc57 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -227,6 +227,12 @@ export default { if (prcType === '1') { // 标准入库流程数据 this.toProcessDetail('bzrkStep5',row) + }else if(prcType === 'laws1'){ + //政策入库 + this.toProcessDetail('zcrkStep5',row) + }else if(prcType === 'buss1'){ + //企标入库 + this.toProcessDetail('bussLibraryDetail',row) }else if(prcType === '4'){ //标准清单发布流程数据 this.toProcessDetail('bzqdfbStep1-4',row) diff --git a/src/router/index.js b/src/router/index.js index 312f8af3b..0b515ab40 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -943,103 +943,111 @@ const routes = [ title: '企标制修订流程及企业标准库流程' } }, - // { - // path: '/bussLibrary3', - // name: 'bussLibrary3', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step3.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // },{ - // path: '/bussLibraryC3', - // name: 'bussLibraryC3', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // },{ - // path: '/bussLibrary4', - // name: 'bussLibrary4', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step4.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // },{ - // path: '/bussLibrary5', - // name: 'bussLibrary5', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step5.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // },{ - // path: '/bussLibrary6', - // name: 'bussLibrary6', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step6.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // },{ - // path: '/bussLibraryC6', - // name: 'bussLibraryC6', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // },{ - // path: '/bussLibrary7', - // name: 'bussLibrary7', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step7.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // },{ - // path: '/bussLibrary8', - // name: 'bussLibrary8', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step8.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // },{ - // path: '/bussLibrary9', - // name: 'bussLibrary9', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step9.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // },{ - // path: '/bussLibrary10', - // name: 'bussLibrary10', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step10.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // },{ - // path: '/bussLibrary11', - // name: 'bussLibrary11', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // },{ - // path: '/bussLibrary12', - // name: 'bussLibrary12', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step12.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // }, + { + path: '/bussLibrary3', + name: 'bussLibrary3', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step3.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + },{ + path: '/bussLibraryC3', + name: 'bussLibraryC3', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + },{ + path: '/bussLibrary4', + name: 'bussLibrary4', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step4.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + },{ + path: '/bussLibrary5', + name: 'bussLibrary5', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step5.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + },{ + path: '/bussLibrary6', + name: 'bussLibrary6', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step6.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + },{ + path: '/bussLibraryC6', + name: 'bussLibraryC6', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + },{ + path: '/bussLibrary7', + name: 'bussLibrary7', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step7.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + },{ + path: '/bussLibrary8', + name: 'bussLibrary8', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step8.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + },{ + path: '/bussLibrary9', + name: 'bussLibrary9', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step9.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + },{ + path: '/bussLibrary10', + name: 'bussLibrary10', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step10.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + },{ + path: '/bussLibrary11', + name: 'bussLibrary11', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + },{ + path: '/bussLibrary12', + name: 'bussLibrary12', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step12.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + },{ + path: '/bussLibraryDetail', + name: 'bussLibraryDetail', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, { path: '/bzdyStep1', name: 'bzdyStep1', From 0f0156e59c32e2f9db7f40acc1e1c612f16b3844 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 5 Dec 2021 15:36:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=9A=E5=90=8E=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue index 898f3592e..15c999546 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -79,7 +79,8 @@ From 9ea988df9679240685b5e30b170fb4f301d08452 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 5 Dec 2021 15:43:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=9A=E5=90=8E=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue index 15c999546..b40521039 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -604,7 +604,7 @@ export default { handleSubmit() { let json = { hh_pageData: this.hh_pageData, - // director: this.roleForm.engineerUserId, + director: this.roleForm.engineerUserId, } this.$refs['hh_pageData'].validate((valid) => { if (valid) { From 5852af38cea16ccf80d25cb27a672524aa86aaad Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 5 Dec 2021 15:47:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=9A=E5=90=8E=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue index b40521039..3936aa516 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -98,7 +98,8 @@ From 30beabfbbb93cf04cb1c2498486c034be52cf8a7 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 5 Dec 2021 15:52:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=9A=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHh-hh/step2.vue | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue index a7e06d66d..aac1c3c67 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue @@ -102,7 +102,7 @@ - +
{ - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('退回成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + passFlag: '0', + commentText: this.commentText, + hh_pageData: this.hh_pageData, } - }) + this.$refs['hh_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('退回成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } }, // 提交按钮 handleSubmit() {