From 04b1a1f4b58fee6bee6ccaa9adf98e9261f3fcab Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 10 Apr 2023 10:02:34 +0800
Subject: [PATCH 1/3] =?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 | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index c9fd669..9c036be 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -138,7 +138,7 @@
+ @row-click="handleSelectionChange">
@@ -186,7 +186,7 @@
单据 {{ currentRow.billNo }}-单据详情
@@ -277,7 +277,7 @@
单据 {{ currentRow.billNo }}-发票信息
-
@@ -919,8 +919,10 @@ export default {
}
this.bizDetailLoading = true;
this.bizQuery.orderIdFk = this.currentRow.billNo;
- this.bizQuery.batchNo = row.batchNo;
- this.bizQuery.relId = row.bindRlFk;
+ if(row != null) {
+ this.bizQuery.batchNo = row.batchNo;
+ this.bizQuery.relId = row.bindRlFk;
+ }
filterListInvoice(this.bizQuery).then((res) => {
this.bizDetailLoading = false;
if (res.code === 20000) {
From ab8a18c45df079c698cda5499336651c733fa241 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 10 Apr 2023 10:43:01 +0800
Subject: [PATCH 2/3] =?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/IoSupAduitOrder.vue | 4 ++++
src/views/inout/IoSupSecAuditOrder.vue | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue
index 1275a30..54aa256 100644
--- a/src/views/inout/IoSupAduitOrder.vue
+++ b/src/views/inout/IoSupAduitOrder.vue
@@ -865,6 +865,10 @@ export default {
this.loading = false;
});
},
+ freshen(){
+ this.Upinvoice = false;
+ this.getOrderDetails();
+ },
onResultReset() {
this.resultQuery = {
orderId: null,
diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue
index 223818b..56b9fff 100644
--- a/src/views/inout/IoSupSecAuditOrder.vue
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@@ -967,7 +967,10 @@ export default {
this.acceptQuery = row;
this.acceptOrderVisible = true;
},
-
+ freshen(){
+ this.Upinvoice = false;
+ this.getOrderDetails();
+ },
//验收结束
closeAcceptDialog() {
From 304e3d0c5d28298948f9c03085cbd82f51db85a1 Mon Sep 17 00:00:00 2001
From: x_z
Date: Mon, 10 Apr 2023 10:51:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/product/productUdiType.vue | 6 +++---
src/views/inventory/InvSupPreInSerach.vue | 16 ++++++++--------
src/views/inventory/InvSupProuducts.vue | 14 +++++++-------
src/views/inventory/supInoutSearchOrder.vue | 4 ++--
src/views/inventory/trace/invUdiTraceOrder.vue | 6 ++++--
.../inventory/trace/sickerUdiTraceOrder.vue | 5 +++--
src/views/remind/invRemindMsg.vue | 8 ++++----
7 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/src/views/basic/product/productUdiType.vue b/src/views/basic/product/productUdiType.vue
index f76124a..101a49b 100644
--- a/src/views/basic/product/productUdiType.vue
+++ b/src/views/basic/product/productUdiType.vue
@@ -2,11 +2,11 @@
-
+
@@ -74,7 +74,7 @@
-
+
-
+
@@ -16,7 +16,7 @@
-
@@ -66,14 +66,14 @@
-
-
@@ -81,7 +81,7 @@
-
@@ -89,7 +89,7 @@
-
@@ -100,14 +100,14 @@
-
-
diff --git a/src/views/inventory/InvSupProuducts.vue b/src/views/inventory/InvSupProuducts.vue
index 9d45772..3176e1a 100644
--- a/src/views/inventory/InvSupProuducts.vue
+++ b/src/views/inventory/InvSupProuducts.vue
@@ -16,28 +16,28 @@
-
-
-
-
@@ -46,14 +46,14 @@
-
-
@@ -81,7 +81,7 @@
remote
clearable="true"
reserve-keyword
- placeholder="供应商名称"
+ placeholder="请选择供应商名称"
:remote-method="findMethod"
size="mini"
:loading="corpLoading"
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index 89c406a..8a32fa3 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -36,14 +36,14 @@
-
-
diff --git a/src/views/inventory/trace/invUdiTraceOrder.vue b/src/views/inventory/trace/invUdiTraceOrder.vue
index 810f83e..d720a50 100644
--- a/src/views/inventory/trace/invUdiTraceOrder.vue
+++ b/src/views/inventory/trace/invUdiTraceOrder.vue
@@ -5,14 +5,16 @@
:model="filterQuery"
size="mini"
v-if="searchVisible"
+ label-width="100px"
+ class="query-form"
>
-
+
-
-
+
+
-
+
-
@@ -106,7 +106,7 @@