diff --git a/src/api/auth/authDept.js b/src/api/auth/authDept.js new file mode 100644 index 0000000..70f0f08 --- /dev/null +++ b/src/api/auth/authDept.js @@ -0,0 +1,33 @@ +import axios from "../../utils/axios"; + +export function filterDepts(query) { + return axios({ + url: "/udi/auth/dept/filter", + method: "get", + params: query + }); +} + +export function addDept(data) { + return axios({ + url: "/udi/auth/dept/add", + method: "post", + data: data + }); +} + +export function updateDept(data) { + return axios({ + url: "/udi/auth/dept/update", + method: "post", + data: data + }); +} + +export function deleteDept(data) { + return axios({ + url: "/udi/auth/dept/delete", + method: "post", + data: data + }); +} diff --git a/src/api/inventory/invRelBusTypes.js b/src/api/inventory/invRelBusTypes.js new file mode 100644 index 0000000..5c2bc12 --- /dev/null +++ b/src/api/inventory/invRelBusTypes.js @@ -0,0 +1,22 @@ +import axios from "../../utils/axios"; + + +export function filterSelectInvUser(query) { + return axios({ + url: "/spms/bus/user/select/filter", + method: "get", + params: query + }); +} + + +export function updateInvUser(query) { + return axios( + { + url: "/spms/bus/user/warehouse/update", + method: "post", + data: query + } + ) +} + diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 784f22e..d796c4c 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -102,7 +102,7 @@ 添加分库 - - - - - - - - - - 移除 + - + - + @@ -556,6 +547,7 @@ - - @@ -722,7 +712,7 @@ @current-change="handleSubCurrentChange" layout="prev, pager, next" :total="subTotal" - :current-page="thirdQuery.page" + :current-page="thirdSubQuery.page" >
@@ -736,6 +726,18 @@
+ + + + + @@ -761,6 +763,8 @@ import axios from "axios"; import store from "@/store"; import {findConfig} from "@/api/thrsys/spsSyncStatus"; import {isBlank} from "@/utils/strUtil"; +import relBusUserDialog from "./invWarehouseRelBusTypes"; +import {selectSysParamByKey} from "@/api/param/systemParamConfig"; const formJson = { id: null, @@ -834,6 +838,7 @@ export default { userList: null, bussinessTypeList: null, userFormVisible: false, + relBusUserVisile: false, currentCode: null, superRow: null, currentRow: {status: 1}, @@ -868,6 +873,8 @@ export default { thirdSysFk: "thirdId", }, configParms: {}, + + mutiInvMode: true, subData: {}, subFromName: "add", userQuery: { @@ -892,7 +899,8 @@ export default { page: 1, limit: 10 }, - bussinessTypeTotal: 0 + bussinessTypeTotal: 0, + curSeleUser: null, }; }, methods: { @@ -904,6 +912,8 @@ export default { name: "", status: "", }; + this.userQuery.page = 1; + this.busQuery.page = 1; this.getList(); }, onSubmit() { @@ -941,7 +951,6 @@ export default { }, // 显示表单 handleForm(data, formName) { - // let no = this.getProjectNum() + Math.floor(Math.random() * 10000) if (null != data) { this.currentId = data.id; this.thirdSysVisible = true; @@ -960,15 +969,10 @@ export default { this.formData = Object.assign({}, data); } else { - // this.formData.code = no; this.formVisible = true; } this.formName = formName; - // if (data && data.id) { - // this.index = this.mergeList.findIndex((d) => d.id === data.id); - // } this.getParentInv(this.formData.level); - this.getThrsysDetailData(); }, getThrsysDetailData() { @@ -1285,20 +1289,20 @@ export default { loadLinkData(row) { this.userQuery.page = 1; - this.userQuery.code = row.code; - this.busQuery.page = 1; + this.userQuery.code = row.code; this.busQuery.code = row.code; //加载用户数据 - this.loadUserData(); + this.loadUserList(); //加载单据类型数据 - this.loadBusData(); + this.loadBusList(); }, - loadUserData(val) { + loadUserList(val) { if (val != null) { this.userQuery.page = val; } + //加载用户数据 warehouseUserList(this.userQuery).then((res) => { this.userData = res.data.list; this.userTotal = res.data.total; @@ -1306,10 +1310,11 @@ export default { this.$message.error("用户数据加载失败") }); }, - loadBusData(val) { + loadBusList(val) { if (val != null) { this.busQuery.page = val; } + //加载单据类型数据 warehouseBussinessTypeList(this.busQuery).then((res) => { this.bussinessTypeData = res.data.list; this.busTotal = res.data.total; @@ -1331,6 +1336,9 @@ export default { this.getHospitalUser(); } }, + cancelRelBusDiaolog() { + this.relBusUserVisile = false; + }, getHospitalUser(val) { if (val != null) { this.hospitalUserQuery.page = val; @@ -1361,7 +1369,7 @@ export default { getJoinBussinessType(this.bussinessTypeQuery).then((res) => { this.selectBussinessTypeList = []; this.bussinessTypeList = res.data.list; - this.bussinessTypeTotal = res.data.total; + var that = this; that.$nextTick(() => { if (that.$refs.typeList) { @@ -1498,6 +1506,12 @@ export default { this.$message.error("移除失败"); }) }, + + relBusttype(row) { + this.curSeleUser = row; + this.relBusUserVisile = true; + }, + delWarehouseBussinessType(id) { let params = {id: id}; deleteWarehouseBussinessType(params).then((res) => { @@ -1650,6 +1664,20 @@ export default { }) .catch(() => { }); + + + let query = { + paramKey: "muti_inv_mode", + }; + selectSysParamByKey(query).then((response) => { + if (response.code == 20000) { + if (response.data.paramValue == "1") { + this.mutiInvMode = true; + } else { + this.mutiInvMode = false; + } + } + }); }, } , @@ -1675,6 +1703,9 @@ export default { mounted() { } , + components: { + relBusUserDialog, + }, created() { // 加载表格数据 this.init(); diff --git a/src/views/basic/invWarehouseRelBusTypes.vue b/src/views/basic/invWarehouseRelBusTypes.vue new file mode 100644 index 0000000..4a5d246 --- /dev/null +++ b/src/views/basic/invWarehouseRelBusTypes.vue @@ -0,0 +1,134 @@ + + + + diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue index 72f6c61..cd2a956 100644 --- a/src/views/business/stockOrderNewDistribution.vue +++ b/src/views/business/stockOrderNewDistribution.vue @@ -164,6 +164,7 @@ +
@@ -210,10 +211,44 @@ + + + +
+ 所属部门： +
+ + + + + + {{ item.name }} + + + + +
@@ -423,6 +458,7 @@ import {filterAll, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehou import dialogInvProduct from "../inventory/DialogInvProduct" import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {isBlank} from "@/utils/strUtil"; +import {filterDepts} from "@/api/auth/authDept"; export default { name: "idQuery", @@ -460,6 +496,7 @@ export default { type: null, corpName: "", corpId: "", + deptCode: null, }, formRules: { corpName: [ @@ -1273,7 +1310,26 @@ export default { }) .catch(() => { }); - } + }, + findDeptMethod() { + let query = { + flag: 1 + }; + filterDepts(query) + .then((response) => { + this.loading = false; + this.fromDeptOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + this.fromDeptOptions = []; + }); + }, + + deptChange(row) { + this.formData.corpId = row.code; + this.formData.corpName = row.name; + }, }, @@ -1305,6 +1361,7 @@ export default { noInvOut: "", locStorageCode: store.getters.locInvCode, invWarehouseCode: store.getters.locSubInvCode, + deptCode: null, }; this.iCount = 0; this.orderEditor = false; diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index 02c4c2a..bcb0ec7 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -200,6 +200,39 @@ + + +
+ 所属部门： +
+ + + + + + {{ item.name }} + + + + + + @@ -431,7 +464,7 @@ import selectRlDialog from "./DialogSelectRl"; import editCodeDialog from "./editCode"; import A from "../../plugin/KeyScaner" import {deleteLog} from "@/api/basic/udiinfolog"; - +import {filterDepts} from "@/api/auth/authDept"; export default { name: "idQuery", @@ -481,7 +514,7 @@ export default { fromSubInvCode: null, codeFillCheck: null, vailInv: null, - + deptCode: null, }, editOriginCodeVisible: false, curId: null, @@ -521,6 +554,7 @@ export default { checkSuccess: false, codeDetail: null, editTitle: "编辑条码", + fromDeptOptions: [], }; }, components: { @@ -544,6 +578,7 @@ export default { fromCorpId: this.formData.fromCorpId, outChangeEnable: this.formData.outChangeEnable, preCheck: this.formData.preCheck, + deptCode: this.formData.deptCode, } submitOrderWeb(tQuery) .then((response) => { @@ -999,6 +1034,26 @@ export default { } , + findDeptMethod() { + let query = { + flag: 1 + }; + filterDepts(query) + .then((response) => { + this.loading = false; + this.fromDeptOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + this.fromDeptOptions = []; + }); + }, + + deptChange(row) { + this.formData.corpId = row.code; + this.formData.corpName = row.name; + }, + getStorage(event) { this.storageList = []; diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue index 0351e13..e1fc25f 100644 --- a/src/views/userManage/admin/authAdmin.vue +++ b/src/views/userManage/admin/authAdmin.vue @@ -99,7 +99,7 @@
- +
@@ -107,7 +107,8 @@
- +
@@ -120,7 +121,7 @@ @@ -132,7 +133,7 @@ @@ -144,8 +145,8 @@
- - + +
diff --git a/src/views/userManage/authDept.vue b/src/views/userManage/authDept.vue new file mode 100644 index 0000000..4e8b358 --- /dev/null +++ b/src/views/userManage/authDept.vue @@ -0,0 +1,326 @@ + + +