diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index af4ab5d56..1aa12e4be 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -344,10 +344,10 @@ -

技术委员会常务副主任/总院院长

+

业务主管副院长

- +
@@ -356,10 +356,10 @@ -

总院技术委员会主任

+

院长

- +
@@ -526,8 +526,8 @@ export default { startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}], leaderUser: [{required: true, message: "请选择标准法规部主管领导", trigger: ['blur', 'change']}], feeUser: [{required: true, message: "请选择费用管理部门人员", trigger: ['blur', 'change']}], - engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}], - directorUserName: [{required: true, message: "请选择总院技术委员会主任", trigger: ['blur', 'change']}], + engineerUser: [{required: true, message: "请选择业务主管副院长 ", trigger: ['blur', 'change']}], + directorUserName: [{required: true, message: "请选择院长", trigger: ['blur', 'change']}], }, roleShowflag: false, roleShowflagOne: false, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 15dcc3a27..77a5e0115 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -18,21 +18,21 @@ - + - + - + - + - + @@ -263,7 +263,7 @@ -

管理推荐部

+

管理推进部

@@ -275,10 +275,10 @@ -

技术委员会常务副主任/总院院长

+

业务主管副院长

- +
@@ -287,10 +287,10 @@ -

技术委员会主任

+

院长

- +
@@ -414,7 +414,13 @@ export default { // 上传所储存文件数组 newDataList: [], - ch_rules: {}, + ch_rules: { + meetingName: [{required: true, message: '请输入会议名称', trigger: 'change'}], + primaryUnit: [{required: true, message: '请输入主办单位', trigger: 'change'}], + associaName: [{required: true, message: '请选择协会名称', trigger: 'change'}], + meetingStartTime: [{required: true, message: '请选择会议时间', trigger: 'change'}], + meetingPlace: [{required: true, message: '请输入会议地点', trigger: 'change'}] + }, roleForm: { startUserName: this.$store.getters.userInfo.userName, startUser: this.$store.getters.userInfo.userId, @@ -433,9 +439,9 @@ export default { dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}], startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}], leaderUser: [{required: true, message: "请选择标准法规部主管中心主任", trigger: ['blur', 'change']}], - feeUser: [{required: true, message: "请选择管理推荐部", trigger: ['blur', 'change']}], - engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}], - directorUserName: [{required: true, message: "请选择技术委员会主任", trigger: ['blur', 'change']}], + feeUser: [{required: true, message: "请选择管理推进部", trigger: ['blur', 'change']}], + engineerUser: [{required: true, message: "请选择业务主管副院长 ", trigger: ['blur', 'change']}], + directorUserName: [{required: true, message: "请选择院长", trigger: ['blur', 'change']}], }, deleteDataList: [], diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index c87d4a2c4..d06c3cdc8 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -282,7 +282,6 @@ export default { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo } this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList - this.commentText = JSON.parse(JSON.stringify(item)).commentText }) }, // 批量选择分发责任人 diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 36328073a..20206b405 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -411,6 +411,7 @@ export default { let json = { passInfo: this.passInfo, responUserList: list, + commentText: this.commentText, actionFlag: 0 } if(flag)return; diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index dbaff522c..3cd838f65 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -473,7 +473,8 @@ export default { let fileDataList = this.dataList let json = { info: { fileDataList }, - username: this.$store.getters.userInfo.userName + username: this.$store.getters.userInfo.userName, + commentText: this.commentText, } const params = new FormData(); params.set('json', JSON.stringify(json)) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index ce4e10499..84878b786 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -50,7 +50,7 @@
- +
+
+ + + + + +
+
基础信息
+
审批历史
+
+
+
+ + + + +
+ + + + + 国内标准入库 + 海外标准入库 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + +
+ + + +
+ + + + + +
+ + {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+
+ + +
+ {{value.name}} +
+
+ - - +
+
+ + + +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+
+
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{form.wssmr}} + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + +
+ {{value.name}} +
+
+ - - +
+
+
+ + + + + + + + + + + +
+
+
+
+
+ + +
+ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ + + + + + +
+ + + + + diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue index 6eb2d192b..3c3d49c6a 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue @@ -122,7 +122,12 @@ export default { }, watch: { value (val) { - this.tagList = val !== '' && val !== null ? val.split(',') : [] + if(val !== '' && val !== null) { + this.tagList = [] + } else { + this.tagList = val.split(',') + } + // this.tagList = val !== '' && val !== null ? val.split(',') : [] }, tagList: { handler (val) { diff --git a/src/router/index.js b/src/router/index.js index 674d19bd8..1fd281938 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2559,6 +2559,16 @@ const routes = [ title: '政策征求意见流程' } }, + { + path: '/phoneBzrkStep2', + name: 'phoneBzrkStep2', + component: () => import('@/pages/processCenter/pages/phone/bzrk/step2.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准入库流程' + } + }, ] },