diff --git a/src/api/inout/stockOrder.js b/src/api/inout/stockOrder.js index 9fb29e3..c9d407b 100644 --- a/src/api/inout/stockOrder.js +++ b/src/api/inout/stockOrder.js @@ -304,5 +304,22 @@ export function findOrderByStockOrder(query) { }); } +export function rollbackOrder(params) { + return axios({ + url: "/udiwms/stock/order/received/rollback", + method: "get", + params: params + }); +} + +export function rollUnReceivebackOrder(params) { + return axios({ + url: "/udiwms/stock/order/unReceive/rollback", + method: "get", + params: params + }); +} + + diff --git a/src/api/param/systemParamConfig.js b/src/api/param/systemParamConfig.js index 3e31d1e..e08f5ce 100644 --- a/src/api/param/systemParamConfig.js +++ b/src/api/param/systemParamConfig.js @@ -31,6 +31,7 @@ export function selectSysParamByKey(query) { params: query }); } + export function selectIp(query) { return axios({ url: "/udiwms/basic/thirdsys/selectIp", @@ -39,5 +40,15 @@ export function selectIp(query) { }); } +//获取产品信息设置 +export function finProductSet(query) { + return axios({ + url: "/udiwms/sys/config/selectByBasic", + method: "get", + params: query + }); +} + + diff --git a/src/router/index.js b/src/router/index.js index c2d50c8..774e95b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -440,7 +440,7 @@ export const asyncRouterMap = [ { path: "invWarehouse", component: invWarehouse, - name: "仓库 / 科室字典", + name: "仓库/科室字典", icon: "", meta: { authRule: ["basicProduct/invWarehouse"] diff --git a/src/views/basic/BasicThirdSys.vue b/src/views/basic/BasicThirdSys.vue index 3aaf586..c41c3ec 100644 --- a/src/views/basic/BasicThirdSys.vue +++ b/src/views/basic/BasicThirdSys.vue @@ -28,7 +28,6 @@ - @@ -65,8 +64,6 @@ - - - - - - 添加单据类型 + + 添加单据类型 + @@ -176,15 +173,15 @@ @@ -292,6 +291,15 @@ + + +
取消 @@ -317,13 +325,22 @@ style="width: 100%"> + + +
取消 @@ -638,7 +655,7 @@ - + { - if (res.code == 20000) { this.subList = res.data; - } }).catch((error) => { }); @@ -1297,16 +1323,21 @@ export default { this.$message.error("请先选择当前分库！") } else { this.userFormVisible = true; + this.hospitalUserQuery.page = 1; this.getHospitalUser(); } }, cancelRelBusDiaolog() { this.relBusUserVisile = false; }, - getHospitalUser() { - getHospitalUserList().then((res) => { + getHospitalUser(val) { + if (val != null) { + this.hospitalUserQuery.page = val; + } + getHospitalUserList(this.hospitalUserQuery).then((res) => { this.selectUserList = []; this.userList = res.data; + this.hospitalUserTotal = res.data.total; var that = this; that.$nextTick(() => { if (that.$refs.checkUserList) { @@ -1322,11 +1353,14 @@ export default { }) }); }, - getBussinessType() { - getJoinBussinessType().then((res) => { + getBussinessType(val) { + if (val != null) { + this.bussinessTypeQuery.page = val; + } + 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) { @@ -1410,6 +1444,7 @@ export default { this.$message.error("请先选择当前分库！") } else { this.bussinessTypeFormVisible = true; + this.bussinessTypeQuery.page = 1; this.getBussinessType(); } }, @@ -1423,20 +1458,27 @@ export default { bussinessTypes: JSON.stringify(this.selectBussinessTypeList) }; saveWarehouseBussinessType(query).then((res) => { - this.$message.success("添加成功"); - //重新加载数据表格 - this.busQuery = { - code: this.currentCode, - page: 1, - limit: 10 + + if (res.code == 20000) { + this.$message.success("修改成功！"); + //重新加载数据表格 + this.busQuery = { + code: this.currentCode, + page: 1, + limit: 10 + } + warehouseBussinessTypeList(this.busQuery).then((res) => { + this.bussinessTypeData = res.data.list; + this.busTotal = res.data.total; + }).catch((error) => { + this.bussinessTypeData = []; + this.busTotal = 0; + }); + } else { + this.$message.error(res.message); } - warehouseBussinessTypeList(this.busQuery).then((res) => { - this.bussinessTypeData = res.data.list; - this.busTotal = res.data.total; - }).catch((error) => { - this.bussinessTypeData = []; - this.busTotal = 0; - }); + + }).catch((error) => { }); } @@ -1464,6 +1506,24 @@ export default { 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; @@ -1530,7 +1590,7 @@ export default { }, intentSelect(row) { - if (row != null && row.sysId != undefined) + if (row != null) this.currentSysId = row.sysId; //加载第三方仓库数据 this.thirdQuery.thirdSysFk = this.currentSysId; @@ -1548,10 +1608,11 @@ export default { }, intentSubSelect(row) { - if (row != null) { this.thirdSubQuery.parentId = this.superRow.code; - this.thirdSubQuery.thirdSysFk = row.sysId; + if (row.sysId != null && row.sysId != undefined) { + this.thirdSubQuery.thirdSysFk = row.sysId; + } } this.thrSubWarehouseData = []; this.thrSubWareHouseVisible = true; @@ -1634,8 +1695,7 @@ export default { }).catch((error) => { }) }, - } - , + }, filters: { statusFilterType(status) { const statusMap = { @@ -1643,8 +1703,7 @@ export default { 1: "success", }; return statusMap[status]; - } - , + }, statusFilterName(status) { const statusMap = { 0: "禁用", @@ -1652,12 +1711,9 @@ export default { }; return statusMap[status]; } - , - } - , + }, mounted() { - } - , + }, components: { relBusUserDialog, }, @@ -1667,9 +1723,7 @@ export default { this.getList(); this.getSyncConfig(); } - , -} -; +};