diff --git a/src/api/inventory/invRelBusTypes.js b/src/api/inventory/invRelBusTypes.js index 5c2bc12..abdcf5b 100644 --- a/src/api/inventory/invRelBusTypes.js +++ b/src/api/inventory/invRelBusTypes.js @@ -20,3 +20,13 @@ export function updateInvUser(query) { ) } +export function filterUserBusTypeList(query) { + return axios( + { + url: "spms/bus/user/filterUserBusList", + method: "get", + params: query + } + ) +} + diff --git a/src/router/index.js b/src/router/index.js index b16ab2b..c2d50c8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -248,7 +248,7 @@ export const asyncRouterMap = [ { path: "authDept", component: authDept, - name: "部门管理", + name: "科室管理", icon: "", meta: { authRule: ["authMange/authDept"] @@ -440,7 +440,7 @@ export const asyncRouterMap = [ { path: "invWarehouse", component: invWarehouse, - name: "仓库字典", + name: "仓库 / 科室字典", icon: "", meta: { authRule: ["basicProduct/invWarehouse"] diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index 4912e6c..e757ea0 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -713,6 +713,22 @@ + + +
+
+ 进口产品代理商:  +
+ +
+ + +
diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue index bf1f08a..f368601 100644 --- a/src/views/basic/basicCompanyProductsImport.vue +++ b/src/views/basic/basicCompanyProductsImport.vue @@ -575,13 +575,6 @@ >
- - - 以使用单元数量入库 - - - @@ -736,7 +729,6 @@ export default { handleDetail(row) { this.editQuery = row; - console.log(row); }, combine() { @@ -769,7 +761,6 @@ export default { this.loading = false; if (response.code == 20000) { this.$message.success(response.data); - console.log("关闭弹窗"); this.$emit("closeSelDialog", true); this.closeSelDialog(); } else { @@ -823,7 +814,6 @@ export default { }); }, handleSelectionChange(val) { - console.log("----" + val); this.multipleSelection = val; }, @@ -846,7 +836,6 @@ export default { page: 1, limit: 10, }; - console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy); this.getDetailList(ttquery); this.getThirdSysDetail(); @@ -935,7 +924,6 @@ export default { components: {}, created() { - console.log(" this.filterQuery.unitFk = " + this.unitFk) this.getList(); this.selectSysParam(); }, diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 5f010f7..113f3f2 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -162,7 +162,7 @@ size="small" :disabled="!configParms.basicInv" @click.native.stop="addUser(scope.row)" - >添加用户 + >管理用户 添加单据类型 + >管理单据类型 + style="width: 100%" + highlight-current-row + @current-change="loadUserBusType" + > @@ -246,6 +241,9 @@ +
+ {{ busTableTitle }} +
- - - { + this.bussinessTypeData = res.data.list; + this.busTotal = res.data.total; + }).catch((error) => { + this.$message.error("单据类型数据加载失败") + }); + } else { + this.getUserBusTypeList(val); } - //加载单据类型数据 - warehouseBussinessTypeList(this.busQuery).then((res) => { - this.bussinessTypeData = res.data.list; - this.busTotal = res.data.total; - }).catch((error) => { - this.$message.error("单据类型数据加载失败") - }); }, addUser(row) { this.currentCode = row.code; @@ -1464,48 +1458,12 @@ export default { this.$message.error("设置失败"); }); }, - delWarehouseUser(id) { - let params = {id: id}; - deleteWarehouseUser(params).then((res) => { - if (res.code == 20000) { - this.$message.success("已移除"); - for (let i = 0; i < this.userData.length; i++) { - if (this.userData[i].id == id) { - this.userData.splice(i, 1); - return; - } - } - } else { - this.$message.error(res.message); - } - }).catch((error) => { - this.$message.error("移除失败"); - }) - }, relBusttype(row) { this.curSeleUser = row; this.relBusUserVisile = true; }, - delWarehouseBussinessType(id) { - let params = {id: id}; - deleteWarehouseBussinessType(params).then((res) => { - if (res.code == 20000) { - this.$message.success("已移除"); - for (let i = 0; i < this.bussinessTypeData.length; i++) { - if (this.bussinessTypeData[i].id == id) { - this.bussinessTypeData.splice(i, 1); - return; - } - } - } else { - this.$message.error("移除失败"); - } - }).catch((error) => { - this.$message.error("移除失败"); - }) - }, //绑定第三方仓库 bindThrWarehouse() { this.thrWareHouseVisible = false; @@ -1655,6 +1613,27 @@ export default { } }); }, + loadUserBusType(row) { + this.busTableTitle = row.employeeName + " 用户关联单据类型"; + this.curSeleUser = row; + this.getUserBusTypeList(1); + }, + + getUserBusTypeList(page) { + let queryParam = { + subInvCode: this.currentCode, + userId: this.curSeleUser.userid, + page: page, + limit: 10 + }; + filterUserBusTypeList(queryParam).then((res) => { + if (res.code === 20000) { + this.bussinessTypeData = res.data.list || []; + this.bussinessTypeTotal = res.data.total || 0; + } + }).catch((error) => { + }) + }, } , filters: { diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index 889ad83..b86f559 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -203,7 +203,7 @@
- 所属部门： + 使用科室：
@@ -471,6 +471,7 @@ import selectRlDialog from "./DialogSelectRl"; import editCodeDialog from "./editCode"; import A from "../../plugin/KeyScaner" import {isBlank} from "@/utils/strUtil"; +import {selectSysParamByKey} from "@/api/param/systemParamConfig"; export default { @@ -561,6 +562,7 @@ export default { checkSuccess: false, codeDetail: null, editTitle: "编辑条码", + enableDept: false }; }, components: { @@ -1259,6 +1261,15 @@ export default { } } this.findSubInvByInv(this.formData.locStorageCode); + + //查询是否启用多级仓库，判断是否启用部门 + selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => { + if (res.code === 20000) { + if (res.data.paramValue === "0") { + this.enableDept = true; + } + } + }) } }; diff --git a/src/views/thrsys/ThrProductsAdd.vue b/src/views/thrsys/ThrProductsAdd.vue index b5620d7..ec8ef37 100644 --- a/src/views/thrsys/ThrProductsAdd.vue +++ b/src/views/thrsys/ThrProductsAdd.vue @@ -259,6 +259,23 @@ + + + +
+
+ 进口产品代理商:  +
+ +
+ + +
@@ -307,6 +324,7 @@ export default { qxlb: null, cpms: null, thirdSys: null, + cpdls: null }, thirdSys: [], }