From 0c7116e4d3a362e30d6406d36f98470ce4ae23e0 Mon Sep 17 00:00:00 2001 From: MrZhai Date: Fri, 18 Mar 2022 15:58:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=AC=AC=E4=B8=89=E6=96=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93=E4=BF=A1=E6=81=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=202.=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE-=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=BF=A1=E6=81=AF=E7=BB=91=E5=AE=9A=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basic/invWarehouse.js | 27 ++ src/api/thrsys/thrInvWarehouse.js | 43 +++ src/router/index.js | 10 + src/views/basic/invWarehouse.vue | 235 +++++++++++- src/views/thrsys/ThrInvWarehouse.vue | 546 +++++++++++++++++++++++++++ 5 files changed, 854 insertions(+), 7 deletions(-) create mode 100644 src/api/thrsys/thrInvWarehouse.js create mode 100644 src/views/thrsys/ThrInvWarehouse.vue diff --git a/src/api/basic/invWarehouse.js b/src/api/basic/invWarehouse.js index a661087..703f072 100644 --- a/src/api/basic/invWarehouse.js +++ b/src/api/basic/invWarehouse.js @@ -120,3 +120,30 @@ export function deleteWarehouseBussinessType(params) { params: params }); } + +//绑定第三方仓库 +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 8c9cc30..e6429e1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -92,6 +92,7 @@ import invUdiTrace from "@/views/inventory/invUdiTrace"; import invUdiTraceOrder from "@/views/inventory/invUdiTraceOrder"; import additionalOrder from "@/views/warehouse/AdditionalOrder"; import invStatistics from "@/views/inventory/InvStatistics"; +import thrInvWarehouse from "@/views/thrsys/ThrInvWarehouse"; const err401 = r => @@ -477,6 +478,15 @@ export const asyncRouterMap = [ authRule: ["thrsys/manage"] }, children: [ + { + path: "thrInvWarehouse", + component: thrInvWarehouse, + name: "仓库信息", + icon: "", + meta: { + authRule: ["thrsys/thrInvWarehouse"] + } + }, { path: "/corps", redirect: "/corps/ThrCorps", diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index e0ab71f..3b94919 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -447,6 +447,157 @@ > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 禁用 + 正常 + + + + + + + + + + + + + + + + + + + + +
+ 取消 + 提交 + +
+ + + + + + + + + + + + + + + + + +
+ 取消 + 提交 + +
+ + @@ -457,8 +608,10 @@ import { deleteWarehouse, warehouseBussinessTypeList, warehouseUserList, saveWarehouseBussinessType, saveWarehouseUser, updateDirector, - deleteWarehouseUser, deleteWarehouseBussinessType + deleteWarehouseUser, deleteWarehouseBussinessType, + bindThrWarehouse, unbindThrWarehouse, getThrsysDetail } from "../../api/basic/invWarehouse"; +import {filterThrList} from "@/api/thrsys/thrInvWarehouse"; import {getHospitalUserList} from "../../api/auth/authUser"; import {getJoinBussinessType} from "../../api/basic/bussinessType"; import {formatDate} from "@/utils/date"; @@ -538,6 +691,12 @@ export default { selectUserList: [], selectBussinessTypeList: [], bussinessTypeFormVisible: false, + thrWarehouseData : null, + currentId: null, + thrWareHouseVisible: false, + sysList: [], + checkThrWarehouseRow: null, + currentSysId: null }; }, methods: { @@ -624,6 +783,7 @@ export default { handleForm(node, data, formName) { // let no = this.getProjectNum() + Math.floor(Math.random() * 10000) + this.currentId = data.id; this.pidData = data || null; formJson.pid = (data && parseInt(data.id)) || ""; this.formData = JSON.parse(JSON.stringify(formJson)); @@ -646,7 +806,20 @@ export default { // } this.getParentInv(this.formData.level); }, - + 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; this.pidData = data || null; @@ -661,6 +834,8 @@ export default { // if (data && data.id) { // this.index = this.mergeList.findIndex((d) => d.id === data.id); // } + + this.getThrsysDetail(); }, formSubmit() { this.$refs["dataForm"].validate((valid) => { @@ -690,10 +865,10 @@ export default { } } } else { - const parent = this.node.parent; - const children = parent.data.children || parent.data; - const index = children.findIndex((d) => d.id === data.id); - children.splice(index, 1, data); + // const parent = this.node.parent; + // const children = parent.data.children || parent.data; + // const index = children.findIndex((d) => d.id === data.id); + // children.splice(index, 1, data); } // 刷新表单 this.resetForm(); @@ -999,7 +1174,53 @@ export default { }).catch((error) => { this.$message.error("移除失败"); }) - } + }, + //绑定第三方仓库 + 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.currentSysId = row.sysId; + //加载第三方仓库数据 + filterThrList().then((res) => { + this.thrWarehouseData = res.data.list; + this.thrWareHouseVisible = true; + }).catch((error) => { + this.thrWarehouseData = []; + this.thrWareHouseVisible = true; + this.$message.error("第三方仓库数据加载失败"); + }); + }, + changeThrWarehouse(row){ + this.checkThrWarehouseRow = row; + }, + hideThrWarehouseTable() { + this.thrWareHouseVisible = false; + }, }, filters: { statusFilterType(status) { diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue new file mode 100644 index 0000000..7e8cd68 --- /dev/null +++ b/src/views/thrsys/ThrInvWarehouse.vue @@ -0,0 +1,546 @@ + + + + +