From fd4af566a4e2ed97ea9f9c4cc0e920136086e9a5 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Mon, 8 May 2023 11:37:08 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E5=90=8E=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index 86a9ce2..36ce51b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -98,7 +98,7 @@ service.interceptors.response.use(res => { isRelogin.show = false; store.dispatch('LogOut').then(() => { Cookies.remove() - location.href = process.env.VUE_APP_CONTEXT_PATH + "index"; + location.href = process.env.VUE_APP_CONTEXT_PATH; }) }).catch(() => { isRelogin.show = false; From 229e79d1e74b52f548367618635126761c71f786 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 8 May 2023 13:03:14 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E5=8F=91=E7=A5=A8=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceCkeck.vue | 8 ++++---- src/views/inout/InvoiceRegistration.vue | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue index aef041a..5abd0bf 100644 --- a/src/views/inout/InvoiceCkeck.vue +++ b/src/views/inout/InvoiceCkeck.vue @@ -349,7 +349,7 @@ export default { { required: true, message: "请输入发票编码", trigger: "blur" }, ], price: [{ required: true, message: "请输入发票价格", trigger: "blur" }], - remark: [{ required: true, message: "请输入备注", trigger: "blur" }], + invoiceDate: [{ required: true, message: "请输入备注", trigger: "blur" }], }, certFileUrl: "", Upinvoice: false, @@ -473,7 +473,7 @@ export default { components: { AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer }, methods: { onSubmit() { - if (this.invoiceRow.length == 0) { + if (this.invoiceRow == null) { this.$message.error("请选择要登记的物资! "); return false; } @@ -493,8 +493,8 @@ export default { this.$message.error("发票价格不能为空！"); return; } - if (this.$isBlank(this.inputQuery.remark)) { - this.$message.error("备注不能为空！"); + if (this.$isBlank(this.inputQuery.invoiceDate)) { + this.$message.error("日期不能为空！"); return; } this.inputQuery.list = this.invoiceRow; diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue index 3702053..8840a96 100644 --- a/src/views/inout/InvoiceRegistration.vue +++ b/src/views/inout/InvoiceRegistration.vue @@ -196,7 +196,7 @@ - + - - - +
+
+ 上级产品编码:  +
+ +
- - - +
+
+ 包装级别:  +
+ +
- + - - - +
+
+ 包装级别:  +
+ +
- - - +
+
+ 包含下级包装数量:  +
+ +
@@ -327,6 +418,7 @@ import { updateDiProduct } from '@/api/supplier/supProductsAddDi' import { finProductSet } from '@/api/param/systemParamConfig' +import { selectOriginuuid } from '@/api/basic/product/udiInfo' export default { name: "SelectDIDetailDialog", @@ -352,6 +444,7 @@ export default { return { activeNames: ['1'], remark:"", + detailList:[], productRemarkSet:{} } }, @@ -383,12 +476,25 @@ export default { //出错了 } }) - } - + }, + getDetailList(detailQuery) { + selectOriginuuid(detailQuery) + .then((response) => { + this.detailList = response.data || []; + }) + .catch(() => { + this.detailList = []; + }); + }, }, created() { this.findBasicProductSet() + //获取产品标识列表 + let ttquery = { + uuid: this.editQuery.uuid, + }; + this.getDetailList(ttquery); }, }; @@ -396,12 +502,57 @@ export default { From e7f5af3d96658008bb8942114268b0f1361f9e9c Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 8 May 2023 17:28:23 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceRegistration.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue index a5bad4f..e4db1c5 100644 --- a/src/views/inout/InvoiceRegistration.vue +++ b/src/views/inout/InvoiceRegistration.vue @@ -947,7 +947,14 @@ export default { getInvList() { getInvListByUser() .then((response) => { - this.invList = response.data || []; + let invlist1= response.data || []; + for(var i=0;i { }); From d3316f91438ef607a3757944cdd6d4b868bcdf66 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 8 May 2023 17:57:13 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/InvPreInProductsDetail.vue | 1 + src/views/inventory/InvPreProductsDetail.vue | 1 + src/views/inventory/InvProductsDetail.vue | 1 + 3 files changed, 3 insertions(+) diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue index 68cbcb8..ab2ad28 100644 --- a/src/views/inventory/InvPreInProductsDetail.vue +++ b/src/views/inventory/InvPreInProductsDetail.vue @@ -107,6 +107,7 @@ prop="orderTime" width="150" show-overflow-tooltip + sortable="custom" :sort-orders="['ascending', 'descending']" > diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvPreProductsDetail.vue index ae17320..5fa6132 100644 --- a/src/views/inventory/InvPreProductsDetail.vue +++ b/src/views/inventory/InvPreProductsDetail.vue @@ -107,6 +107,7 @@ prop="orderTime" width="150" show-overflow-tooltip + sortable="custom" :sort-orders="['ascending', 'descending']" > diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue index f94d4f0..db1ba6d 100644 --- a/src/views/inventory/InvProductsDetail.vue +++ b/src/views/inventory/InvProductsDetail.vue @@ -105,6 +105,7 @@ prop="orderTime" width="150" show-overflow-tooltip + sortable="custom" :sort-orders="['ascending', 'descending']" > From c2faf51f0e21aee81d7800a128bf6fd84137d7e9 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 8 May 2023 18:12:36 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceCkeck.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue index a47e78d..6b8d731 100644 --- a/src/views/inout/InvoiceCkeck.vue +++ b/src/views/inout/InvoiceCkeck.vue @@ -168,6 +168,11 @@ > + - Date: Mon, 8 May 2023 18:42:29 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceCkeck.vue | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue index 6b8d731..8cae7e5 100644 --- a/src/views/inout/InvoiceCkeck.vue +++ b/src/views/inout/InvoiceCkeck.vue @@ -17,18 +17,18 @@ style="padding-top: 40px" > - - - - - - - + + + + + + + + + + + + From e6f66cafa0abc2cebd67f2596f392782c6fd6a33 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 8 May 2023 19:59:59 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceRegistration.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue index e4db1c5..801bc6c 100644 --- a/src/views/inout/InvoiceRegistration.vue +++ b/src/views/inout/InvoiceRegistration.vue @@ -1037,9 +1037,10 @@ export default { this.bizDetailLoading = true; this.bizQuery.orderIdFk = this.currentRow.billNo; if(row != null) { + this.bizQuery.orderIdFk=row.orderIdFk; this.bizQuery.batchNo = row.batchNo; this.bizQuery.relId = row.bindRlFk; - this.bizQuery.bizIdFk = row.id; + //this.bizQuery.bizIdFk = row.id; } filterListInvoice(this.bizQuery).then((res) => { this.bizDetailLoading = false; From 133c471532757f55f4e4d0077b6ba0b3c497f3ee Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Tue, 9 May 2023 10:45:01 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/IoDeliveryAuditOrder.vue | 6 +++++- src/views/inout/IoSupAduitOrder.vue | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue index 69c809f..4677d48 100644 --- a/src/views/inout/IoDeliveryAuditOrder.vue +++ b/src/views/inout/IoDeliveryAuditOrder.vue @@ -705,6 +705,7 @@ export default { this.$router.push({ path: "", }); + let invCode = this.filterQuery.invCode this.filterQuery = { id: "", billNo: null, @@ -715,8 +716,11 @@ export default { limit: 10, startTime: null, endTime: null, - invCode: this.$store.getters.locInvCode, + invCode : this.$store.getters.locInvCode }; + if(invCode!=this.$store.getters.locInvCode){ + this.getBusType(); + } this.actDateRange = []; this.getList(); }, diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue index c685e2d..e1d7fc8 100644 --- a/src/views/inout/IoSupAduitOrder.vue +++ b/src/views/inout/IoSupAduitOrder.vue @@ -570,6 +570,7 @@ export default { this.$router.push({ path: "", }); + let invCode = this.filterQuery.invCode this.filterQuery = { id: "", billNo: null, @@ -582,6 +583,9 @@ export default { endTime: null, invCode: this.$store.getters.locInvCode, }; + if(invCode!=this.$store.getters.locInvCode){ + this.getBusType(); + } this.actDateRange = []; this.getList(); }, From 00eaeb1afc9624d07f52d30444dae5bf95caee42 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 9 May 2023 15:01:24 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inout/orderDetailBiz.js | 9 +++ src/views/inout/DialogCheck.vue | 94 +++++++++++++------------ src/views/inout/InvoiceRegistration.vue | 86 +++++++++++----------- src/views/sync/SysUdimsConfig.vue | 4 +- 4 files changed, 102 insertions(+), 91 deletions(-) diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js index c568b4e..b237b36 100644 --- a/src/api/inout/orderDetailBiz.js +++ b/src/api/inout/orderDetailBiz.js @@ -41,6 +41,15 @@ export function updateById(data) { }); } + +export function updateBizById(data) { + return axios({ + url: "/udiwms/inout/bizDetail/updateById", + method: "post", + data: data + }); +} + export function insertInvoice(params) { return axios({ url: "/udiwms/inout/biz/insertInvoice", diff --git a/src/views/inout/DialogCheck.vue b/src/views/inout/DialogCheck.vue index 168431e..9794496 100644 --- a/src/views/inout/DialogCheck.vue +++ b/src/views/inout/DialogCheck.vue @@ -39,7 +39,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -164,10 +164,11 @@ - 检验报告预览 + style="text-align:right" @click="showImgViewer"> + 检验报告预览 - + @@ -181,13 +182,12 @@