diff --git a/src/api/visitor.js b/src/api/visitor.js index cba599b..4f4ee4d 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -18,3 +18,24 @@ data }) } + +// 查询来访人员记录 +export function getVisitorList(params) { + return request({ + url: '/visitorPerson/listPage', + method: 'get', + params + }) +} + +// 查询来访人员详情 +export function getVisitorDetail(visitorPersonId) { + return request({ + url: '/visitorPerson/detail/' + visitorPersonId, + method: 'get', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' + } + }) + +} diff --git a/src/api/visitor.js b/src/api/visitor.js index cba599b..4f4ee4d 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -18,3 +18,24 @@ data }) } + +// 查询来访人员记录 +export function getVisitorList(params) { + return request({ + url: '/visitorPerson/listPage', + method: 'get', + params + }) +} + +// 查询来访人员详情 +export function getVisitorDetail(visitorPersonId) { + return request({ + url: '/visitorPerson/detail/' + visitorPersonId, + method: 'get', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' + } + }) + +} diff --git a/src/router/modules/visitor.js b/src/router/modules/visitor.js index f1ab563..869c3b7 100644 --- a/src/router/modules/visitor.js +++ b/src/router/modules/visitor.js @@ -26,27 +26,25 @@ name: 'VisitorAddCar', component: () => import('@/views/visitor/visitorAddCar'), meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true } + }, + { + path: '/visitor/today', + name: 'VisitorToday', + component: () => import('@/views/visitor/visitorTodayList'), + meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true } + }, + { + path: '/visitor/carToday', + name: 'VisitorCarToday', + component: () => import('@/views/visitor/visitorCarTodayList'), + meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true } + }, + { + path: '/visitor/list', + name: 'VisitorList', + component: () => import('@/views/visitor/visitorList'), + meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true } } - // { - // path: '/visitor/personList', - // name: 'VisitorPersonList', - // component: () => import('@/views/visitor/visitorPersonList'), - // meta: { title: '当日来访人员', icon: '', permission: ['/visitor/personlist'], keepAlive: true } - // }, - // { - // path: '/visitor/carList', - // name: 'VisitorCarList', - // hidden: true, - // component: () => import('@/views/visitor/visitorCarList'), - // meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carList'], keepAlive: true } - // }, - // { - // path: '/visitor/list', - // name: 'VisitorList', - // hidden: true, - // component: () => import('@/views/visitor/visitorList'), - // meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true } - // } ] } ] diff --git a/src/api/visitor.js b/src/api/visitor.js index cba599b..4f4ee4d 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -18,3 +18,24 @@ data }) } + +// 查询来访人员记录 +export function getVisitorList(params) { + return request({ + url: '/visitorPerson/listPage', + method: 'get', + params + }) +} + +// 查询来访人员详情 +export function getVisitorDetail(visitorPersonId) { + return request({ + url: '/visitorPerson/detail/' + visitorPersonId, + method: 'get', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' + } + }) + +} diff --git a/src/router/modules/visitor.js b/src/router/modules/visitor.js index f1ab563..869c3b7 100644 --- a/src/router/modules/visitor.js +++ b/src/router/modules/visitor.js @@ -26,27 +26,25 @@ name: 'VisitorAddCar', component: () => import('@/views/visitor/visitorAddCar'), meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true } + }, + { + path: '/visitor/today', + name: 'VisitorToday', + component: () => import('@/views/visitor/visitorTodayList'), + meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true } + }, + { + path: '/visitor/carToday', + name: 'VisitorCarToday', + component: () => import('@/views/visitor/visitorCarTodayList'), + meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true } + }, + { + path: '/visitor/list', + name: 'VisitorList', + component: () => import('@/views/visitor/visitorList'), + meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true } } - // { - // path: '/visitor/personList', - // name: 'VisitorPersonList', - // component: () => import('@/views/visitor/visitorPersonList'), - // meta: { title: '当日来访人员', icon: '', permission: ['/visitor/personlist'], keepAlive: true } - // }, - // { - // path: '/visitor/carList', - // name: 'VisitorCarList', - // hidden: true, - // component: () => import('@/views/visitor/visitorCarList'), - // meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carList'], keepAlive: true } - // }, - // { - // path: '/visitor/list', - // name: 'VisitorList', - // hidden: true, - // component: () => import('@/views/visitor/visitorList'), - // meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true } - // } ] } ] diff --git a/src/views/visitor/visitorAdd.vue b/src/views/visitor/visitorAdd.vue index 6b99246..3002d76 100644 --- a/src/views/visitor/visitorAdd.vue +++ b/src/views/visitor/visitorAdd.vue @@ -122,7 +122,7 @@ deptid: '', // 接访部门 personId: '', // 接访人员 matter: '', // 来访原因 - startTime: '', + beginTime: '', endTime: '', visitorBaseDTOList: [] }, // 表单 @@ -214,7 +214,7 @@ deptid: '', // 接访部门 personId: '', // 接访人员 matter: '', // 来访原因 - startTime: '', + beginTime: '', endTime: '', visitorBaseDTOList: [] } @@ -226,7 +226,7 @@ }, initDateRange() { this.authTimeType = '1' // 当日 - this.dataForm.startTime = getDate(0, 'DATE') + this.dataForm.beginTime = getDate(0, 'DATE') this.dataForm.endTime = getDate(1, 'DATE') this.timeRange = [getDate(0, 'DATE'), getDate(1, 'DATE')] }, diff --git a/src/api/visitor.js b/src/api/visitor.js index cba599b..4f4ee4d 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -18,3 +18,24 @@ data }) } + +// 查询来访人员记录 +export function getVisitorList(params) { + return request({ + url: '/visitorPerson/listPage', + method: 'get', + params + }) +} + +// 查询来访人员详情 +export function getVisitorDetail(visitorPersonId) { + return request({ + url: '/visitorPerson/detail/' + visitorPersonId, + method: 'get', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' + } + }) + +} diff --git a/src/router/modules/visitor.js b/src/router/modules/visitor.js index f1ab563..869c3b7 100644 --- a/src/router/modules/visitor.js +++ b/src/router/modules/visitor.js @@ -26,27 +26,25 @@ name: 'VisitorAddCar', component: () => import('@/views/visitor/visitorAddCar'), meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true } + }, + { + path: '/visitor/today', + name: 'VisitorToday', + component: () => import('@/views/visitor/visitorTodayList'), + meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true } + }, + { + path: '/visitor/carToday', + name: 'VisitorCarToday', + component: () => import('@/views/visitor/visitorCarTodayList'), + meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true } + }, + { + path: '/visitor/list', + name: 'VisitorList', + component: () => import('@/views/visitor/visitorList'), + meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true } } - // { - // path: '/visitor/personList', - // name: 'VisitorPersonList', - // component: () => import('@/views/visitor/visitorPersonList'), - // meta: { title: '当日来访人员', icon: '', permission: ['/visitor/personlist'], keepAlive: true } - // }, - // { - // path: '/visitor/carList', - // name: 'VisitorCarList', - // hidden: true, - // component: () => import('@/views/visitor/visitorCarList'), - // meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carList'], keepAlive: true } - // }, - // { - // path: '/visitor/list', - // name: 'VisitorList', - // hidden: true, - // component: () => import('@/views/visitor/visitorList'), - // meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true } - // } ] } ] diff --git a/src/views/visitor/visitorAdd.vue b/src/views/visitor/visitorAdd.vue index 6b99246..3002d76 100644 --- a/src/views/visitor/visitorAdd.vue +++ b/src/views/visitor/visitorAdd.vue @@ -122,7 +122,7 @@ deptid: '', // 接访部门 personId: '', // 接访人员 matter: '', // 来访原因 - startTime: '', + beginTime: '', endTime: '', visitorBaseDTOList: [] }, // 表单 @@ -214,7 +214,7 @@ deptid: '', // 接访部门 personId: '', // 接访人员 matter: '', // 来访原因 - startTime: '', + beginTime: '', endTime: '', visitorBaseDTOList: [] } @@ -226,7 +226,7 @@ }, initDateRange() { this.authTimeType = '1' // 当日 - this.dataForm.startTime = getDate(0, 'DATE') + this.dataForm.beginTime = getDate(0, 'DATE') this.dataForm.endTime = getDate(1, 'DATE') this.timeRange = [getDate(0, 'DATE'), getDate(1, 'DATE')] }, diff --git a/src/views/visitor/visitorAddCar.vue b/src/views/visitor/visitorAddCar.vue index 57bc84a..3a4d2cf 100644 --- a/src/views/visitor/visitorAddCar.vue +++ b/src/views/visitor/visitorAddCar.vue @@ -157,7 +157,7 @@ deptid: '', // 接访部门 personId: '', // 接访人员 matter: '', // 来访原因 - startTime: '', + beginTime: '', endTime: '', visitorBaseDTOList: [], // 来访人员列表 visitCarDTOList: [] // 来访车辆列表 @@ -244,7 +244,7 @@ deptid: '', // 接访部门 personId: '', // 接访人员 matter: '', // 来访原因 - startTime: '', + beginTime: '', endTime: '', visitorBaseDTOList: [], visitCarDTOList: [] @@ -259,7 +259,7 @@ }, initDateRange() { this.authTimeType = '1' // 当日 - this.dataForm.startTime = getDate(0, 'DATE') + this.dataForm.beginTime = getDate(0, 'DATE') this.dataForm.endTime = getDate(1, 'DATE') this.timeRange = [getDate(0, 'DATE'), getDate(1, 'DATE')] }, diff --git a/src/api/visitor.js b/src/api/visitor.js index cba599b..4f4ee4d 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -18,3 +18,24 @@ data }) } + +// 查询来访人员记录 +export function getVisitorList(params) { + return request({ + url: '/visitorPerson/listPage', + method: 'get', + params + }) +} + +// 查询来访人员详情 +export function getVisitorDetail(visitorPersonId) { + return request({ + url: '/visitorPerson/detail/' + visitorPersonId, + method: 'get', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' + } + }) + +} diff --git a/src/router/modules/visitor.js b/src/router/modules/visitor.js index f1ab563..869c3b7 100644 --- a/src/router/modules/visitor.js +++ b/src/router/modules/visitor.js @@ -26,27 +26,25 @@ name: 'VisitorAddCar', component: () => import('@/views/visitor/visitorAddCar'), meta: { title: '访客车辆登记', icon: '', permission: ['/visitor/addCar'], keepAlive: true } + }, + { + path: '/visitor/today', + name: 'VisitorToday', + component: () => import('@/views/visitor/visitorTodayList'), + meta: { title: '当日来访人员', icon: '', permission: ['/visitor/today'], keepAlive: true } + }, + { + path: '/visitor/carToday', + name: 'VisitorCarToday', + component: () => import('@/views/visitor/visitorCarTodayList'), + meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carToday'], keepAlive: true } + }, + { + path: '/visitor/list', + name: 'VisitorList', + component: () => import('@/views/visitor/visitorList'), + meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true } } - // { - // path: '/visitor/personList', - // name: 'VisitorPersonList', - // component: () => import('@/views/visitor/visitorPersonList'), - // meta: { title: '当日来访人员', icon: '', permission: ['/visitor/personlist'], keepAlive: true } - // }, - // { - // path: '/visitor/carList', - // name: 'VisitorCarList', - // hidden: true, - // component: () => import('@/views/visitor/visitorCarList'), - // meta: { title: '当日来访车辆', icon: '', permission: ['/visitor/carList'], keepAlive: true } - // }, - // { - // path: '/visitor/list', - // name: 'VisitorList', - // hidden: true, - // component: () => import('@/views/visitor/visitorList'), - // meta: { title: '来访记录', icon: '', permission: ['/visitor/list'], keepAlive: true } - // } ] } ] diff --git a/src/views/visitor/visitorAdd.vue b/src/views/visitor/visitorAdd.vue index 6b99246..3002d76 100644 --- a/src/views/visitor/visitorAdd.vue +++ b/src/views/visitor/visitorAdd.vue @@ -122,7 +122,7 @@ deptid: '', // 接访部门 personId: '', // 接访人员 matter: '', // 来访原因 - startTime: '', + beginTime: '', endTime: '', visitorBaseDTOList: [] }, // 表单 @@ -214,7 +214,7 @@ deptid: '', // 接访部门 personId: '', // 接访人员 matter: '', // 来访原因 - startTime: '', + beginTime: '', endTime: '', visitorBaseDTOList: [] } @@ -226,7 +226,7 @@ }, initDateRange() { this.authTimeType = '1' // 当日 - this.dataForm.startTime = getDate(0, 'DATE') + this.dataForm.beginTime = getDate(0, 'DATE') this.dataForm.endTime = getDate(1, 'DATE') this.timeRange = [getDate(0, 'DATE'), getDate(1, 'DATE')] }, diff --git a/src/views/visitor/visitorAddCar.vue b/src/views/visitor/visitorAddCar.vue index 57bc84a..3a4d2cf 100644 --- a/src/views/visitor/visitorAddCar.vue +++ b/src/views/visitor/visitorAddCar.vue @@ -157,7 +157,7 @@ deptid: '', // 接访部门 personId: '', // 接访人员 matter: '', // 来访原因 - startTime: '', + beginTime: '', endTime: '', visitorBaseDTOList: [], // 来访人员列表 visitCarDTOList: [] // 来访车辆列表 @@ -244,7 +244,7 @@ deptid: '', // 接访部门 personId: '', // 接访人员 matter: '', // 来访原因 - startTime: '', + beginTime: '', endTime: '', visitorBaseDTOList: [], visitCarDTOList: [] @@ -259,7 +259,7 @@ }, initDateRange() { this.authTimeType = '1' // 当日 - this.dataForm.startTime = getDate(0, 'DATE') + this.dataForm.beginTime = getDate(0, 'DATE') this.dataForm.endTime = getDate(1, 'DATE') this.timeRange = [getDate(0, 'DATE'), getDate(1, 'DATE')] }, diff --git a/src/views/visitor/visitorDetail.vue b/src/views/visitor/visitorDetail.vue new file mode 100644 index 0000000..93f33ca --- /dev/null +++ b/src/views/visitor/visitorDetail.vue @@ -0,0 +1,230 @@ + + + + + +