diff --git a/.eslintignore b/.eslintignore index fc0ba2c30..9b6ac6d5d 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,3 @@ public dist -node_modules +node_modules \ No newline at end of file diff --git a/src/api/ebiz/manpower/manpower.js b/src/api/ebiz/manpower/manpower.js new file mode 100644 index 000000000..338408a4e --- /dev/null +++ b/src/api/ebiz/manpower/manpower.js @@ -0,0 +1,90 @@ +import request from '@/assets/js/utils/request' +import getUrl from '@/assets/js/utils/get-url' + +// 个人中心 - 查询接口 +export function getPersonalInfo(data) { + return request({ + url: getUrl('/agent/personal/getInfo', 1), + method: 'post', + data + }) +} + +// 人才库列表查询接口 +export function getAgentPersonnelList(data = {}) { + return request({ + url: getUrl('/agent/personnel/queryList', 1), + method: 'post', + data + }) +} +// 人才库 - 新增人才 +export function saveAgentPersonnel(data) { + return request({ + url: getUrl('/agent/personnel/saveOrUpdate', 1), + method: 'post', + data + }) +} +// 人才库 - 查询详情 +export function getAgentPersonnelDetail(data) { + return request({ + url: getUrl('/agent/personnel/queryDetail', 1), + method: 'post', + data + }) +} +// 人才库 - 查询人才库列表 - 导航页 +export function getAgentPersonnelListFirst(data = {}) { + return request({ + url: getUrl('/agent/personnel/queryListFirst', 1), + method: 'post', + data + }) +} + +// 活动量统计周报 +export function queryWeekly(data) { + return request({ + url: getUrl('/agent/activityRecord/queryWeekly', 1), + method: 'post', + data + }) +} + +// 查询日志页面增员列表 +export function queryRecordList(data) { + return request({ + url: getUrl('/agent/activityRecord/queryList', 1), + method: 'post', + data + }) +} + +// 日志详情查询 +export function queryRecordDetail(data) { + return request({ + url: getUrl('/agent/activityRecord/queryDetail', 1), + method: 'post', + data + }) +} + +// 新增日志 +export function saveRecord(data) { + return request({ + url: getUrl('/agent/activityRecord/saveOrUpdate', 1), + method: 'post', + data + }) +} + +export function getTokenForUserModel(data = {}) { + return request({ + url: getUrl('/agent/enter/getTokenForUserModel', 1), + method: 'get', + params: { + data + } + }) +} diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index 88014c8e5..42480d9b5 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -2017,5 +2017,28 @@ export default { { code: '01', value: '寿险' }, { code: '02', value: '重疾' }, { code: '03', value: '年金' } + ], + // 活动量管理 - 人才库 - 状态 + talentPoolStatus: [ + { id: 0, text: '暂不考虑' }, + { id: 1, text: '已加盟' }, + { id: 2, text: '确认加盟' }, + { id: 3, text: '三次接触以上' }, + { id: 4, text: '二次接触' }, + { id: 5, text: '首次接触 ' } + ], + // 活动量管理 - 人才库 - 过往职业 + talentPoolPastOccu: [ + { id: '01', text: '一般内勤职员' }, + { id: '02', text: '其他金融行业' }, + { id: '03', text: '家庭主妇' }, + { id: '04', text: '自由职业' }, + { id: '05', text: '离退休人员' }, + { id: '06', text: '个体经营者' }, + { id: '07', text: '销售' }, + { id: '08', text: '公务员' }, + { id: '09', text: '保险外勤' }, + { id: '10', text: '保险内勤' }, + { id: '11', text: '其他' } ] } diff --git a/src/assets/js/utils/validator.js b/src/assets/js/utils/validator.js index c449e3937..7094910d1 100644 --- a/src/assets/js/utils/validator.js +++ b/src/assets/js/utils/validator.js @@ -60,6 +60,13 @@ Validator.extend('age', { return value > 17 && /^\d{1,3}$/.test(value) } }) +//年龄(不得大于100周岁) +Validator.extend('maxAge', { + getMessage: () => '年龄不得大于100周岁', + validate: value => { + return value <= 100 && /^\d{1,3}$/.test(value) + } +}) //被保险人年龄(不得小于18周岁) Validator.extend('appntAge', { getMessage: () => '年龄不得小于18周岁', @@ -138,4 +145,26 @@ Validator.extend('avoirdupois', { validate: value => { return /^[0-9]+([.]{1}[0-9]{1})?$/.test(value) && value > 0.1 } -}) \ No newline at end of file +}) + +//同业公司 +Validator.extend('sameCompany', { + getMessage: () => '同业公司长度不超过120个字符,不支持特殊字符', + validate: value => { + return /^[0-9a-zA-Z\.\s\u4e00-\u9fa5]{1,120}$/.test(value) + } +}) +//从业年限 +Validator.extend('workYears', { + getMessage: () => '从业年限仅支持阿拉伯数字,最多精确到一位小数', + validate: value => { + return /^[0-9]+([.]{1}[0-9]{1})?$/.test(value) && value > 0 + } +}) +//最大长度120字符 +Validator.extend('max120', { + getMessage: () => '输入内容不得超过120哥字符', + validate: value => { + return value.length < 121 + } +}) diff --git a/src/components/ebiz/manpower/ActivityLogItem.vue b/src/components/ebiz/manpower/ActivityLogItem.vue new file mode 100644 index 000000000..fb8c0e28b --- /dev/null +++ b/src/components/ebiz/manpower/ActivityLogItem.vue @@ -0,0 +1,66 @@ + + diff --git a/src/components/ebiz/manpower/NavItem.vue b/src/components/ebiz/manpower/NavItem.vue new file mode 100644 index 000000000..2f5803b54 --- /dev/null +++ b/src/components/ebiz/manpower/NavItem.vue @@ -0,0 +1,70 @@ + + + + + + diff --git a/src/components/ebiz/manpower/TalentPoolItem.vue b/src/components/ebiz/manpower/TalentPoolItem.vue new file mode 100644 index 000000000..4f5502429 --- /dev/null +++ b/src/components/ebiz/manpower/TalentPoolItem.vue @@ -0,0 +1,51 @@ + + diff --git a/src/components/ebiz/manpower/UserInfoHeader.vue b/src/components/ebiz/manpower/UserInfoHeader.vue new file mode 100644 index 000000000..b2153d1ef --- /dev/null +++ b/src/components/ebiz/manpower/UserInfoHeader.vue @@ -0,0 +1,58 @@ + + + + + + diff --git a/src/config/manpower.js b/src/config/manpower.js new file mode 100644 index 000000000..8f823d818 --- /dev/null +++ b/src/config/manpower.js @@ -0,0 +1,17 @@ +// 人力发展 + +let mockBaseUrl = 'http://rap2api.taobao.org/app/mock/247074' +export default { + // 例子 + '/demo/url': mockBaseUrl + '/demo/url', + // 查询日志统计周报 + '/agent/activityRecord/queryWeekly': mockBaseUrl + '/agent/activityRecord/queryWeekly', + // 查询日志页面人才库列表 + '/agent/personnel/queryListFirst': mockBaseUrl + '/agent/personnel/queryListFirst', + // 查询日志页面增员列表 + '/agent/activityRecord/queryList': mockBaseUrl + '/agent/activityRecord/queryList', + // 日志详情查询 + '/agent/activityRecord/queryDetail': mockBaseUrl + '/agent/activityRecord/queryDetail', + // 新增日志 + '/agent/activityRecord/saveOrUpdate': mockBaseUrl + '/agent/activityRecord/saveOrUpdate' +} diff --git a/src/config/urlMap.js b/src/config/urlMap.js index a75916286..7c06a8cee 100644 --- a/src/config/urlMap.js +++ b/src/config/urlMap.js @@ -11,6 +11,7 @@ import product from './product' import serve from './serve' import common from './common' import survey from './survey' +import manpower from './manpower' const mockBaseUrl = 'http://rap2api.taobao.org/app/mock' let baseObj = { @@ -18,6 +19,6 @@ let baseObj = { '/user/info': mockBaseUrl + '/223948/info', '/user/logout': mockBaseUrl + '/223948/logout' } -Object.assign(baseObj, proposal, sale, customer, my, product, serve, common, survey) +Object.assign(baseObj, proposal, sale, customer, my, product, serve, common, survey, manpower) export default baseObj diff --git a/src/router/ebiz/index.js b/src/router/ebiz/index.js index 661d9c36d..f90da6faf 100644 --- a/src/router/ebiz/index.js +++ b/src/router/ebiz/index.js @@ -13,6 +13,7 @@ import claims from './claims' import report from './report' import nbs from './nbs' import survey from './survey' +import manpower from './manpower' export default [ ...proposal, ...sale, @@ -27,5 +28,6 @@ export default [ ...claims, ...report, ...nbs, - ...survey + ...survey, + ...manpower ] //根据需要进行删减 diff --git a/src/router/ebiz/manpower.js b/src/router/ebiz/manpower.js new file mode 100644 index 000000000..fcb15adcf --- /dev/null +++ b/src/router/ebiz/manpower.js @@ -0,0 +1,119 @@ +//人力发展 定义相关组件 + +const Navigation = () => import('@/views/ebiz/manpower/Navigation') +const PersonalCenter = () => import('@/views/ebiz/manpower/PersonalCenter') + +const IncreaseStaffTools = () => import('@/views/ebiz/manpower/IncreaseStaffTools') + +const Training = () => import('@/views/ebiz/manpower/Training') + +const ActiveManagement = () => import('@/views/ebiz/manpower/ActiveManagement') + +const TalentPoolList = () => import('@/views/ebiz/manpower/talentPool/List') +const TalentPoolAdd = () => import('@/views/ebiz/manpower/talentPool/Add') +const TalentPoolEdit = () => import('@/views/ebiz/manpower/talentPool/Edit') + +const ActivityLogList = () => import('@/views/ebiz/manpower/activityLog/List') +const ActivityLogEdit = () => import('@/views/ebiz/manpower/activityLog/Edit') + +export default [{ + // 人力发展 + path: '/manpower/Navigation', + name: 'Navigation', + component: Navigation, + meta: { + title: '人力发展', + index: 1 + } + }, + { + // 个人中心 + path: '/manpower/PersonalCenter', + name: 'PersonalCenter', + component: PersonalCenter, + meta: { + title: '人力发展', + index: 2 + } + }, + { + // 增员工具 + path: '/manpower/IncreaseStaffTools', + name: 'IncreaseStaffTools', + component: IncreaseStaffTools, + meta: { + title: '增员工具', + index: 3 + } + }, + { + // 培训上岗 + path: '/manpower/Training', + name: 'Training', + component: Training, + meta: { + title: '培训上岗', + index: 100 + } + }, + { + // 活动量管理 + path: '/manpower/ActiveManagement', + name: 'ActiveManagement', + component: ActiveManagement, + meta: { + title: '活动量管理', + index: 100 + } + }, + { + // 人才库 + path: '/manpower/TalentPool/', + name: 'TalentPoolList', + component: TalentPoolList, + meta: { + title: '人才库', + index: 101 + } + }, + { + // 人才库-新增人才 + path: '/manpower/TalentPool/Add', + name: 'TalentPoolAdd', + component: TalentPoolAdd, + meta: { + title: '基本信息', + index: 102 + } + }, + { + // 人才库-修改人才 + path: '/manpower/TalentPool/Edit', + name: 'TalentPoolEdit', + component: TalentPoolEdit, + meta: { + title: '基本信息', + index: 103 + } + }, + { + // 当日增员活动日志 + path: '/manpower/ActivityLog/List', + name: 'ActivityLogList', + component: ActivityLogList, + meta: { + title: '当日增员活动日志', + index: 100 + } + }, + { + // 日志详情 + path: '/manpower/ActivityLog/Edit', + name: 'ActivityLogEdit', + component: ActivityLogEdit, + meta: { + title: '日志详情', + index: 100 + } + } +] diff --git a/src/views/ebiz/manpower/ActiveManagement.vue b/src/views/ebiz/manpower/ActiveManagement.vue new file mode 100644 index 000000000..cb19aed63 --- /dev/null +++ b/src/views/ebiz/manpower/ActiveManagement.vue @@ -0,0 +1,221 @@ + + + + diff --git a/src/views/ebiz/manpower/IncreaseStaffTools.vue b/src/views/ebiz/manpower/IncreaseStaffTools.vue new file mode 100644 index 000000000..9c88e03c7 --- /dev/null +++ b/src/views/ebiz/manpower/IncreaseStaffTools.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/src/views/ebiz/manpower/Navigation.vue b/src/views/ebiz/manpower/Navigation.vue new file mode 100644 index 000000000..202634ccb --- /dev/null +++ b/src/views/ebiz/manpower/Navigation.vue @@ -0,0 +1,52 @@ + + + + diff --git a/src/views/ebiz/manpower/PersonalCenter.vue b/src/views/ebiz/manpower/PersonalCenter.vue new file mode 100644 index 000000000..00e712bd3 --- /dev/null +++ b/src/views/ebiz/manpower/PersonalCenter.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/views/ebiz/manpower/Training.vue b/src/views/ebiz/manpower/Training.vue new file mode 100644 index 000000000..b4dcc1283 --- /dev/null +++ b/src/views/ebiz/manpower/Training.vue @@ -0,0 +1,61 @@ + + + + diff --git a/src/views/ebiz/manpower/activityLog/Edit.vue b/src/views/ebiz/manpower/activityLog/Edit.vue new file mode 100644 index 000000000..d1aeb444c --- /dev/null +++ b/src/views/ebiz/manpower/activityLog/Edit.vue @@ -0,0 +1,229 @@ + + + + diff --git a/src/views/ebiz/manpower/activityLog/List.vue b/src/views/ebiz/manpower/activityLog/List.vue new file mode 100644 index 000000000..9eb1698ac --- /dev/null +++ b/src/views/ebiz/manpower/activityLog/List.vue @@ -0,0 +1,104 @@ + + + diff --git a/src/views/ebiz/manpower/increaseStaffTools/CompanyIntroduction.vue b/src/views/ebiz/manpower/increaseStaffTools/CompanyIntroduction.vue new file mode 100644 index 000000000..20f7cb168 --- /dev/null +++ b/src/views/ebiz/manpower/increaseStaffTools/CompanyIntroduction.vue @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/ebiz/manpower/increaseStaffTools/PolicyOptions.vue b/src/views/ebiz/manpower/increaseStaffTools/PolicyOptions.vue new file mode 100644 index 000000000..9fe8c6915 --- /dev/null +++ b/src/views/ebiz/manpower/increaseStaffTools/PolicyOptions.vue @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/ebiz/manpower/increaseStaffTools/ProductInformation.vue b/src/views/ebiz/manpower/increaseStaffTools/ProductInformation.vue new file mode 100644 index 000000000..c443e421d --- /dev/null +++ b/src/views/ebiz/manpower/increaseStaffTools/ProductInformation.vue @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/ebiz/manpower/increaseStaffTools/TrainingSystem.vue b/src/views/ebiz/manpower/increaseStaffTools/TrainingSystem.vue new file mode 100644 index 000000000..d0e42c454 --- /dev/null +++ b/src/views/ebiz/manpower/increaseStaffTools/TrainingSystem.vue @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/ebiz/manpower/js/verification.js b/src/views/ebiz/manpower/js/verification.js new file mode 100644 index 000000000..c063de0fa --- /dev/null +++ b/src/views/ebiz/manpower/js/verification.js @@ -0,0 +1,5 @@ + +//验证 +export function demo(par) { + +} diff --git a/src/views/ebiz/manpower/talentPool/Add.vue b/src/views/ebiz/manpower/talentPool/Add.vue new file mode 100644 index 000000000..e432c1706 --- /dev/null +++ b/src/views/ebiz/manpower/talentPool/Add.vue @@ -0,0 +1,157 @@ + + + + + + diff --git a/src/views/ebiz/manpower/talentPool/Edit.vue b/src/views/ebiz/manpower/talentPool/Edit.vue new file mode 100644 index 000000000..29e74e5ea --- /dev/null +++ b/src/views/ebiz/manpower/talentPool/Edit.vue @@ -0,0 +1,169 @@ + + + + + + diff --git a/src/views/ebiz/manpower/talentPool/List.vue b/src/views/ebiz/manpower/talentPool/List.vue new file mode 100644 index 000000000..c0f2a58b3 --- /dev/null +++ b/src/views/ebiz/manpower/talentPool/List.vue @@ -0,0 +1,101 @@ + + + + + +