From d5563cdcd0c8c1c2eaccd2439d2c2d0891495b1b Mon Sep 17 00:00:00 2001 From: MrZhai Date: Mon, 14 Mar 2022 17:21:48 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=93=E5=BA=93=E5=AD=97=E5=85=B8=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=94=A8=E6=88=B7=E5=92=8C=E5=8D=95=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auth/authUser.js | 10 + src/api/basic/invWarehouse.js | 48 +++- src/views/basic/invWarehouse.vue | 306 +++++++++++++++++++++++- src/views/userManage/admin/authRole.vue | 1 - 4 files changed, 358 insertions(+), 7 deletions(-) create mode 100644 src/api/auth/authUser.js diff --git a/src/api/auth/authUser.js b/src/api/auth/authUser.js new file mode 100644 index 0000000..7f4b46a --- /dev/null +++ b/src/api/auth/authUser.js @@ -0,0 +1,10 @@ +import axios from "../../utils/axios"; + +//获取医院用户列表 +export function getHospitalUserList(query) { + return axios({ + url: '/admin/auth/admin/hospitalUserList', + method: 'get', + params: query + }) +} diff --git a/src/api/basic/invWarehouse.js b/src/api/basic/invWarehouse.js index 3f3ecf6..40b5644 100644 --- a/src/api/basic/invWarehouse.js +++ b/src/api/basic/invWarehouse.js @@ -50,7 +50,7 @@ export function deleteWarehouse(data) { }); } -export function exportJson(query){ +export function exportJson(query) { return axios({ url: "/spms/inv/warehouse/exportJson", method: "post", @@ -59,3 +59,49 @@ export function exportJson(query){ responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf }); } + +//加载仓库字典关联用户数据 +export function warehouseUserList(query) { + return axios({ + url: '/warehouse/inout/warehouseUserList', + method: 'get', + params: query + }); +} + +//加载仓库字段关联单据类型数据 +export function warehouseBussinessTypeList(query) { + return axios({ + url: '/warehouse/inout/warehouseBussniessTypeList', + method: 'get', + params: query + }); +} + +//添加用户 +export function saveWarehouseUser(query) { + return axios({ + url: '/warehouse/inout/saveWarehouseUser', + method: 'post', + data: query + }); +} + +//添加单据类型 +export function saveWarehouseBussinessType(query) { + return axios({ + url: '/warehouse/inout/saveWarehouseBussinessType', + method: 'post', + data: query + }); +} + +//设置主管 +export function updateDirector(query) { + return axios({ + url: '/warehouse/inout/updateDirector', + method: 'post', + params: query + }); +} + diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 83f7cc6..f5123b7 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -48,6 +48,8 @@ row-key="id" border default-expand-all + highlight-current-row + @row-click="loadLinkData" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> +
+ +
+ 添加用户 +
+ + + + + + + + + + + + + + + +
+ 添加单据类型 +
+ + + + + + + +
+ @@ -127,6 +194,76 @@ + + + + + + + + + + + +
+ 取消 + + 提交 + +
+ + + + + + + + + + + + +
+ 取消 + + 提交 + +
+ + + { + this.userData = res.data; + }).catch((error) => { + console.log(error) + }); + + //加载单据类型数据 + warehouseBussinessTypeList(query).then((res) => { + this.bussinessTypeData = res.data; + }).catch((error) => { + console.log(error); + }); + }, + addUser() { + if (this.currentCode == null || this.currentCode == '') { + this.$message.error("请先选择仓库"); + } else { + this.userFormVisible = true; + getHospitalUserList().then((res) => { + this.selectUserList = this.userData; + this.userList = res.data; + this.userData.forEach(data => { + this.userList.forEach(user => { + if (user.id == data.userid) { + this.$refs.checkUserList.toggleRowSelection(user, true); + console.log(this.$refs.checkUserList) + } else { + this.$refs.checkUserList.toggleRowSelection(user, false); + } + }); + }); + }); + } + }, + handleUserSelectionChange(row) { + let _this = this; + _this.selectUserList = []; + row.forEach((item) => { + _this.selectUserList.push(item); + }) + }, + handleBussinessTypeSelectionChange(row) { + let _this = this; + _this.selectBussinessTypeList = []; + row.forEach((item) => { + _this.selectBussinessTypeList.push(item); + }) + }, + addUserData() { + this.userFormVisible = false; + let query = { + code: this.currentCode, + userList: JSON.stringify(this.selectUserList) + }; + saveWarehouseUser(query).then((res) => { + this.$message.success("添加成功"); + let loadParam = { + code: this.currentCode + }; + //重新加载数据 + warehouseUserList(loadParam).then((res) => { + this.userData = res.data; + }).catch((error) => { + console.log(error) + }); + }).catch((error) => { + console.log(error); + this.$message.error("添加失败"); + }); + }, + addBussinessType() { + if (this.currentCode == null || this.currentCode == '') { + this.$message.error('请先选择仓库'); + } else { + this.bussinessTypeFormVisible = true; + let query = { + enabled: true + }; + getJoinBussinessType(query).then((res) => { + this.bussinessTypeList = res.data.list; + this.bussinessTypeList.forEach(type => { + this.bussinessTypeData.forEach(data => { + if (type.action == data.action) { + this.$refs.typeList.toggleRowSelection(type, true); + } else { + //未匹配上取消勾选，清除数据缓存 + this.$refs.typeList.toggleRowSelection(type, false); + } + }); + }); + }).catch((error) => { + }); + } + }, + addBussinessTypeData() { + if (this.selectBussinessTypeList.length == 0) { + this.$message.error("请选择单据类型") + } else { + this.bussinessTypeFormVisible = false; + let query = { + code: this.currentCode, + bussinessTypes: JSON.stringify(this.selectBussinessTypeList) + }; + saveWarehouseBussinessType(query).then((res) => { + this.$message.success("添加成功"); + //重新加载数据表格 + let loadParam = { + code: this.currentCode + } + warehouseBussinessTypeList(loadParam).then((res) => { + this.bussinessTypeData = res.data; + }).catch((error) => { + }); + }).catch((error) => { + }); + } + }, + updateDirector(row) { + console.log(row) + let params = {id: row.id}; + updateDirector(params).then((res) => { + this.$message.success("设置成功"); + //重新加载表格数据 + let loadParam = { + code: this.currentCode + }; + //重新加载数据 + warehouseUserList(loadParam).then((res) => { + this.userData = res.data; + }).catch((error) => { + console.log(error) + }); + }).catch((error) => { + this.$message.error("设置失败"); + }); + } }, filters: { statusFilterType(status) { @@ -675,4 +970,5 @@ export default { diff --git a/src/views/userManage/admin/authRole.vue b/src/views/userManage/admin/authRole.vue index e68b375..84f01cf 100644 --- a/src/views/userManage/admin/authRole.vue +++ b/src/views/userManage/admin/authRole.vue @@ -529,7 +529,6 @@ export default { let query = {'roleId': row.id}; getBussinessTypeRole(query).then((res) => { this.multipleSelection = []; - let count = 0; if (res.data.length > 0) { this.bussinessTypeList.forEach(type => { res.data.forEach(data => {