diff --git a/src/api/process/orgApply.js b/src/api/process/orgApply.js new file mode 100644 index 0000000..18caea9 --- /dev/null +++ b/src/api/process/orgApply.js @@ -0,0 +1,88 @@ +import request from '@/utils/request' + +// 查询列表 +export function listOrg(query) { + return request({ + url: '/system/orgChange/list', + method: 'get', + params: query + }) +} + +// 新增 +export function addOrg(data) { + return request({ + url: '/system/orgChange', + method: 'post', + data: data + }) +} + +// 查询详细 +export function getOrg(OrgId) { + return request({ + url: '/system/orgChange/' + OrgId, + method: 'get' + }) +} + +// 修改 +export function updateOrg(data) { + return request({ + url: '/system/orgChange', + method: 'put', + data: data + }) +} + +// 删除 +export function delOrg(OrgId) { + return request({ + url: '/system/orgChange/' + OrgId, + method: 'delete' + }) +} + +// 查询审核列表 +export function getAllList(query) { + return request({ + url: '/system/orgChange/getAllList', + method: 'get', + params: query + }) + } + +// 修改状态 撤回 +export function changeOrgStatus(data) { + return request({ + url: '/system/orgChange/orgChangeCheck', + method: 'put', + data: data + }) + } + +// 导出 +export function exportOrg(query) { + return request({ + url: '/system/export/exportOrgChange', + method: 'get', + responseType: 'blob', + params: query + }) +} + +// 查询职位 +export function getPostName(id) { + return request({ + url: '/system/leaveReporting/getPostName/' + id, + method: 'get' + }) +} + +// 查询考勤组 +export function getAttGroupList() { + return request({ + url: '/system/orgChange/getAttGroupList', + method: 'get' + }) +} diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 1c41cf3..c3be70b 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -48,6 +48,12 @@ const user = { }, SET_ORG_LIST: (state, orgList) => { state.orgList = orgList + }, + SET_Att_GROUP_ID:(state,attGroupId)=> { + state.attGroupId = attGroupId + }, + SET_Att_GROUP_NAME:(state,attGroupName)=> { + state.attGroupName = attGroupName } }, @@ -91,6 +97,9 @@ const user = { commit('SET_ID', user.userId) commit('SET_NAME', user.userName) commit('SET_AVATAR', avatar) + + commit('SET_Att_GROUP_ID', user.attGroupId) + commit('SET_Att_GROUP_NAME', user.attGroupName) resolve(res) }).catch(error => { reject(error) diff --git a/src/views/process/orgApply/index.vue b/src/views/process/orgApply/index.vue new file mode 100644 index 0000000..b6534ec --- /dev/null +++ b/src/views/process/orgApply/index.vue @@ -0,0 +1,497 @@ + + + diff --git a/src/views/process/orgExam/index.vue b/src/views/process/orgExam/index.vue new file mode 100644 index 0000000..237a33d --- /dev/null +++ b/src/views/process/orgExam/index.vue @@ -0,0 +1,536 @@ + + + diff --git a/vue.config.js b/vue.config.js index 867ad16..86c7b57 100644 --- a/vue.config.js +++ b/vue.config.js @@ -35,8 +35,10 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://192.168.0.14:8100`, + target: `http://192.168.0.50:8100`, + // target: `http://192.168.0.14:8100`, // target: `http://192.168.0.14:8001`, + // target: `http://192.168.2.146:8100`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''