diff --git a/src/api/basic/invWarehouse.js b/src/api/basic/invWarehouse.js index 79766ec..dc2d853 100644 --- a/src/api/basic/invWarehouse.js +++ b/src/api/basic/invWarehouse.js @@ -41,3 +41,30 @@ export function deleteWarehouse(data) { data: data }); } + +//绑定第三方仓库 +export function bindThrWarehouse(params) { + return axios({ + url: "/spms/inv/warehouse/bindThrWarehouse", + method: "post", + params: params + }); +} + +//解绑第三方仓库 +export function unbindThrWarehouse(params) { + return axios({ + url: "/spms/inv/warehouse/unbindThrWarehouse", + method: "post", + params: params + }); +} + +//查询第三方系统和仓库数据关联信息 +export function getThrsysDetail(params) { + return axios({ + url: "/spms/inv/warehouse/thridSys/detail", + method: "get", + params: params + }); +} diff --git a/src/api/thrsys/thrInvWarehouse.js b/src/api/thrsys/thrInvWarehouse.js new file mode 100644 index 0000000..e007b2a --- /dev/null +++ b/src/api/thrsys/thrInvWarehouse.js @@ -0,0 +1,43 @@ +import axios from "../../utils/axios"; + +// 权限管理 + +// 获取列表 +export function filterThrList(query) { + return axios({ + url: "/spms/thrsys/warehouse/filter", + method: "get", + params: query + }); +} + +export function filterThrAll(query) { + return axios({ + url: "/spms/thrsys/warehouse/filterAll", + method: "get", + params: query + }); +} + + +// 保存 +export function saveThrWarehouse(data, formName, method = "post") { + let url = + formName !== "edit" + ? "/spms/thrsys/warehouse/save" + : "/spms/thrsys/warehouse/edit"; + return axios({ + url: url, + method: method, + data: data + }); +} + +// 删除 +export function deleteThrWarehouse(data) { + return axios({ + url: "/spms/thrsys/warehouse/delete", + method: "post", + data: data + }); +} diff --git a/src/router/index.js b/src/router/index.js index 5bf82d3..894b4fa 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -93,6 +93,7 @@ import udiinfoExportSmp from "../views/basic/UdiinfoExportSmp.vue"; import UdiInfoDonwloadSmp from "../views/basic/UdiInfoDonwloadSmp.vue"; import thrOrderExportSmp from "../views/thrsys/ThrOrderExportSmp.vue"; import thrProductsExportSmp from "../views/thrsys/ThrProductsExportSmp.vue"; +import thrInvWarehouse from "@/views/thrsys/ThrInvWarehouse"; // Vue.use(VueRouter); const err401 = r => @@ -641,6 +642,15 @@ export const asyncRouterMap = [ authRule: ["thrsys"] }, children: [ + { + path: "thrInvWarehouse", + component: thrInvWarehouse, + name: "仓库信息", + icon: "", + meta: { + authRule: ["thrsys/thrInvWarehouse"] + } + }, { path: "/products", redirect: "/products/thrProducts", diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 5e9dfa4..08c0a87 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -196,6 +196,41 @@ width="60%" top="5vh" > + + + + + + + + + + + @@ -241,6 +276,7 @@ +
取消
+ + + + + + + + + + + + + + + + +
+ 取消 + 提交 + +
+ @@ -259,8 +342,12 @@ import { filterList, saveWarehouse, - deleteWarehouse + deleteWarehouse, + bindThrWarehouse, + unbindThrWarehouse, + getThrsysDetail } from "../../api/basic/invWarehouse"; +import {filterThrList} from "@/api/thrsys/thrInvWarehouse"; const formJson = { id: null, @@ -314,11 +401,15 @@ export default { {required: true, message: "请输入仓库货位代码", trigger: "blur"} ] }, - pidData: {} - , - deleteLoading: false - } - ; + pidData: {}, + deleteLoading: false, + thrWarehouseData : null, + currentId: null, + thrWareHouseVisible: false, + sysList: [], + checkThrWarehouseRow: null, + currentSysId: null + }; }, methods: { /*eslint-disable */ @@ -382,6 +473,12 @@ export default { this.mergeList = []; this.treeList = []; }); + + //加载第三方仓库数据 + filterThrList().then((res) => { + this.thrWarehouseData = res.data.list; + }).catch((error) => { + }) }, // 刷新表单 resetForm() { @@ -403,6 +500,7 @@ export default { // 显示表单 handleForm(node, data, formName) { this.formVisible = true; + this.currentId = data.id; let no = this.getProjectNum() + Math.floor(Math.random() * 10000) this.pidData = data || null; formJson.pid = (data && parseInt(data.id)) || ""; @@ -419,8 +517,22 @@ export default { if (data && data.id) { this.index = this.mergeList.findIndex((d) => d.id === data.id); } + this.getThrsysDetail(); + }, + getThrsysDetail() { + let params = { + id: this.currentId + }; + getThrsysDetail(params) + .then((response) => { + this.loading = false; + this.sysList = response.data.list || []; + }) + .catch(() => { + this.loading = false; + this.sysList = []; + }); }, - handleSubForm(node, data, formName) { this.subFormVisible = true; @@ -538,6 +650,41 @@ export default { CurrentDate += '0' + Day } return CurrentDate + }, + //绑定第三方仓库 + bindThrWarehouse() { + this.thrWareHouseVisible = false; + let params = { + id: this.currentId, + thridWarehouseId: this.checkThrWarehouseRow.code, + sysId: this.currentSysId + } + bindThrWarehouse(params).then((res) => { + this.$message.success("绑定成功") + this.getThrsysDetail(); + }).catch((error) => { + this.$message.error("绑定失败") + }) + }, + //解绑第三方仓库 + unbindThrWarehouse(row) { + let params = { + id: this.currentId, + sysId: row.sysId + }; + unbindThrWarehouse(params).then((res) => { + this.$message.success("解绑成功"); + this.getThrsysDetail(); + }).catch((error) => { + this.$message.error("解绑失败"); + }) + }, + intentSelect(row) { + this.thrWareHouseVisible = true; + this.currentSysId = row.sysId; + }, + changeThrWarehouse(row){ + this.checkThrWarehouseRow = row; } }, filters: { diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue new file mode 100644 index 0000000..39c2402 --- /dev/null +++ b/src/views/thrsys/ThrInvWarehouse.vue @@ -0,0 +1,545 @@ + + + + +