diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index c077f5604..06705c639 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -40,11 +40,25 @@ > - + + + + + + placeholder="请选择" + filterable + > + + + 标准/政策法规工程师
- +
@@ -627,21 +641,21 @@ export default { }, formRules: { listType: [ - { required: true, message: "请选择清单类型", trigger: "blur" } + { required: true, message: "请选择清单类型", trigger: "change" } ], listName: [ { required: true, message: "请填写清单名称", trigger: "change" } ] }, roleFormRules: { - // dockUserName: [ - // { required: true, message: "请选择会签责任人", trigger: "blur" } - // ], + dockUserName: [ + { required: true, message: "请选择会签责任人", trigger: "change" } + ], ministerUserName: [ - { required: true, message: "请选择修订责任人", trigger: "blur" } + { required: true, message: "请选择修订责任人", trigger: "change" } ], directorUserName: [ - { required: true, message: "请选择审批责任人", trigger: "blur" } + { required: true, message: "请选择审批责任人", trigger: "change" } ] }, dataList: [],//清单里的标准数据 @@ -842,7 +856,8 @@ export default { }, //提交事件 handleSubmit() { - let json = this.listForm; + // let json = this.listForm; + let json = Object.assign(this.listForm, this.roleForm) json.zrUserId = this.$store.getters.userInfo.userId; json.jlUserId = this.$store.getters.userInfo.userId; // (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;) @@ -958,7 +973,6 @@ export default { res.data=[] } this.dataList = res.data; - console.log(res.data); this.listForm.dataList = res.data; let formId = [] this.dataList.map(item => { @@ -979,7 +993,6 @@ export default { for (let i = 0; i < data.length; i++) { this.selectedList.push(data[i].id); } - console.log(this.selectedList); }, //标准表格选择框改变 selectStandChange(data) { @@ -1024,18 +1037,18 @@ export default { }, computed: {}, mounted() { + //从数据库中查询下拉框数据 + this.$http.get("sys/dictype/getDicTypeListCode", {}, { + _this: this + }, res => { + this.countryOptions = res.data.COUNTRY; + }); this.selectionList(); this.selectSign(); this.getTree(); for (let i = 0; i < this.dataList.length; i++) { this.standMap.set(this.dataList[i].id, this.dataList[i]); } - //从数据查询下拉框数据 - this.$http.get("sys/dictype/getDicTypeListCode", "", { - _this: this - }, res => { - this.countryOptions = res.data.COUNTRY; - }); } }; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index b89020428..4060b6cbf 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -113,13 +113,13 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准法规工程师

- +
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 6b19abc68..1062dcb4d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -328,7 +328,6 @@ export default { implementer: "" }, choiceForm: {}, //选择标准清单列表 - countryOptions: [], //适用区域下拉框数据 user1: "", user2: "", user3: "", diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index 8d126d1f9..b7ef99fb3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -428,17 +428,19 @@ export default { * @description: 动态表单读取 */ getFormFieldList (item) { - console.log(item.dataList); + console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm['id'] = item.id - this.dataList = item.dataList + this.dataList = item.step3DTOS + this.listForm.standName = item.step3DTOS[0].standName + this.listForm.standNumber = item.step3DTOS[0].standNumber + this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer + this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer }) }, - - //驳回事件 beforeBack () { this.listForm.fenFlag = '2' diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 5d55a3700..9a77a42cf 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -518,17 +518,17 @@ export default { prcType: row.prcType } }) - // }else if(row.taskInfo === '标准法规部领导审核'){ - // this.$router.push({ - // name: 'xmpgStep6', - // query: { - // taskIds: row.taskIds, - // prcId: row.prcId, - // prcNum: row.prcNum, - // prcName: row.prcName, - // prcType: row.prcType - // } - // }) + }else if(row.taskInfo === '汇总审核'){ + this.$router.push({ + name: 'xmpgStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) }else if(row.taskInfo === '标准法规部领导审核'){ this.$router.push({ name: 'xmpgStep7', diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 939b755e1..db8cb5e14 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -208,6 +208,7 @@