diff --git a/src/api/warehouse/warehouse.js b/src/api/warehouse/warehouse.js index f5fed7f..2b826b9 100644 --- a/src/api/warehouse/warehouse.js +++ b/src/api/warehouse/warehouse.js @@ -11,8 +11,8 @@ export const delWarehouse = data => createAPI(`warehouse/delWarehouse`,'POST',da export const getWareHouseTypeList = data => createAPI(`factory/tblbasedata/getTblBaseList`,'POST',data) -// 获取用户仓库授权列表 -export const getUserAccessWarehouseList = data => createAPI(`sys/user/getWarehouseAccess?userid=${data.userid}`,'GET') +// 获取用户当前工厂的已授权仓库,data 需带 userid 和 site - rqrq +export const getUserAccessWarehouseList = data => createAPI(`sys/user/getWarehouseAccess`,'get', data) // 保存用户仓库授权 export const saveUserAccessWarehouseList = data => createAPI(`sys/user/saveWarehouseAccess`,'POST',data) diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue index 6775278..7d01584 100644 --- a/src/views/modules/sys/user.vue +++ b/src/views/modules/sys/user.vue @@ -185,7 +185,7 @@
- 确定 + 确定 取消
@@ -299,6 +299,8 @@ export default { selectSitList: [], warehouseList: [], selectWarehouseList: [], + // 仓库授权保存中,防止重复提交把当前工厂授权删两次 - rqrq + warehouseSaveLoading: false, selectUser: {}, pageIndex: 1, pageSize: 20, @@ -455,39 +457,64 @@ export default { } }) }, - // 保存选中的授权仓库 + // 当前页顶工厂。仓库候选、已授权查询和保存必须用同一个 site - rqrq + currentAuthSite() { + return this.$store.state.user.site || '' + }, + // 保存当前工厂的仓库授权。右侧列表是要保留的仓库,空列表表示清空当前工厂授权 - rqrq saveUserAccessWarehouse() { - let accessWarehouseData = { + const site = this.currentAuthSite() + if (!site) { + this.$alert('请先选择工厂', '操作提示', { confirmButtonText: '确定' }) + return + } + if (!this.selectUser || !this.selectUser.username) { + this.$alert('请先选择用户', '操作提示', { confirmButtonText: '确定' }) + return + } + this.warehouseSaveLoading = true + const accessWarehouseData = { userid: this.selectUser.username, - accessWarehouseList: this.selectWarehouseList // selectWarehouseList已经是仓库ID数组 + site: site, + accessWarehouseList: this.selectWarehouseList } - saveUserAccessWarehouseList(accessWarehouseData).then(({data}) => { - if (data.code === 0) { + if (data && data.code === 0) { this.$message.success(data.msg || '操作成功') this.warehouseList = [] this.selectWarehouseList = [] this.warehouseVisible = false } else { - this.$message.warning(data.msg || '操作失败') + this.$alert((data && data.msg) || '操作失败', '操作提示', { confirmButtonText: '确定' }) } }).catch(() => { this.$message.error(this.$t('sys.user.saveWarehouseFailed')) + }).finally(() => { + this.warehouseSaveLoading = false }) }, - // 获取用户已授权的仓库列表 + // 查询该用户在当前工厂已授权的仓库,结果放到穿梭框右侧 - rqrq searchUserAccessWarehouseList() { - getUserAccessWarehouseList({userid: this.selectUser.username}).then(({data}) => { - if (data.code === 0) { + const site = this.currentAuthSite() + if (!site) { + this.selectWarehouseList = [] + this.$alert('请先选择工厂', '操作提示', { confirmButtonText: '确定' }) + return + } + getUserAccessWarehouseList({userid: this.selectUser.username, site: site}).then(({data}) => { + if (data && data.code === 0) { this.selectWarehouseList = data.dataList || [] + } else { + this.selectWarehouseList = [] + this.$alert((data && data.msg) || '获取仓库授权失败', '操作提示', { confirmButtonText: '确定' }) } }).catch(() => { this.$message.error(this.$t('sys.user.getWarehouseFailed')) }) }, - // 获取所有可用仓库 + // 获取当前工厂启用仓库,作为穿梭框全部可选项 - rqrq searchWarehouseList() { - getWarehouseListForAuth({active: 'Y',site:localStorage.getItem('site')}).then(({data}) => { + getWarehouseListForAuth({active: 'Y', site: this.currentAuthSite()}).then(({data}) => { if (data.code === 0) { // 转换为el-transfer需要的数据格式 this.warehouseList = (data.dataList || []).map(item => ({