diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 07fafe8e4..8f723900c 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -286,11 +286,11 @@ path: '/standContrast', menuId: '1d83a6278f781419f628e9f5560f5c86' }, - { - title: '标准化活动日历', - path: '/standCalendar', - menuId: '5e834b3fca90619e593ad0ee83263885' - }, + // { + // title: '标准化活动日历', + // path: '/standCalendar', + // menuId: '5e834b3fca90619e593ad0ee83263885' + // }, // { // title: '标准比对库', // path: '/standardComparisonLibrary', diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index 78aef7434..b27252a72 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -812,6 +812,8 @@ export default { // jdwjFileMap: {}, this.kwjFileMap = this.assemble(processForm.kwj, processForm.kwjName); // kwjFileMap: {}, + this.xdbFileMap = this.assemble(processForm.xdb, processForm.xdbName); + // xdbFileMap: {}, this.glwjFileMap = this.assemble(processForm.glwj, processForm.glwjName); // glwjFileMap: {}, this.caFileMap = this.assemble(processForm.ca, processForm.caName); @@ -830,14 +832,19 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) -/* console.log(this.form) + let wssmrName = this.form.wssmrname || this.form.wssmr + this.form.wssmr = wssmrName + this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : '' + this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : '' + this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: '' + this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz : '' this.defaultCheckedKeys = [this.form.standSystem] this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] - this.defaultCheckedKeys3 = [this.form.dybxh]*/ + this.defaultCheckedKeys3 = [this.form.dybxh] this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' - if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') { + this.form.standYear = this.form.standYear ? this.form.standYear : '' + if (this.form.country) { this.form.country = this.form.country.split(","); } this.form.prcNum = this.prcNum @@ -881,16 +888,6 @@ export default { this.handleSubmit() }, handleSubmit() { - const val = this.form.country; - if (val !== "" && val !== null && typeof (val) !== "undefined") { - if (val instanceof Array) { - this.form.country = val.join(","); - } else { - this.form.country = val; - } - } else if (val === "") { - this.form.country = []; - } this.isSubmit = true; this.form.commentText = this.commentText; this.form.approvalOpinion = this.formTongGuo.approvalOpinion; diff --git a/src/pages/regulatoryRepository/workingGroup/index.vue b/src/pages/regulatoryRepository/workingGroup/index.vue index e99e5b298..cb22f3ab5 100644 --- a/src/pages/regulatoryRepository/workingGroup/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/index.vue @@ -14,7 +14,10 @@ - 工作组统计 +
+ 标准化活动日历 + 工作组统计 +