diff --git a/package-lock.json b/package-lock.json index bc73d1468..5e3568692 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14877,6 +14877,14 @@ } } }, + "vue-hash-calendar": { + "version": "1.2.12", + "resolved": "https://registry.npm.taobao.org/vue-hash-calendar/download/vue-hash-calendar-1.2.12.tgz", + "integrity": "sha1-3TyXG2GpV8ZwavJS9FGVmpsHsoY=", + "requires": { + "vue": "^2.5.17" + } + }, "vue-hot-reload-api": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz", diff --git a/package.json b/package.json index 25f358c16..11951032c 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "vant": "2.2.0", "vee-validate": "^2.2.14", "vue": "^2.6.10", + "vue-hash-calendar": "^1.2.12", "vue-pdf": "^4.0.7", "vue-router": "^3.0.3", "vuex": "^3.0.1", diff --git a/src/api/ebiz/attendance/attendance.js b/src/api/ebiz/attendance/attendance.js new file mode 100644 index 000000000..542059c22 --- /dev/null +++ b/src/api/ebiz/attendance/attendance.js @@ -0,0 +1,27 @@ +import request from '@/assets/js/utils/request' +import getUrl from '@/assets/js/utils/get-url' + +//打卡情况续期列表查询 +export function attendance(data) { + return request({ + url: getUrl(`/agent/Performance/attendance`, 1), + method: 'post', + data + }) + } +//日期查询 + export function getDayDetail(data) { + return request({ + url: getUrl(`/agent/Performance/getDayDetail`, 1), + method: 'post', + data + }) + } + //月历查询 + export function getMonthDetail(data) { + return request({ + url: getUrl(`/agent/Performance/getMonthDetail`, 1), + method: 'post', + data + }) + } \ No newline at end of file diff --git a/src/api/ebiz/performance/performance.js b/src/api/ebiz/performance/performance.js index 710079bd9..3e3f02174 100644 --- a/src/api/ebiz/performance/performance.js +++ b/src/api/ebiz/performance/performance.js @@ -1,2 +1,36 @@ import request from '@/assets/js/utils/request' -import getUrl from '@/assets/js/utils/get-url' \ No newline at end of file +import getUrl from '@/assets/js/utils/get-url' + +//代理人功能获取 +export function getBaseAgentInfo(data) { + return request({ + url: getUrl(`/agent/agent/getBaseAgentInfo`, 1), + method: 'post', + data + }) + } + //代理人关系获取 + export function getBranchInfos(data) { + return request({ + url: getUrl(`/agent/branch/getBranchInfos`, 1), + method: 'post', + data + }) + } + //获取信息 + export function getPerformanceDetail(data) { + return request({ + url: getUrl(`/agent/Performance/getPerformanceDetail`, 1), + method: 'post', + data + }) + } + //获取代理人下级头像 + // http://139.199.50.151:7000/api/v1/agent/branch/getAllAgentByAgent + export function getPerformanceHeader(data) { + return request({ + url: getUrl(`/agent/branch/getAllAgentByAgent`, 1), + method: 'post', + data + }) + } \ No newline at end of file diff --git a/src/assets/images/u1213.png b/src/assets/images/u1213.png new file mode 100644 index 000000000..b4b2c1056 Binary files /dev/null and b/src/assets/images/u1213.png differ diff --git a/src/assets/images/u188.png b/src/assets/images/u188.png new file mode 100644 index 000000000..a7c35fe43 Binary files /dev/null and b/src/assets/images/u188.png differ diff --git a/src/main.js b/src/main.js index 519a95440..3c0056005 100644 --- a/src/main.js +++ b/src/main.js @@ -9,8 +9,9 @@ import Jump from '@/assets/js/utils/jump' import utils from '@/assets/js/business-common' import config from '@/config' import noMoreClick from '@/directive/noMoreClick' +import vueHashCalendar from 'vue-hash-calendar' +import 'vue-hash-calendar/lib/vue-hash-calendar.css' -//全局注册vant常用组件 import { Toast, Button, @@ -19,7 +20,7 @@ import { } from 'vant' Vue.use(Icon) - +Vue.use(vueHashCalendar) Vue.use(Toast) Vue.use(Button) Vue.use(Dialog) diff --git a/src/router/ebiz/attendance.js b/src/router/ebiz/attendance.js index 574610812..cf67b15e1 100644 --- a/src/router/ebiz/attendance.js +++ b/src/router/ebiz/attendance.js @@ -1,6 +1,7 @@ const attendance = () => import('@/views/ebiz/attendance/Attendance') const monthly = () => import('@/views/ebiz/attendance/Monthly') + export default [ { path: '/attendance/Attendance', diff --git a/src/router/ebiz/performance.js b/src/router/ebiz/performance.js index 1a47ffbc7..a24b28409 100644 --- a/src/router/ebiz/performance.js +++ b/src/router/ebiz/performance.js @@ -1,4 +1,6 @@ const performance = () => import('@/views/ebiz/performance/Performance') +const attendanceInfo = () => import('@/views/ebiz/performance/AttendanceInfo') +const PerformanceList = () => import('@/views/ebiz/performance/PerformanceList') export default [ { @@ -10,13 +12,31 @@ export default [ index: 1 } }, - // { - // path: '/poster/posterPreview', - // name: 'posterPreview', - // component: posterPreview, - // meta: { - // title: '海报预览', - // index: 2 - // } - // } + { + path: '/performance/Performance/:parmas', + name: 'Performance', + component: performance, + meta: { + title: '业绩查询', + index: 1 + } + }, + { + path: '/performance/AttendanceInfo', + name: 'AttendanceInfo', + component: attendanceInfo, + meta: { + title: '考勤统计', + index: 3 + } + }, + { + path: '/performance/PerformanceList/:obj', + name: 'PerformanceList', + component: PerformanceList, + meta: { + title: '考勤统计', + index: 3 + } + } ] \ No newline at end of file diff --git a/src/views/ebiz/attendance/Attendance.vue b/src/views/ebiz/attendance/Attendance.vue index 41139de87..b8cbe6031 100644 --- a/src/views/ebiz/attendance/Attendance.vue +++ b/src/views/ebiz/attendance/Attendance.vue @@ -1,114 +1,155 @@ \ No newline at end of file diff --git a/src/views/ebiz/attendance/Monthly.vue b/src/views/ebiz/attendance/Monthly.vue index b899a2970..30572a2da 100644 --- a/src/views/ebiz/attendance/Monthly.vue +++ b/src/views/ebiz/attendance/Monthly.vue @@ -1,45 +1,158 @@ - \ No newline at end of file diff --git a/src/views/ebiz/performance/AttendanceInfo.vue b/src/views/ebiz/performance/AttendanceInfo.vue new file mode 100644 index 000000000..36814dfd3 --- /dev/null +++ b/src/views/ebiz/performance/AttendanceInfo.vue @@ -0,0 +1,192 @@ + + + \ No newline at end of file diff --git a/src/views/ebiz/performance/Performance.vue b/src/views/ebiz/performance/Performance.vue index 26f056bac..4e1930c14 100644 --- a/src/views/ebiz/performance/Performance.vue +++ b/src/views/ebiz/performance/Performance.vue @@ -1,142 +1,314 @@ \ No newline at end of file diff --git a/src/views/ebiz/performance/PerformanceList.vue b/src/views/ebiz/performance/PerformanceList.vue new file mode 100644 index 000000000..670f2bb27 --- /dev/null +++ b/src/views/ebiz/performance/PerformanceList.vue @@ -0,0 +1,235 @@ + + + \ No newline at end of file