diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue index c8446ee..ea737c0 100644 --- a/src/views/basic/BussinessTypeThird.vue +++ b/src/views/basic/BussinessTypeThird.vue @@ -32,7 +32,10 @@ >新增 - 更新下载 + 更新下载 + @@ -128,12 +131,13 @@ import { import modifyDialog from "./BussinessTypeThirdModify"; import axios from "axios"; -import {getBasicThirdSys} from "@/api/basic/basicThirdSys"; +import {filterDetailByKey, getBasicThirdSys} from "@/api/basic/basicThirdSys"; export default { data() { return { filterQuery: { + thirdSys: null, key: "", page: 1, limit: 20, @@ -159,6 +163,7 @@ export default { multipleSelection: [], uploadFileUrl: null, loading: false, + thirdSysDetail: {}, }; }, @@ -203,6 +208,7 @@ export default { .then((response) => { this.thirdSys = response.data.list || []; this.filterQuery.thirdSys = this.thirdSys[0].thirdId; + this.getThirdSysDetail(); }) .catch(() => { this.loading = false; @@ -216,7 +222,13 @@ export default { downloadBussinessType(query) .then((response) => { this.loading = false; - this.getList(); + if (response.code == 20000) { + this.getList(); + } else { + this.$message.error(response.message); + } + + }) .catch(() => { this.loading = false; @@ -318,6 +330,23 @@ export default { thirdSysChange() { this.getList(); }, + + getThirdSysDetail() { + let query = { + thirdSysFk: this.filterQuery.thirdSys, + key: "busTypeQueryUrl", + }; + filterDetailByKey(query) + .then((response) => { + this.thirdSysDetail = response.data; + }) + .catch(() => { + this.loading = false; + this.list = []; + }); + this.uploadData.thirdSys = this.query.thirdSysFk; + }, + getThirdSysFkName(thirdSys) { for (let i = 0; i < this.thirdSys.length; i++) { if (this.thirdSys[i].thirdId === thirdSys) { diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue index d7fe016..4cd454c 100644 --- a/src/views/thrsys/SysUdimsConfig.vue +++ b/src/views/thrsys/SysUdimsConfig.vue @@ -7,15 +7,36 @@ - 中继服务 + 同步服务 - - 是否启用 + + + + + + + + + 说明: 修改同步参数时,请关闭数据同步服务 + + + + + + + + 地址设置 + + + + - 服务地址: + 服务地址: + @@ -63,33 +85,34 @@ - + 单据类型 - 业务单据类型 - 扫码单据类型 - 第三方单据类型 + 业务单据类型 + 扫码单据类型 + 第三方单据类型 基础信息 - 耗材字典 - 往来单位字典 - 仓库字典 - 用户信息 + 耗材字典 + 往来单位字典 + 仓库字典 + 用户信息 第三方基础信息 - 第三方产品信息 - 第三方往来信息 - 第三方仓库信息 - 第三方业务单据 + 第三方产品信息 + 第三方往来信息 + 第三方仓库信息 + 第三方业务单据 @@ -102,14 +125,15 @@ - + 单据(单据状态) - 待校验单据 - 未验收单据 - 已完成单据 + 待校验单据 + 未验收单据 + 已完成单据 diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue index 34b72a8..2bf456c 100644 --- a/src/views/thrsys/ThrInvWarehouse.vue +++ b/src/views/thrsys/ThrInvWarehouse.vue @@ -36,6 +36,7 @@ >添加仓库 下载仓库 @@ -237,7 +238,7 @@ import { deleteThrWarehouse, download } from "../../api/thrsys/thrInvWarehouse"; -import {getBasicThirdSys} from "../../api/basic/basicThirdSys"; +import {filterDetailByKey, getBasicThirdSys} from "../../api/basic/basicThirdSys"; const formJson = { id: null, @@ -270,6 +271,8 @@ export default { children: "children", label: "name" }, + thirdSysDetail:{}, + total: 0, treeList: [], loading: true, @@ -570,6 +573,8 @@ export default { getBasicThirdSys(query) .then((response) => { this.thirdSys = response.data.list || []; + this.query.thirdSysFk = this.thirdSys[0].thirdId; + this.getThirdSysDetail(); }) .catch(() => { this.loading = false; @@ -591,7 +596,7 @@ export default { this.$message.success("下载完成"); this.getList(); } else { - this.$message.error("下载失败"); + this.$message.error(res.message); } }).catch((error) => { this.$message.error("下载失败"); @@ -599,7 +604,24 @@ export default { }, thirdSysFkChange(thirdSysFk) { console.log(thirdSysFk); - } + this.getThirdSysDetail(); + }, + + getThirdSysDetail() { + let query = { + thirdSysFk: this.query.thirdSysFk, + key: "warehouseQueryUrl", + }; + filterDetailByKey(query) + .then((response) => { + this.thirdSysDetail = response.data; + }) + .catch(() => { + this.loading = false; + this.list = []; + }); + this.uploadData.thirdSys = this.query.thirdSysFk; + }, }, filters: { statusFilterType(status) { diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue index 7dcdeb6..86737ef 100644 --- a/src/views/thrsys/thrOrderNew.vue +++ b/src/views/thrsys/thrOrderNew.vue @@ -1,355 +1,359 @@ - + - - - - 草稿保存 - - 提交单据 - - - + + + + 草稿保存 + + 提交单据 + + + - - - - - 单据号: - - - - - - - - - - 单据日期: - - - - - - - - - - + + + + + 单据号: + + + + + + + + + + 单据日期: + + + + + + + + + + - - - - 业务类型: - - - - - - - {{ item.thirdName }} - - - - + + + + 业务类型: + + + + + + + {{ item.thirdName }} + + + + - - - 往来单位: - - - - - - - {{ item.name }} - - - - - - - {{ item.name }} - {{ - item.code - }} - - - - - - - + + + 往来单位: + + + + + + + {{ item.name }} + + + + + + + {{ item.name }} + {{ + item.code + }} + + + + + + + - - - - - 当前仓库: - - + + + + + 当前仓库: + + - - - - - {{ item.name }} - - - - + + + + + {{ item.name }} + + + + - - - - - - - - 允许无库存出库 - - - + + + + + + + + 允许无库存出库 + + + - + - + - + - - - 产品录入 - - + + + 产品录入 + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - 编辑 - - 复制 - - 删除 - - - - - - + 编辑 + + 复制 + + 删除 + + + + + + - - - + + + - - - - + + + +