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..c03a6bea1 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..2dbb1d6ed 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -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..d92793959 --- /dev/null +++ b/src/pages/localTool/standCalendar/index.vue @@ -0,0 +1,350 @@ + + + + + + + + + + + {{ item }} + + + + + {{ item }} + + + + + 今天 + + + + + + + + {{ data.day.split('-').slice(2).join('-') }} + + + + + + + + + + + + + + + + {{ timeDay.day || nowDate }} + + + + + 暂无会议 + + + + 会议 + 会议 + + {{ item.title }} + + 会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm') }} + + + 参与人 : {{ item.partPeople.join('、') }} + + + 会议内容 : {{ item.content }} + + + 会议附件 : + {{ '-' }} + + {{ res.name }} + + + + + + + + + + + + + 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/router/index.js b/src/router/index.js index ddfb259ef..a0c80586b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1589,6 +1589,17 @@ const routes = [ menuId: 'B8UYM3WFCMGXR2BPF9JA' } }, + { + path: '/standCalendar', + name: 'calendar', + component: () => + import('@/pages/localTool/standCalendar'), + meta: { + requireAuth: false, + title: '标准化活动日历', + menuId: '' + } + }, { path: '/itemSplitInfo', name: 'ItemSplitInfo',