From c342391e6569e33e656cb981ff2998bbb42f5af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 26 Jul 2023 17:59:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=91=E7=A5=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceRegByFp.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/inout/InvoiceRegByFp.vue b/src/views/inout/InvoiceRegByFp.vue index 3c6fb6ac..9a21419f 100644 --- a/src/views/inout/InvoiceRegByFp.vue +++ b/src/views/inout/InvoiceRegByFp.vue @@ -449,7 +449,7 @@ export default { imgList: [], imgViewerVisible: false, - + cowEn:null, //单据相关参数 orderLoading: false, orderList: [], @@ -686,6 +686,7 @@ export default { // this.resultDetailList = []; }, handleInvoiceChange(val) { + this.cowEn=val; this.getOrderList(val) this.getProductDetailList(val) }, @@ -694,11 +695,11 @@ export default { getProductDetailList(row) { this.productDetailLoading = true this.productDetailList = [] - if (row == null || isBlank(row.invoiceEncode)) { + if (this.cowEn == null || isBlank(this.cowEn.invoiceEncode)) { this.$message.error('请选择对应发票！') return } - this.productQuery.invoiceEncode = row.invoiceEncode + this.productQuery.invoiceEncode = this.cowEn.invoiceEncode productDetail(this.productQuery).then((res) => { this.productDetailLoading = false if (res.code === 20000) { From 5f86f75f4dd370bcc92dea9741217dfbaedc2af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Wed, 26 Jul 2023 18:05:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceRegByFp.vue | 14 ++++++++------ src/views/inout/InvoiceRegCkeck.vue | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/inout/InvoiceRegByFp.vue b/src/views/inout/InvoiceRegByFp.vue index 3c6fb6ac..7e703d27 100644 --- a/src/views/inout/InvoiceRegByFp.vue +++ b/src/views/inout/InvoiceRegByFp.vue @@ -253,6 +253,11 @@ prop="count" width="100" > + - + + @@ -318,7 +320,7 @@ - + Date: Wed, 26 Jul 2023 18:31:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 ++-- src/api/inout/order.js | 11 ++++++----- src/views/inout/DialogReviewOrder.vue | 3 +++ src/views/inout/DialogThrReviewOrder.vue | 21 +++++++++++---------- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.env.production b/.env.production index a24f0435..a35c8e44 100644 --- a/.env.production +++ b/.env.production @@ -31,13 +31,13 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/' # 平潭正式 -# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' # 吴总测试服务器 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' # 漳州中医院 -VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/' # 片仔癀诊断 # VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/' diff --git a/src/api/inout/order.js b/src/api/inout/order.js index 63e2179b..e50c8dee 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -48,6 +48,7 @@ export function submitBiz(query) { data: query }); } + export function delmitBiz(query) { return axios({ url: "/warehouse/inout/delmitBiz", @@ -164,11 +165,11 @@ export function filterOrderList(query) { } export function filterInvoiceList(query) { - return axios({ - url: "/udiwms/inout/order/filterInvoiceList", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/inout/order/filterInvoiceList", + method: "get", + params: query + }); } diff --git a/src/views/inout/DialogReviewOrder.vue b/src/views/inout/DialogReviewOrder.vue index 79d6c3f8..c576447c 100644 --- a/src/views/inout/DialogReviewOrder.vue +++ b/src/views/inout/DialogReviewOrder.vue @@ -180,6 +180,9 @@ export default { originCode: this.originCode, code: this.udiCode.trim(), } + if (tQuery.code.includes(tQuery.originCode.substr(0, tQuery.originCode.length - 1))) { + tQuery.originCode = ""; + } enterCodeWeb(tQuery).then((response) => { if (response.code === 20000) { this.$refs.inputRef.focus(); diff --git a/src/views/inout/DialogThrReviewOrder.vue b/src/views/inout/DialogThrReviewOrder.vue index 7ab31513..d116fc91 100644 --- a/src/views/inout/DialogThrReviewOrder.vue +++ b/src/views/inout/DialogThrReviewOrder.vue @@ -108,14 +108,14 @@ - - - - - - - - + + + + + + + + @@ -189,6 +189,9 @@ export default { originCode: this.originCode, code: this.udiCode.trim(), } + if (tQuery.code.includes(tQuery.originCode.substr(0,tQuery.originCode.length-1))) { + tQuery.originCode = ""; + } enterCodeWeb(tQuery).then((response) => { if (response.code === 20000) { this.$refs.inputRef.focus(); @@ -203,8 +206,6 @@ export default { this.originCode = this.udiCode; } else if (response.code == 501) { this.checkSuccess = false; - // this.$refs.inputRef.focus(); - // this.$refs.inputRef.select(); this.originCode = ""; this.$message.error(response.message); } else if (response.code == 503) {