diff --git a/klp-ui/src/api/wms/approval.js b/klp-ui/src/api/wms/approval.js new file mode 100644 index 00000000..3b3a3c63 --- /dev/null +++ b/klp-ui/src/api/wms/approval.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询通用审批（支持请假/外出等申请的审批）列表 +export function listApproval(query) { + return request({ + url: '/wms/approval/list', + method: 'get', + params: query + }) +} + +// 查询通用审批（支持请假/外出等申请的审批）详细 +export function getApproval(approvalId) { + return request({ + url: '/wms/approval/' + approvalId, + method: 'get' + }) +} + +// 新增通用审批（支持请假/外出等申请的审批） +export function addApproval(data) { + return request({ + url: '/wms/approval', + method: 'post', + data: data + }) +} + +// 修改通用审批（支持请假/外出等申请的审批） +export function updateApproval(data) { + return request({ + url: '/wms/approval', + method: 'put', + data: data + }) +} + +// 删除通用审批（支持请假/外出等申请的审批） +export function delApproval(approvalId) { + return request({ + url: '/wms/approval/' + approvalId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/wms/outRequest.js b/klp-ui/src/api/wms/outRequest.js new file mode 100644 index 00000000..cea2ef5b --- /dev/null +++ b/klp-ui/src/api/wms/outRequest.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询员工外出申请列表 +export function listOutRequest(query) { + return request({ + url: '/wms/outRequest/list', + method: 'get', + params: query + }) +} + +// 查询员工外出申请详细 +export function getOutRequest(outId) { + return request({ + url: '/wms/outRequest/' + outId, + method: 'get' + }) +} + +// 新增员工外出申请 +export function addOutRequest(data) { + return request({ + url: '/wms/outRequest', + method: 'post', + data: data + }) +} + +// 修改员工外出申请 +export function updateOutRequest(data) { + return request({ + url: '/wms/outRequest', + method: 'put', + data: data + }) +} + +// 删除员工外出申请 +export function delOutRequest(outId) { + return request({ + url: '/wms/outRequest/' + outId, + method: 'delete' + }) +} diff --git a/klp-ui/src/components/KLPService/DeptSelect/index.vue b/klp-ui/src/components/KLPService/DeptSelect/index.vue new file mode 100644 index 00000000..ecf96886 --- /dev/null +++ b/klp-ui/src/components/KLPService/DeptSelect/index.vue @@ -0,0 +1,17 @@ + + + \ No newline at end of file diff --git a/klp-ui/src/store/getters.js b/klp-ui/src/store/getters.js index 7c8d97fe..6c9757bc 100644 --- a/klp-ui/src/store/getters.js +++ b/klp-ui/src/store/getters.js @@ -9,6 +9,7 @@ const getters = { avatar: state => state.user.avatar, id: state => state.user.id, name: state => state.user.name, + nickName: state => state.user.nickName, avatar: state => state.user.avatar, introduction: state => state.user.introduction, roles: state => state.user.roles, diff --git a/klp-ui/src/store/modules/user.js b/klp-ui/src/store/modules/user.js index 5b4d35ea..b237ef06 100644 --- a/klp-ui/src/store/modules/user.js +++ b/klp-ui/src/store/modules/user.js @@ -6,6 +6,7 @@ const user = { id: '', token: getToken(), name: '', + nickName: '', avatar: '', roles: [], permissions: [] @@ -18,6 +19,9 @@ const user = { SET_NAME: (state, name) => { state.name = name }, + SET_NICK_NAME: (state, nickName) => { + state.nickName = nickName + }, SET_AVATAR: (state, avatar) => { state.avatar = avatar }, @@ -63,6 +67,7 @@ const user = { commit('SET_ROLES', ['ROLE_DEFAULT']) } commit('SET_NAME', user.userName) + commit('SET_NICK_NAME', user.nickName) commit('SET_AVATAR', avatar) commit('SET_ID', user.userId) resolve(res) diff --git a/klp-ui/src/views/system/dept/index.vue b/klp-ui/src/views/system/dept/index.vue index ef88fc8a..00bf9ca3 100644 --- a/klp-ui/src/views/system/dept/index.vue +++ b/klp-ui/src/views/system/dept/index.vue @@ -18,6 +18,14 @@ :value="dict.value" /> + + + 搜索 @@ -54,10 +62,11 @@ :data="deptList" row-key="deptId" :default-expand-all="isExpandAll" - :tree-props="{children: 'children', hasChildren: 'hasChildren'}" + :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" > + + + +