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/router/index.js b/src/router/index.js index af1c53b..529c8db 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -17,6 +17,7 @@ import adminRouter from "../views/userManage/admin/router.vue"; import authAdmin from "../views/userManage/admin/authAdmin.vue"; import authRole from "../views/userManage/admin/authRole.vue"; import authPermissionRule from "../views/userManage/admin/authPermissionRule.vue"; +import authDept from "../views/userManage/authDept.vue"; import systemParamConfig from "../views/userManage/param/systemParamConfig.vue"; import registerManage from "../views/userManage/registerManage.vue"; import phoneRegisterManage from "../views/userManage/phoneRegisterManage.vue"; @@ -283,6 +284,15 @@ export const asyncRouterMap = [ authRule: ["authMange/auth_permission_rule"] } }, + { + path: "authDept", + component: authDept, + name: "部门管理", + icon: "", + meta: { + authRule: ["authMange/authDept"] + } + }, ] }, diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 330eb9b..3cb246b 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -195,11 +195,6 @@
- - - - - @@ -247,11 +243,6 @@ - - - - - - +
- - @@ -732,6 +721,18 @@ + + + + + @@ -757,6 +758,7 @@ import axios from "axios"; import store from "@/store"; import {findConfig} from "@/api/thrsys/spsSyncStatus"; import {isBlank} from "@/utils/strUtil"; +import relBusUserDialog from "./invWarehouseRelBusTypes"; const formJson = { id: null, @@ -830,6 +832,7 @@ export default { userList: null, bussinessTypeList: null, userFormVisible: false, + relBusUserVisile: false, currentCode: null, superRow: null, currentRow: {status: 1}, @@ -888,7 +891,8 @@ export default { page: 1, limit: 10 }, - bussinessTypeTotal: 0 + bussinessTypeTotal: 0, + curSeleUser: null, }; }, methods: { @@ -1330,6 +1334,9 @@ export default { this.getHospitalUser(); } }, + cancelRelBusDiaolog() { + this.relBusUserVisile = false; + }, getHospitalUser(val) { if (val != null) { this.hospitalUserQuery.page = val; @@ -1497,6 +1504,12 @@ export default { this.$message.error("移除失败"); }) }, + + relBusttype(row) { + this.curSeleUser = row; + this.relBusUserVisile = true; + }, + delWarehouseBussinessType(id) { let params = {id: id}; deleteWarehouseBussinessType(params).then((res) => { @@ -1674,6 +1687,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/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue index 4f0f38c..f8bd49f 100644 --- a/src/views/userManage/admin/authAdmin.vue +++ b/src/views/userManage/admin/authAdmin.vue @@ -102,7 +102,7 @@
- +
@@ -110,7 +110,8 @@
- +
@@ -122,7 +123,7 @@
@@ -135,7 +136,7 @@ @@ -146,12 +147,10 @@
- - + +
- - 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 @@ + + + diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index baa8079..5df3dd4 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -178,6 +178,7 @@ placeholder="请输入病人住院号" > + @@ -202,6 +203,39 @@ + + +
+ 所属部门： +
+ + + + + + {{ item.name }} + + + + + + @@ -431,6 +465,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 { @@ -521,6 +556,7 @@ export default { checkSuccess: false, codeDetail: null, editTitle: "编辑条码", + fromDeptOptions: [], }; }, components: { @@ -878,7 +914,7 @@ export default { this.formData.vailInv = this.curAction.vailInv; this.formData.codeFillCheck = this.curAction.codeFillCheck; } else { - this.curAction = {corpType:0,genUnit: false,changeEnable:false,}; + this.curAction = {corpType: 0, genUnit: false, changeEnable: false,}; this.formData.action = null; } @@ -945,6 +981,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; + }, + findStorageMethod() { if (this.formData.locStorageCode == null) return; diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue index 91a0020..6e80d8b 100644 --- a/src/views/warehouse/stockHospOrderNew.vue +++ b/src/views/warehouse/stockHospOrderNew.vue @@ -149,7 +149,6 @@ :value="item.code"> {{ item.name }} {{ item.code }} - @@ -161,6 +160,31 @@ placeholder="请输入病人住院号" > + + + + + {{ item.name }} + + + @@ -423,6 +447,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", @@ -523,6 +548,7 @@ export default { storageList: [], invQueryData: {}, subInvList: [], + fromDeptOptions: [], }; }, components: { @@ -560,17 +586,9 @@ export default { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { return this.$message.error('单据数量不能为0'); } - // if (this.$isBlank(this.codeArray[i].batchNo)) { - // if (!this.codeArray[i].allowNoBatch) { - // return this.$message.error('批次号不能为空'); - // } - // } if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { return this.$message.error('生产日期与失效日期不能全部为空'); } - // if (this.$isBlank(this.codeArray[i].expireDate)) { - // return this.$message.error('失效日期不能为空'); - // } } @@ -580,14 +598,6 @@ export default { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { return this.$message.error('单据数量不能为0'); } - - // if (!this.$isBlank(this.codeArray[i].productDate && this.codeArray[i].productDate.length != 6)) { - // return this.$message.error('生产日期格式错误'); - // } - // if (!this.$isBlank(this.codeArray[i].expireDate && this.codeArray[i].expireDate.length != 6)) { - // return this.$message.error('失效日期不能为空'); - // } - } } @@ -647,7 +657,7 @@ export default { } } }, - findStorageMethod(query) { + findStorageMethod() { if (this.formData.locStorageCode == null) return; this.fromStorageOptions = []; @@ -662,12 +672,32 @@ export default { this.fromStorageOptions.push(temp[i]); } } + }) + .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; + }, + + findSubStorageMethod() { let cQuery = { pcode: this.formData.corpId,