diff --git a/src/api/emp.js b/src/api/emp.js index ead8cea..7057219 100644 --- a/src/api/emp.js +++ b/src/api/emp.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function fetchEmp(data) { return request({ - url: '/manage/emp/list', + url: '/manage/emp/listEmp', method: 'post', data }) diff --git a/src/api/manager.js b/src/api/manager.js index 596075a..d96b9d5 100644 --- a/src/api/manager.js +++ b/src/api/manager.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function fetchManager(data) { return request({ - url: '/manage/manager/list', + url: '/manage/manager/listManager', method: 'post', data }) diff --git a/src/api/role.js b/src/api/role.js new file mode 100644 index 0000000..062bcae --- /dev/null +++ b/src/api/role.js @@ -0,0 +1,15 @@ +import request from '@/utils/request' + +export function findRoles() { + return request({ + url: '/manage/role/findRole', + method: 'post' + }) +} + +export function findPosts() { + return request({ + url: '/manage/role/findPost', + method: 'post' + }) +} diff --git a/src/views/employees/index.vue b/src/views/employees/index.vue index bca1974..f1e0b19 100644 --- a/src/views/employees/index.vue +++ b/src/views/employees/index.vue @@ -47,41 +47,51 @@ 删除员工 - - - + + + - + - + - - + + - + - + - + - + 男 女 - + - + + + + + + + + + + +
取 消 @@ -89,41 +99,51 @@
- - - + + + - + - + - - + + - + - + - + - + 男 女 - + - + + + + + + + + + + +
取 消 diff --git a/src/views/market/index.vue b/src/views/market/index.vue index e919ff0..aa4f446 100644 --- a/src/views/market/index.vue +++ b/src/views/market/index.vue @@ -5,6 +5,9 @@ +
+ 刷新 +
@@ -90,6 +93,16 @@ + + + + + + + + + +
取 消 @@ -132,6 +145,16 @@ + + + + + + + + + +
取 消 @@ -140,7 +163,159 @@ +
+ 刷新 +
+ + + + + + 查询 + + + 新增员工 + + + + + + + + + + + + + + + + + + + + + + + 删除员工 + + + + + + + + + + + + + + + + + + + + + + + + + + + 男 + 女 + + + + + + + + + + + + + + + + + + + +
+ 取 消 + 确 定 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + 男 + 女 + + + + + + + + + + + + + + + + + + + +
+ 取 消 + 确 定 +
+ @@ -157,6 +332,7 @@ import { add, batchDel, del, fetchManager, findById, update } from '@/api/manager' import { fetchEmp } from '@/api/emp' +import { findRoles, findPosts } from '@/api/role' export default { //import引入的组件需要注入到对象中才能使用 @@ -176,7 +352,11 @@ export default { empAge: null, empGender: null, empAddress: '', - empSal: null + empSal: null, + roleId: null, + roleName: '', + postId: null, + postName: '' }, empRequest: { empId: null, @@ -221,12 +401,15 @@ export default { { required: true, message: '请输入薪资', trigger: 'blur' }, { pattern: /^(\d+|\d+\.\d+)$/, message: '只能输入数字', trigger: 'blur' } ] - } + }, + roles: [], + posts: [] } }, methods: { fetchManager() { fetchManager(this.empRequest).then(res => { + this.empResponse.list = [] this.empResponse = res.data }) }, @@ -284,11 +467,65 @@ export default { this.$message.success(res.msg) this.fetchManager() }) + }, + fetchEmp(){ + fetchEmp(this.empRequest).then(res =>{ + console.log(res) + this.empResponse.list = [] + this.empResponse = res.data + }) + }, + addEmp() { + add(this.emp).then(res => { + this.$message.success(res.msg) + this.dialogFormVisible3 = false + this.emp = {} + this.fetchManager() + }) + }, + openEmp(empId){ + this.dialogFormVisible4 = true + findById(empId).then(res =>{ + this.emp = res.data + }) + }, + updateEmp() { + update(this.emp).then(res => { + this.$message.success(res.msg) + this.dialogFormVisible4 = false + this.emp = {} + this.fetchManager() + }) + }, + delEmp(empId){ + del(empId).then(res =>{ + this.$message.success(res.msg) + this.fetchManager() + }) + }, + batchDelEmp() { + batchDel(this.multipleSelection.map(item => item.empId)).then(res => { + this.$message.success(res.msg) + this.fetchManager() + }) + }, + findRoles() { + findRoles().then(res => { + this.roles = res.data + }) + }, + findPosts() { + findPosts().then(res => { + this.posts = res.data + }) } }, //声明周期 - 创建完成（可以访问当前this实例）, created() { this.fetchManager() + this.findRoles() + this.findPosts() + this.fetchEmp() } }