diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index e736a6638..c3f3fc7b0 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -38,7 +38,7 @@ export function StandardsInfoPage (data) { params: data }) } - +// 车型库清单的下拉列表 export function solostarData (data) { return axios({ url: 'api/sarStandProjectLibrary/solostar', @@ -46,3 +46,11 @@ export function solostarData (data) { params: data }) } +// 活动日历查询接口 +export function meetingByMonth (params) { + return axios({ + url: 'api/sapMeetInfo/getMeetingsByMonthType', + method: 'get', + params + }) +} diff --git a/src/assets/images/meeting.png b/src/assets/images/meeting.png new file mode 100644 index 000000000..4da2fb358 Binary files /dev/null and b/src/assets/images/meeting.png differ diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 1aba19d67..8790e7607 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -114,11 +114,11 @@ export default { // path: '/partCodeApply', // menuId: 'ad9db496772c075f78495382b7581fe9' // }, - // { - // title: '标准法规工作组数据统计', - // path: '/dataStatisComments', - // menuId: '' - // }, + { + title: '标准法规工作组数据统计', + path: '/dataStatisComments', + menuId: '' + }, { title: '海外法规', path: '/foreignStandardsAndRegulations', @@ -244,6 +244,11 @@ export default { path: '/standContrast', menuId: '1d83a6278f781419f628e9f5560f5c86' }, + { + title: '标准化活动日历', + path: '/standCalendar', + menuId: '0ea66e3dd36873082b6851f69e92c8be' + }, // { // title: '标准比对库', // path: '/standardComparisonLibrary', diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue new file mode 100644 index 000000000..55c3f501a --- /dev/null +++ b/src/pages/localTool/standCalendar/index.vue @@ -0,0 +1,372 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index 3ccdce6f2..51b783f53 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -259,6 +259,7 @@ export default { active: '1', ch_pageData: { + fillPeopleId: '', fillPeople: '', fillUnit: '', fillDept: '', @@ -326,6 +327,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList // this.rh_pageData.comityFileNum = this.fileTextList diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue index 0004af53d..f0d0bf333 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -276,6 +276,7 @@ export default { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData this.ch_pageData.myPartRole = [{ + fillPeopleId: this.ch_pageData.fillPeopleId, fillPeople: this.ch_pageData.fillPeople, fillUnit: this.ch_pageData.fillUnit, fillDept: this.ch_pageData.fillDept, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 608baaa01..9a38ead1b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -407,7 +407,6 @@ export default { }, //动态表单读取 getFormFieldList(item) { - console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); if (item.form === undefined) { @@ -472,9 +471,13 @@ export default { }, //提交事件 handleSubmit() { + let dataChildren = [] let dataListChildren = [] this.dataList.forEach(item => { - dataListChildren.push(item.children) + dataChildren.push(item.children) + }) + dataChildren.forEach((item,index) => { + dataListChildren = dataListChildren.concat(item) }) this.isSubmit = true; this.listForm.commentText = this.commentText; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 376ac71f1..3de61a2a1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -873,6 +873,7 @@ export default { }, //动态表单读取 getFormFieldList(item) { + console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); if (item.form === undefined) { diff --git a/src/pages/regulatoryRepository/dataStatis/index.vue b/src/pages/regulatoryRepository/dataStatis/index.vue index 3ada7755b..cb117b7a3 100644 --- a/src/pages/regulatoryRepository/dataStatis/index.vue +++ b/src/pages/regulatoryRepository/dataStatis/index.vue @@ -1,13 +1,127 @@ - diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue new file mode 100644 index 000000000..463314d93 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue @@ -0,0 +1,329 @@ + + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue new file mode 100644 index 000000000..5339886f7 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue @@ -0,0 +1,406 @@ + + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue new file mode 100644 index 000000000..9a21557d9 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue @@ -0,0 +1,144 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue new file mode 100644 index 000000000..8d415f17f --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue @@ -0,0 +1,448 @@ + + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue new file mode 100644 index 000000000..728cdef0e --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue @@ -0,0 +1,461 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue new file mode 100644 index 000000000..a4e164e94 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue @@ -0,0 +1,650 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue new file mode 100644 index 000000000..6600a6f72 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue @@ -0,0 +1,569 @@ + + + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue new file mode 100644 index 000000000..b8c468edb --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue @@ -0,0 +1,358 @@ + + + + + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue new file mode 100644 index 000000000..c9d88e1a0 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue @@ -0,0 +1,369 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue new file mode 100644 index 000000000..095f3912a --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue @@ -0,0 +1,390 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue new file mode 100644 index 000000000..d9aa8d338 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue @@ -0,0 +1,389 @@ + + + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue new file mode 100644 index 000000000..196585903 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue @@ -0,0 +1,82 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue new file mode 100644 index 000000000..d8fa5d16c --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue @@ -0,0 +1,409 @@ + + + + + + + diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 8bba22f69..b32812f46 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -26,7 +26,7 @@ @mouseleave="mouseleave(data)"> - {{ node.label }} + {{ node.label }}