From fd4cf37c021e766cf2e4e31699ad247283836bff Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 6 May 2023 15:23:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=BC=B9=E7=AA=97=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8E=A5=E5=8F=A3=E8=A2=AB=E5=88=A0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inout/order.js | 17 +++++++++ src/views/inout/DialogCreateOrder.vue | 45 +++++++++++++--------- src/views/sync/SysUdimsData.vue | 54 ++++++++++++++------------- 3 files changed, 73 insertions(+), 43 deletions(-) diff --git a/src/api/inout/order.js b/src/api/inout/order.js index e74e9ae2..2f501fd4 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -57,6 +57,7 @@ export function submitAllocateBiz(query) { }); } + export function saveOrderWeb(query) { return axios({ url: "/warehouse/inout/saveOrderWeb", @@ -437,6 +438,13 @@ export function getOrderList(params) { }); } +export function getOrderFilter(params) { + return axios({ + url: "udiwms/inout/preInorder/filter", + method: "get", + params: params + }); +} export function updateStatus(query) { return axios({ @@ -528,3 +536,12 @@ export function orderDetailAdd(params) { data: params }); } + +export function orderChange(query) { + return axios({ + url: "/udiwms/stock/order/change", + method: "post", + data: query + }); +} + diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index a54f3106..4e5d9d2b 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -362,6 +362,24 @@ > + + + + + + + @@ -387,6 +405,7 @@ import bizDetailPanel from "./PanelCreateOrderBizDetail"; import A from "../../plugins/KeyScaner"; import {findByInvUser} from "@/api/basic/busType"; import {getInvSpaceList} from "@/api/inventory/invSpace"; +import DialogSelectUnit from "./DialogSelectUnit"; export default { name: "ioCreateOrder", @@ -437,6 +456,7 @@ export default { produceDate: null, expireDate: null, serialNo: null, + relId: null, }, curInvOptions: [], @@ -447,7 +467,6 @@ export default { curPreInInvOptions: [], //预验收仓库 curPreInSpaceOptions: [], //预验收货位 - curAction: { corpType: 0, genUnit: false, @@ -516,6 +535,7 @@ export default { bizDetailPanel, editCodeDialog, DialogCreateOrderSelect, + DialogSelectUnit }, methods: { //获取用户仓库列表 @@ -819,9 +839,11 @@ export default { } else if (response.code == 503) { this.curRow = response.data; this.orderFormData.billNo = this.curRow.orderId; - this.refreshCodesPanel(); + this.codeFormData.relId = this.curRow.relId, + this.refreshCodesPanel(); this.selectUnitTitle = response.message; this.$message.error(response.message); + this.dialogTableVisible = true; } else if (response.code == 504) { this.$confirm(response.message, "提示", { confirmButtonText: "确定", @@ -1061,22 +1083,9 @@ export default { this.$router.go(-1); }, selectSupUnit(row) { - let query = { - id: this.curRow.id, - supId: row.erpId, - }; - updateCodeBindSup(query) - .then((response) => { - if (response.code == 20000) { - this.$message.success("绑定成功"); - this.orderFormData.id = this.curRow.orderId; - this.getCodeList(); - } else { - this.$message.error(response.message); - } - }) - .catch(() => { - }); + this.dialogTableVisible = false; + this.orderFormData.selectSupId = row.erpId; + this.addCode(); }, closeCodeDialog() { this.editOriginCodeVisible = false; diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue index 42fe0930..5b2f6331 100644 --- a/src/views/sync/SysUdimsData.vue +++ b/src/views/sync/SysUdimsData.vue @@ -25,21 +25,24 @@ 重置 查询 - - 同步单据 - - - 同步单据类型 - - 同步第三方基础数据 - - 同步用户信息 - - + 同步单据 + + + 同步单据类型 + + + 同步第三方基础数据 + + 同步用户信息 + + 同步系统设置信息 - + @@ -355,15 +358,15 @@ export default { } }) }, - uploadData(exportType){ - if(!this.filterQuery.syncTime){ + uploadData(exportType) { + if (!this.filterQuery.syncTime) { this.$message.error("请选择同步时间"); return false - } - let param = { - exportType : exportType, - syncTime: this.filterQuery.syncTime - } + } + let param = { + exportType: exportType, + syncTime: this.filterQuery.syncTime + } uploadData(param).then((response) => { if (response.code == 20000) { this.filterQuery.page = 1 @@ -371,12 +374,13 @@ export default { } else { this.$message.error(response.message); } - this.filterQuery.syncTime=null - setTimeout(()=>{ + this.filterQuery.syncTime = null + setTimeout(() => { this.getList(); - },666) + }, 666) }) - .catch(() => {}); + .catch(() => { + }); } },