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 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) { 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-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/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index ad5c485f0..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:{ @@ -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 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 @@ - +
审核评分
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 @@ - +
评审评分
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 => {