diff --git a/package.json b/package.json index acbc0bd..789d412 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "gulp-replace": "0.6.1", "gulp-shell": "0.6.5", "lodash": "^4.17.15", + "moment": "^2.26.0", "node-sass": "^4.14.1", "npm": "^6.14.4", "sass-loader": "6.0.6", diff --git a/src/utils/index.js b/src/utils/index.js index 62124aa..998147d 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,5 +1,7 @@ import Vue from 'vue' import router from '@/router' + +import moment from 'moment' // import store from '@/store' /** @@ -56,3 +58,12 @@ export function clearLoginInfo () { // store.commit('resetStore') router.options.isAddDynamicMenuRoutes = false } + +/** + * 获取几个月前的数据 + */ +export function getDataForMonth (mon = 0) { + let now = moment().format().split('T')[0] + let before = moment().add(-mon, 'M').format().split('T')[0] + return [before, now] +} diff --git a/src/views/modules/staff/archives/componments/professional.vue b/src/views/modules/staff/archives/componments/professional.vue index 6cef8d2..48f3e66 100644 --- a/src/views/modules/staff/archives/componments/professional.vue +++ b/src/views/modules/staff/archives/componments/professional.vue @@ -43,6 +43,11 @@ {{info.jobBeginTime}} +
+ 司龄: + {{info.companySeniority}} +
+
工作经历: diff --git a/src/views/modules/staff/archives/index.vue b/src/views/modules/staff/archives/index.vue index 15181fa..41ac790 100644 --- a/src/views/modules/staff/archives/index.vue +++ b/src/views/modules/staff/archives/index.vue @@ -22,7 +22,7 @@
- + @@ -181,10 +181,11 @@ export default { this.$message.error(result.msg) } }, + // 选择节点重新查询 handleNodeClick (data) { // highlight - current this.query.departmentId = data.departmentId - this.handleGetTableList() + this.handleGetTable() }, // 获取侧边架构列表 async handleGetMenuList () { diff --git a/src/views/modules/staff/profile/componments/employees-number/index.vue b/src/views/modules/staff/profile/componments/employees-number/index.vue index 8732c96..6c46e7b 100644 --- a/src/views/modules/staff/profile/componments/employees-number/index.vue +++ b/src/views/modules/staff/profile/componments/employees-number/index.vue @@ -13,7 +13,7 @@ {{dataInfo.managementRate}}%。
- 近三个月新入职员工 + {{monthLetter.title}}新入职员工 {{dataInfo.newStaffCount}}人,离职员工 {{dataInfo.leaveStaffCount}}人,离职率为 {{dataInfo.leaveRate}}%。 @@ -29,6 +29,12 @@ export default { default: () => { return {} } + }, + monthLetter: { + type: Object, + default: () => { + return {} + } } }, data () { diff --git a/src/views/modules/staff/profile/componments/query-form/index.vue b/src/views/modules/staff/profile/componments/query-form/index.vue index 855dc10..a43b95a 100644 --- a/src/views/modules/staff/profile/componments/query-form/index.vue +++ b/src/views/modules/staff/profile/componments/query-form/index.vue @@ -22,8 +22,16 @@ start-placeholder="开始日期" end-placeholder="结束日期" @change="changeData" - :picker-options="pickerOptions" > +
+ {{i.title}} +
查询 @@ -48,9 +56,25 @@