From 24b53f939e1caf5e6e56ae4dab9358c6392afbe4 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 2 Mar 2022 09:49:37 +0800 Subject: [PATCH 01/15] commit --- .../processCenter/pages/creatProcess/bzrk/step1.vue | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 014adfead..a4f738e4f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1340,10 +1340,17 @@ + + { this.loadSarStandard = false From f66ed6a1469e76869349ba55d197760ed59e3867 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 2 Mar 2022 10:04:08 +0800 Subject: [PATCH 02/15] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E5=8F=8A=E7=AB=8B=E9=A1=B9?= =?UTF-8?q?=20=E4=BD=93=E7=B3=BB=E7=BB=93=E6=9E=84=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=20=E5=8F=AA=E5=8F=AF=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=8F=8A=E4=BB=A5=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/component/establish.vue | 7 +++++++ .../regulatoryRepository/enterpriseStandardPlan/index.vue | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 45eb119fb..5f9daec62 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -687,6 +687,13 @@ export default { }, TXJGenterDrawer () { let list = this.$refs.TXJGTree.getCheckedNodes() + if(list.length > 0){ + let parenList = list.filter ( item => item.parentId === null || item.parentId === ''); + if (parenList.length > 0) { + this.$message.error('请选择二级及以下目录') + return + } + } let id = '' let name = '' list.map(item => { diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 3b2d7477d..55d748129 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -919,6 +919,13 @@ return; } let list = this.$refs.TXJGTree.getCheckedNodes() + if(list.length > 0){ + let parenList = list.filter ( item => item.parentId === null || item.parentId === ''); + if (parenList.length > 0) { + this.$message.error('请选择二级及以下目录') + return + } + } let id = '' let name = '' list.map(item => { From f5fa85de356ca7c895e295ca28cd7f9986997b93 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 2 Mar 2022 10:23:56 +0800 Subject: [PATCH 03/15] commit --- .../processCenter/pages/creatProcess/bzzqyj/step1-1.vue | 6 ++++-- src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 6d38ecf8d..37634e781 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -667,6 +667,8 @@ export default { } else { mes.form.endTime = '' } + this.addFjList = mes.filesId + this.form.fjListName = mes.filesName this.form = mes.form this.roleForm = mes.roleForm this.commentText1 = mes.commentText1 || '' @@ -831,8 +833,8 @@ export default { if (res.ok) { var json = Object.assign(this.form, this.roleForm) json.commentText = this.commentText1 - json.filesId = this.roleForm.dockUserList - json.filesName = this.roleForm.dockUserListName + json.filesId = this.addFjList + json.filesName = this.form.fjListName this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: res.data, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index c9afb77bb..c709465ca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -838,7 +838,9 @@ export default { json: JSON.stringify({ form: this.form, roleForm: this.roleForm, - commentText1: this.commentText1 + commentText1: this.commentText1, + filesId: this.addFjList, + filesName: this.form.fjListName }) }, {}, res => { if (res.ok) { From 271133c105f3a34a4b2e281d5909d89846096954 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 2 Mar 2022 10:46:21 +0800 Subject: [PATCH 04/15] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A1=E5=88=92=E5=BA=93=E5=B8=A6=E5=85=A5?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E4=BD=93=E7=B3=BB=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index ad5c485f0..fc4e34819 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1959,6 +1959,9 @@ // 起草部门带入 this.form.QCDW = this.filterDate(this.standardCheckedList[0].unitName) this.form.QCDWID = this.filterDate(this.standardCheckedList[0].unit) + this.form.TXLBBUSS = this.filterDate(this.standardCheckedList[0].tsJsonName) + this.form.menuId = this.filterDate(this.standardCheckedList[0].tsJson) + this.form.treeType = 'sarMs' this.standardDrawer = false this.verifySarStandard = true this.planDisabled = false From f2fd143deacdd58faa64ed6a2eed2ac34c183aaa Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 2 Mar 2022 13:51:36 +0800 Subject: [PATCH 05/15] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=90=8D=E7=A7=B0=E5=92=8C=20=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=90=8D=E7=A7=B0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfs/step1.vue | 22 ++++-- .../pages/creatProcess/qbfs/step2.vue | 2 +- .../pages/creatProcess/qbfs/step3.vue | 2 +- .../pages/creatProcess/qbfs/step4.vue | 2 +- .../pages/creatProcess/qbfs/step5.vue | 2 +- .../pages/creatProcess/qbrk-product/step1.vue | 78 ++++++++----------- .../pages/creatProcess/qbrk-product/step2.vue | 2 +- .../pages/creatProcess/qbrk-product/step3.vue | 2 +- .../pages/creatProcess/qbrk-product/step4.vue | 2 +- .../pages/creatProcess/qbrk-product/step5.vue | 2 +- .../pages/creatProcess/qbrk-product/step6.vue | 2 +- .../pages/creatProcess/qbrk-product/step7.vue | 2 +- .../pages/creatProcess/qbrk/step1.vue | 54 ++++++------- .../pages/creatProcess/qbrk/step12.vue | 2 +- .../pages/creatProcess/qbrk/step2.vue | 2 +- .../pages/creatProcess/qbrk/step3.vue | 2 +- .../pages/creatProcess/qbrk/step4.vue | 2 +- .../pages/creatProcess/qbrk/step5.vue | 2 +- .../pages/creatProcess/qbrk/step6.vue | 2 +- .../pages/creatProcess/qbrk/step7.vue | 2 +- .../pages/creatProcess/qbrk/step8.vue | 2 +- .../pages/creatProcess/qbrk/step9.vue | 2 +- 22 files changed, 97 insertions(+), 95 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index dbdccd5d2..540247401 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -3,7 +3,7 @@
- +
基础信息
@@ -253,19 +253,31 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - + -

流程发起人

+

标准法规工程师

-
- + + + +

标准法规工程师

+
+ + +
+ + + +

标准法规部高级经理

diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue index f06686b77..223158785 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index 8cd1589de..f56f1d578 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue index 44e200076..05f693a4a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue index 1da04c431..853687fc8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 59412f9f8..1538497b8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -66,7 +66,7 @@ - + - + -

流程发起人

+

标准起草人

- +
- +

其他起草人

@@ -540,12 +540,12 @@ - + -

企标编写汇总修订人

+

标准起草人

- +
@@ -553,29 +553,29 @@ -

总院各中心兼职标准化员/各事业部标准化员

+

标准法规工程师/事业部标准化员

- +
- + -

会签征求意见人员

+

各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT

- +
- + -

意见汇总及标准修改人员

+

标准起草人

- +
@@ -583,9 +583,9 @@ -

总院标准法规部产品标准工程师/各事业部标准法规部人员

+

标准法规工程师

- +
@@ -593,9 +593,9 @@ -

总院:项目总工、标准法规部高级经理/各事业部:整车所产品经理、标准业务/认证业务经理

+

总院项目总工、标准法规部高级经理/各事业部整车所产品经理、各事业部标准业务经理

- +
@@ -613,9 +613,9 @@ -

总院:产品工程经理、技术管理中心主任/各事业部:技术中心主任、主管标准业务高级经理

+

产品工程经理、技术管理中心主任/事业部技术中心主任、标准法规部高级经理

- +
@@ -633,9 +633,9 @@ -

总院平台总监/各事业部研发副总裁

+

总院项目经理/事业部研发副总裁

- +
@@ -643,9 +643,9 @@ -

总院:标准法规部产品标准工程师;各事业部:各事业部标准化员

+

标准法规工程师

- +
@@ -1385,34 +1385,25 @@ { required: true, message: '选择其他起草人', trigger: 'blur' }, ], bussUser4Name: [ - { required: true, message: '选择总院各中心兼职标准化员/各事业部标准化员', trigger: 'blur' }, + { required: true, message: '选择标准法规工程师/事业部标准化员', trigger: 'blur' }, ], bussUser5Name: [ - { required: true, message: '选择会签征求意见人员', trigger: 'blur' }, + { required: true, message: '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT', trigger: 'blur' }, ], bussUser7Name: [ - { required: true, message: '选择总院标准法规部产品标准工程师/各事业部标准法规部人员', trigger: 'blur' }, + { required: true, message: '选择标准法规工程师', trigger: 'blur' }, ], bussUser8Name: [ - { required: true, message: '选择总院项目总工/各事业部整车所产品经理', trigger: 'blur' }, - ], - bussUser9Name: [ - { required: true, message: '选择标总院标准法规部高级经理/各事业部标准业务/认证业务经理', trigger: 'blur' }, + { required: true, message: '选择总院项目总工、标准法规部高级经理/各事业部整车所产品经理、各事业部标准业务经理', trigger: 'blur' }, ], bussUser10Name: [ - { required: true, message: '选择总院标准法规部高级经理/各事业部标准业务/认证业务经理', trigger: 'blur' }, - ], - bussUser11Name: [ - { required: true, message: '选择总院技术管理中心主任/各事业部主管标准业务高级经理', trigger: 'blur' }, + { required: true, message: '选择产品工程经理、技术管理中心主任/事业部技术中心主任、标准法规部高级经理', trigger: 'blur' }, ], bussUser12Name: [ - { required: true, message: '选择总院平台总监/各事业部研发副总裁', trigger: 'blur' }, + { required: true, message: '选择总院项目经理/事业部研发副总裁', trigger: 'blur' }, ], bussUser13Name: [ - { required: true, message: '选择总院标准法规部产品标准工程师/各事业部标准化员', trigger: 'blur' }, - ], - bussUser14Name: [ - { required: true, message: '选择抄送人员', trigger: 'blur' }, + { required: true, message: '选择标准法规工程师', trigger: 'blur' }, ], }, rules:{ @@ -1437,7 +1428,6 @@ ], standYear: [ { required: false, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue index 35e6d9385..7eda64c68 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -2,7 +2,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index f6db759c5..62ee2a02a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -2,7 +2,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue index e3cf7f36c..6519cf072 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue @@ -2,7 +2,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index a384e2e61..ad360086c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -2,7 +2,7 @@ - +
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 494a07e94..70214b014 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -2,7 +2,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue index 20dfa2499..750ac8708 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -2,7 +2,7 @@ - +
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index fc4e34819..3bd9a2108 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -522,17 +522,17 @@ :model="roleForm" :rules="roleRules" class="label-input-form"> - + -

流程发起人

+

标准起草人

- +
- +

其他起草人

@@ -542,12 +542,12 @@ - + -

企标编写汇总修订人

+

标准起草人

- +
@@ -562,32 +562,32 @@ - + -

会签征求意见人员

+

张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师

- +
- + -

技术委员会评审/评审意见修改人员

+

标准起草人

- +
- + -

标准法规部标准化工程师

+

标准法规工程师

- +
@@ -625,9 +625,9 @@ -

总院院长或总院主管副院长

+

总院技术委员会覆盖领域企业标准：专委会主任；总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长

- +
@@ -635,9 +635,9 @@ -

主起草人培训

+

标准起草人

- +
@@ -645,9 +645,9 @@ -

标准法规部标准化工程师发布人员

+

标准法规工程师

- +
@@ -1445,10 +1445,10 @@ { required: true, message: '选择总院各中心兼职标准化员/各事业部标准化员', trigger: 'blur' }, ], hqUserName: [ - { required: true, message: '选择会签征求意见人员', trigger: 'blur' }, + { required: true, message: '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', trigger: 'blur' }, ], fggcsUserName: [ - { required: true, message: '选择标准法规部标准化工程师', trigger: 'blur' }, + { required: true, message: '选择标准法规工程师', trigger: 'blur' }, ], jsfzrUserName: [ { required: true, message: '选择起草单位高级经理', trigger: 'blur' }, @@ -1460,10 +1460,10 @@ { required: true, message: '选择起草单位中心主任', trigger: 'blur' }, ], zhrUserName: [ - { required: true, message: '选择总院院长或总院主管副院长', trigger: 'blur' }, + { required: true, message: '选择总院技术委员会覆盖领域企业标准：专委会主任；总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', trigger: 'blur' }, ], fbUserName: [ - { required: true, message: '选择标准法规部标准化工程师发布人员', trigger: 'blur' }, + { required: true, message: '选择标准法规工程师', trigger: 'blur' }, ], }, rules:{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 59ab2a1d8..57de6e483 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -2,7 +2,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index 8381c1378..af6abd92a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -2,7 +2,7 @@ - +
历史评分
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index e4351f94b..a3148c492 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -2,7 +2,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 4dee872dd..65ad1999a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -2,7 +2,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index c9e76c0c3..228192f4d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -2,7 +2,7 @@ - +
会签评分
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 9b42efa4a..926b23b9c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -2,7 +2,7 @@ - +
评审评分
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index c20a98774..2902ac631 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -2,7 +2,7 @@ - +
复审评分
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index b5e4918bd..172e58ac8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -2,7 +2,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index b92db31c2..687fea355 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -2,7 +2,7 @@ - +
审核评分
From f250b019e50d7eefd74de9a1808acb1285d98644 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 2 Mar 2022 14:02:45 +0800 Subject: [PATCH 06/15] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=90=8D=E7=A7=B0=E5=92=8C=20=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=90=8D=E7=A7=B0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbrk-product/stepC3.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/stepC6.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 6a47f0788..648a1be81 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -2,7 +2,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 93b3c4650..4328a5282 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -2,7 +2,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index 027e95360..545fb0606 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -2,7 +2,7 @@ - +
历史评分
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 2546c3083..319541f1c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -2,7 +2,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index c677815a6..502860387 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -2,7 +2,7 @@ - +
评审评分
From 64797caf9b90d4ef0a770168b2b2d7ec66408df4 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 2 Mar 2022 14:19:21 +0800 Subject: [PATCH 07/15] =?UTF-8?q?qbzxdlx=20=E6=A8=A1=E6=9D=BF=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 257716245..c7e7fd021 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -869,13 +869,14 @@ export default { //IE浏览器、微软浏览器 /* 经过测试，微软浏览器Microsoft Edge下载文件时必须要重命名文件才可以打开， IE可不重命名，以防万一，所以都写上比较好 */ - window.navigator.msSaveBlob(blob, '立项.xls'); + window.navigator.msSaveBlob(blob, '企标制修订立项计划模板.xls'); } else { //其他浏览器 let link = document.createElement('a'); // 创建a标签 link.style.display = 'none'; let objectUrl = URL.createObjectURL(blob); link.href = objectUrl; + link.download = '企标制修订立项计划模板.xls'; link.click(); URL.revokeObjectURL(objectUrl); } From 4ec5907eda5789d7f796f895e4482b4316041a51 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 2 Mar 2022 14:36:44 +0800 Subject: [PATCH 08/15] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=B5=B7=E5=A4=96=E7=BB=93=E6=9E=84=E6=A0=91=20=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 57b666258..dcf8d2bd4 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3160,7 +3160,11 @@ export default { }, treeClick(treeNode) { this.selectSarMenu = treeNode + this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询 + this.sarStandardsSearch.treeType = treeNode.treeType + this.sarStandardsSearch.page = 1 this.standCommonlySearch.menuId = treeNode.id + this.standCommonlySearch.treeType = treeNode.treeType this.standCommonlySearch.page = 1 this.getDomesticStandardTable() }, @@ -3899,9 +3903,12 @@ export default { } const formData = {...data} if (!item) { - formData.menuId = this.selectSarMenu.id - } else { formData.menuId = this.standCommonlySearch.menuId + formData.treeType = this.standCommonlySearch.treeType + } else { + console.log(this.selectSarMenu) + formData.menuId = this.selectSarMenu.id + formData.treeType = this.selectSarMenu.treeType } formData.nowOrderBy = this.nowOrder ? this.orderBy : '' formData.nowOrder = this.nowOrder From f20087bd4114fc883b1f3de0b1f07715fce3a23a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 2 Mar 2022 14:37:48 +0800 Subject: [PATCH 09/15] feat: There is no way the, --- .../foreignStandardsAndRegulations/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index dcf8d2bd4..26c9fffeb 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3906,7 +3906,6 @@ export default { formData.menuId = this.standCommonlySearch.menuId formData.treeType = this.standCommonlySearch.treeType } else { - console.log(this.selectSarMenu) formData.menuId = this.selectSarMenu.id formData.treeType = this.selectSarMenu.treeType } From b9f45d2691a427389bb23e259d2de0f3e15d193e 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, 2 Mar 2022 16:05:35 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=B7=B3=E8=BD=AC=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1-5.vue | 2 +- .../processCenter/pages/creatProcess/xmpg/step4.vue | 2 +- .../processCenter/pages/creatProcess/xmpg/step5.vue | 2 +- .../nonConfomity/pages/rectificationDatabase.vue | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue index 476cff1d8..f33135d35 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue @@ -359,7 +359,7 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.standId, + id: item.key || item.standId, pageType: "INLAND_STAND" } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 59291d9f0..385cc43ac 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -373,7 +373,7 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.standId, + id: item.key || item.standId, pageType: "INLAND_STAND" } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 9058c3e8f..eb6d8fee4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -370,7 +370,7 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.standId, + id: item.key || item.standId, pageType: "INLAND_STAND" } }); diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index e8e282650..10773727f 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -185,7 +185,7 @@ + label="整改完成时间"> @@ -261,7 +261,7 @@
{{ historySeeForm.qaEngineer }}
 - +
{{ historySeeForm.planCloseTime ? historySeeForm.planCloseTime.substring(0, 11) : "-" }}
@@ -530,12 +530,12 @@ @click.native="choiceMore('qaEngineer','选择质量工程师',addForm.qaEngineer)" /> - @@ -775,7 +775,7 @@ export default { dutyEngineer: "", //责任工程师 authEngineer: "", //认证工程师 qaEngineer: "", //质量工程师 - planCloseTime: "" //计划关闭时间 + planCloseTime: "" //整改完成时间 }, //表单数据 formRules: { standSerialNumber: [ @@ -812,7 +812,7 @@ export default { { required: true, message: "请输入责任工程师", trigger: "change" } ], planCloseTime: [ - { required: true, message: "请选择计划关闭时间", trigger: "change" } + { required: true, message: "请选择整改完成时间", trigger: "change" } ] }, drawerTable: false, //表单模态窗 From dfe3b3b314f5d8a5175ae637c03c54341a6897a1 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 2 Mar 2022 16:45:39 +0800 Subject: [PATCH 11/15] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=20=E6=96=B0=E5=A4=8D=E5=AE=A1=20=E3=80=81?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E3=80=81=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86?= =?UTF-8?q?=20=E8=8A=82=E7=82=B9=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 10 +- .../pages/components/ProcessMixin.vue | 2 +- .../pages/creatProcess/qbfs/stepC4.vue | 791 ++++++++++++++++++ .../tabComponents/newProcess/index.vue | 4 +- .../tabComponents/processCenter/index.vue | 10 +- .../tabComponents/taskDraft/index.vue | 87 +- src/router/index.js | 9 + 7 files changed, 884 insertions(+), 29 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 01b160c62..dfaefd9c5 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -420,7 +420,7 @@ export default { } break; case 'buss3': - if (row.taskInfo === '对接人选择复审人') { + if (row.taskInfo === '选择复审人') { this.$router.push({ name: 'qbfsStepSub1', query: { @@ -431,7 +431,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '复审人选择复审结果'){ + }else if (row.taskInfo === '复审'){ this.$router.push({ name: 'qbfsStepSub2', query: { @@ -442,7 +442,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '发起人汇总结果'){ + }else if (row.taskInfo === '汇总'){ this.$router.push({ name: 'bussFs2', query: { @@ -453,7 +453,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新发起人汇总结果'){ + }else if (row.taskInfo === '重新汇总'){ this.$router.push({ name: 'bussFsC2', query: { @@ -464,7 +464,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '标准法规部高级经理批准'){ + }else if (row.taskInfo === '批准'){ this.$router.push({ name: 'bussFs3', query: { diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index 4d5c3e846..e08585b67 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -126,7 +126,7 @@ export default { methods: { getPrcNameFilter(row){ if(row && row.prcType === 'buss3'){ - return row.prcName + '-' + row.taskInfo + return row.prcName }else { return row.prcName } diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue new file mode 100644 index 000000000..cfd0dd576 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue @@ -0,0 +1,791 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index 2f00bbe89..f8ceee7e6 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -220,7 +220,7 @@
- +
@@ -250,7 +250,7 @@
- +
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index d81453389..72d6a2514 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -659,7 +659,7 @@ export default { } break; case 'buss3': - if (row.taskInfo === '对接人选择复审人') { + if (row.taskInfo === '选择复审人') { this.$router.push({ name: 'qbfsStepSub1', query: { @@ -670,7 +670,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '复审人选择复审结果'){ + }else if (row.taskInfo === '复审'){ this.$router.push({ name: 'qbfsStepSub2', query: { @@ -681,7 +681,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '发起人汇总结果'){ + }else if (row.taskInfo === '汇总'){ this.$router.push({ name: 'bussFs2', query: { @@ -692,7 +692,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新发起人汇总结果'){ + }else if (row.taskInfo === '重新汇总'){ this.$router.push({ name: 'bussFsC2', query: { @@ -703,7 +703,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '标准法规部高级经理批准'){ + }else if (row.taskInfo === '批准'){ this.$router.push({ name: 'bussFs3', query: { diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 72d2e093e..df3f08c18 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -292,7 +292,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '发起企标制修订流程'){ + }else if (mes.taskInfo === '起草'){ this.$router.push({ name: 'bussLibrary1', query: { @@ -302,7 +302,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '重新发起企标制修订-技术标准流程'){ + }else if (mes.taskInfo === '重新起草'){ this.$router.push({ name: 'bussLibraryC1', query: { @@ -312,7 +312,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '企标编写汇总修订'){ + }else if (mes.taskInfo === '企标编写汇总'){ this.$router.push({ name: 'bussLibrary3', query: { @@ -323,7 +323,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '标准化员初审'){ + }else if (mes.taskInfo === '标准化初审'){ this.$router.push({ name: 'bussLibrary4', query: { @@ -333,7 +333,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '重新企标编写汇总修订'){ + }else if (mes.taskInfo === '重新企标编写汇总'){ this.$router.push({ name: 'bussLibraryC3', query: { @@ -344,7 +344,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '会签征求意见'){ + }else if (mes.taskInfo === '征求意见'){ this.$router.push({ name: 'bussLibrary5', query: { @@ -355,7 +355,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '技术委员会评审/评审意见修改评审'){ + }else if (mes.taskInfo === '技术委员会评审、评审意见修改'){ this.$router.push({ name: 'bussLibrary6', query: { @@ -366,7 +366,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '复审'){ + }else if (mes.taskInfo === '标准化复审'){ this.$router.push({ name: 'bussLibrary7', query: { @@ -377,7 +377,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '重新技术委员会评审/评审意见修改评审'){ + }else if (mes.taskInfo === '重新技术委员会评审、评审意见修改'){ this.$router.push({ name: 'bussLibraryC6', query: { @@ -430,7 +430,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '培训'){ + }else if (mes.taskInfo === '主起草人培训'){ this.$router.push({ name: 'bussLibrary12', query: { @@ -458,7 +458,7 @@ export default { name: 'bussLibrary1', query: { type: 'buss1', - processName: '发起企标制修订流程', + processName: '起草', bpnId: id, verifySarStandard: true, } @@ -477,7 +477,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '发起企标制修订流程'){ + }else if (mes.taskInfo === '起草'){ this.$router.push({ name: 'bussLibraryProduct1', query: { @@ -487,7 +487,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '企标编写汇总修订'){ + }else if (mes.taskInfo === '企标编写汇总'){ this.$router.push({ name: 'bussLibraryProduct3', query: { @@ -497,7 +497,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '重新企标编写汇总修订'){ + }else if (mes.taskInfo === '重新企标编写汇总'){ this.$router.push({ name: 'bussLibraryProductC3', query: { @@ -507,7 +507,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '会签征求意见'){ + }else if (mes.taskInfo === '征求意见'){ this.$router.push({ name: 'bussLibraryProduct5', query: { @@ -553,13 +553,68 @@ export default { name: 'bussLibraryProduct1', query: { type: 'buss2', - processName: '发起企标制修订流程', + processName: '起草', bpnId: id, verifySarStandard: true, } }) } break + case 'buss3': + if(mes !== null && mes.taskInfo !== null) { + if (mes.taskInfo === '起草'){ + this.$router.push({ + name: 'bussLibraryProduct1', + query: { + type: 'buss3', + processName: mes.taskInfo, + bpnId: id, + verifySarStandard: true, + } + }) + }else if (mes.taskInfo === '汇总'){ + this.$router.push({ + name: 'bussFs2', + query: { + type: 'buss3', + processName: mes.taskInfo, + bpnId: id, + verifySarStandard: true, + } + }) + }else if (mes.taskInfo === '重新汇总'){ + this.$router.push({ + name: 'bussFsC2', + query: { + type: 'buss3', + processName: mes.taskInfo, + bpnId: id, + verifySarStandard: true, + } + }) + }else if (mes.taskInfo === '复审'){ + this.$router.push({ + name: 'qbfsStepSub2', + query: { + type: 'buss3', + processName: mes.taskInfo, + bpnId: id, + verifySarStandard: true, + } + }) + } + }else { + this.$router.push({ + name: 'qbfsStep1', + query: { + type: 'buss3', + processName: '起草', + bpnId: id, + verifySarStandard: true, + } + }) + } + break // 法规入库及评估流程 case '2': this.$router.push({ diff --git a/src/router/index.js b/src/router/index.js index c3225a014..fc6b23981 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1991,6 +1991,15 @@ const routes = [ title: '企标复审流程' } }, + { + path: '/bussFsC2', + name: 'bussFsC2', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue'), + meta: { + requireAuth: true, + title: '企标复审流程' + } + }, { path: '/bussFs3', name: 'bussFs3', From e0549c104cf55adb9d201f75f280557219e74e81 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, 2 Mar 2022 16:58:47 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1.vue | 77 ++++++++++++++++++- 1 file changed, 74 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 984da41a7..97e265f79 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -244,6 +244,41 @@
+ + + + + + + + + + + + + + + + + + { + res.data.managementHostList.forEach(item => { + if (item) { + this.managementHostName.push(item); //管理主体 + } + }); + res.data.developmentHostList.forEach(item => { + if (item) { + this.developmentHostName.push(item); //开发主体 + } + }); + res.data.categoryList.forEach(item => { + if (item) { + this.categoryName.push(item); //项目细分类 + } + }); + }); + }, fileTypeChange(type){ this.fileType = type let ids = []; @@ -562,7 +629,10 @@ export default { clearSearch() { this.projectSearch = { projectName: "", - projectNumber: "" + projectNumber: "", + managementHostName: "", //管理主体 + developmentHostName: "", //开发主体 + categoryName: "" //项目细分类 }; this.getProjectData(); }, @@ -646,7 +716,7 @@ export default { this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, current: this.pageNo, - PageSize: this.pageSizeNo + PageSize: this.pageSizeNo, }, { _this: this }, res => { @@ -852,6 +922,7 @@ export default { }, }, mounted() { + this.optionsChange() this.bpnId = this.$route.query.bpnId if (this.bpnId !== undefined) { this.getData() From 4b81c0a3bed750cbf3fac5ae8dc14c23af38193a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 2 Mar 2022 17:03:57 +0800 Subject: [PATCH 13/15] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=20=E4=BA=A7=E5=93=81=20=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 30 +++++++++---------- .../tabComponents/processCenter/index.vue | 30 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index dfaefd9c5..688bac9c7 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -117,7 +117,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '企标编写汇总修订'){ + }else if (row.taskInfo === '企标编写汇总'){ this.$router.push({ name: 'bussLibrary3', query: { @@ -128,7 +128,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新发起企标制修订-技术标准流程'){ + }else if (row.taskInfo === '重新起草'){ this.$router.push({ name: 'bussLibraryC1', query: { @@ -139,7 +139,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '标准化员初审'){ + }else if (row.taskInfo === '标准化初审'){ this.$router.push({ name: 'bussLibrary4', query: { @@ -150,7 +150,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新企标汇总修订'){ + }else if (row.taskInfo === '重新企标编写汇总'){ this.$router.push({ name: 'bussLibraryC3', query: { @@ -161,7 +161,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '会签征求意见'){ + }else if (row.taskInfo === '征求意见'){ this.$router.push({ name: 'bussLibrary5', query: { @@ -172,7 +172,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '技术委员会评审/评审意见修改评审'){ + }else if (row.taskInfo === '技术委员会评审、评审意见修改'){ this.$router.push({ name: 'bussLibrary6', query: { @@ -183,7 +183,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '复审'){ + }else if (row.taskInfo === '标准化复审'){ this.$router.push({ name: 'bussLibrary7', query: { @@ -194,7 +194,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新技术委员会评审/评审意见修改评审'){ + }else if (row.taskInfo === '重新技术委员会评审、评审意见修改'){ this.$router.push({ name: 'bussLibraryC6', query: { @@ -249,7 +249,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '培训'){ + }else if (row.taskInfo === '主起草人培训'){ this.$router.push({ name: 'bussLibrary12', query: { @@ -285,7 +285,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '企标编写汇总修订'){ + }else if (row.taskInfo === '企标编写汇总'){ this.$router.push({ name: 'bussLibraryProduct3', query: { @@ -296,7 +296,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新企标编写汇总修订'){ + }else if (row.taskInfo === '重新企标编写汇总'){ this.$router.push({ name: 'bussLibraryProductC3', query: { @@ -307,7 +307,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '标准化员初审'){ + }else if (row.taskInfo === '标准化初审'){ this.$router.push({ name: 'bussLibraryProduct4', query: { @@ -318,7 +318,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '会签征求意见'){ + }else if (row.taskInfo === '征求意见'){ this.$router.push({ name: 'bussLibraryProduct5', query: { @@ -329,7 +329,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '意见汇总及标准修改'){ + }else if (row.taskInfo === '意见汇总修订'){ this.$router.push({ name: 'bussLibraryProduct6', query: { @@ -340,7 +340,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新意见汇总及标准修改'){ + }else if (row.taskInfo === '重新意见汇总修订'){ this.$router.push({ name: 'bussLibraryProductC6', query: { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 72d6a2514..657e41a15 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -331,7 +331,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '企标编写汇总修订'){ + }else if (row.taskInfo === '企标编写汇总'){ this.$router.push({ name: 'bussLibrary3', query: { @@ -342,7 +342,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新发起企标制修订-技术标准流程'){ + }else if (row.taskInfo === '重新起草'){ this.$router.push({ name: 'bussLibraryC1', query: { @@ -353,7 +353,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '标准化员初审'){ + }else if (row.taskInfo === '标准化初审'){ this.$router.push({ name: 'bussLibrary4', query: { @@ -364,7 +364,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新企标编写汇总修订'){ + }else if (row.taskInfo === '重新企标编写汇总'){ this.$router.push({ name: 'bussLibraryC3', query: { @@ -375,7 +375,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '会签征求意见'){ + }else if (row.taskInfo === '征求意见'){ this.$router.push({ name: 'bussLibrary5', query: { @@ -386,7 +386,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '技术委员会评审/评审意见修改评审'){ + }else if (row.taskInfo === '技术委员会评审、评审意见修改'){ this.$router.push({ name: 'bussLibrary6', query: { @@ -397,7 +397,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '复审'){ + }else if (row.taskInfo === '标准化复审'){ this.$router.push({ name: 'bussLibrary7', query: { @@ -408,7 +408,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新技术委员会评审/评审意见修改评审'){ + }else if (row.taskInfo === '重新技术委员会评审、评审意见修改'){ this.$router.push({ name: 'bussLibraryC6', query: { @@ -463,7 +463,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '培训'){ + }else if (row.taskInfo === '主起草人培训'){ this.$router.push({ name: 'bussLibrary12', query: { @@ -524,7 +524,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '企标编写汇总修订'){ + }else if (row.taskInfo === '企标编写汇总'){ this.$router.push({ name: 'bussLibraryProduct3', query: { @@ -535,7 +535,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新企标编写汇总修订'){ + }else if (row.taskInfo === '重新企标编写汇总'){ this.$router.push({ name: 'bussLibraryProductC3', query: { @@ -546,7 +546,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '标准化员初审'){ + }else if (row.taskInfo === '标准化初审'){ this.$router.push({ name: 'bussLibraryProduct4', query: { @@ -557,7 +557,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '会签征求意见'){ + }else if (row.taskInfo === '征求意见'){ this.$router.push({ name: 'bussLibraryProduct5', query: { @@ -568,7 +568,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '意见汇总及标准修改'){ + }else if (row.taskInfo === '意见汇总修订'){ this.$router.push({ name: 'bussLibraryProduct6', query: { @@ -579,7 +579,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新意见汇总及标准修改'){ + }else if (row.taskInfo === '重新意见汇总修订'){ this.$router.push({ name: 'bussLibraryProductC6', query: { From 8c2f7a9a35a05af43550e227a3177ee7e28dc346 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 2 Mar 2022 17:16:36 +0800 Subject: [PATCH 14/15] feat: There is no way the, --- .../processCenter/pages/creatProcess/qbrk-product/step5.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step5.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index ad360086c..fce646c29 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -2,7 +2,7 @@ - +
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 228192f4d..817e57427 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -2,7 +2,7 @@ - +
会签评分
From 5df597dd550ca65ee97820f24ba62aaa7a951a70 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 2 Mar 2022 17:20:27 +0800 Subject: [PATCH 15/15] commit --- .../processCenter/pages/creatProcess/bzzqyj/step1-9.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index e4d758d0c..f5791462e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -381,9 +381,7 @@ export default { this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] data.info.forEach(item => { - if (item.state != '3') { - arr.push(item) - } + arr.push(item) }) this.json = data this.form.textType = data.textType || data.form.textType