From d794cfd71c9b5ca2f69d538199c73991fb7eaff0 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 2 Sep 2025 16:30:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=BC=80=E7=A5=A8?=
=?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E5=B7=B2=E5=BC=80=E7=A5=A8=EF=BC=8C?=
=?UTF-8?q?=E6=94=B6=E6=AC=BE=E7=8A=B6=E6=80=81=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../panel/CenterInvoiceHasOpenPanel.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
index 56ce17c9..f24eddc3 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
@@ -210,13 +210,13 @@
审核不通过
-
+
From 920c50b0903eb1536a60e1ba665ecf4d65f4d78b Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 3 Sep 2025 10:51:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=BC=80=E7=A5=A8?=
=?UTF-8?q?=E5=A4=84=E7=90=86=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7=E8=AE=B0?=
=?UTF-8?q?=E5=BD=95=E9=9A=90=E8=97=8F=E6=94=B6=E6=AC=BE=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../panel/CenterInvoiceRecordDealListPanel.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
index d39dfd24..d12844b0 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
@@ -201,12 +201,12 @@
审核不通过
-
+
From 8b176bb5a895d1e60830aff2457c548a579422e2 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Fri, 5 Sep 2025 11:08:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=8F=B7=E3=80=81?=
=?UTF-8?q?=E6=8E=A5=E5=8D=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../panel/CenterInvoiceHasOpenPanel.vue | 13 +++++++++++--
src/views/emis/emisWaybill/waybillGot.vue | 18 +++++++++++-------
2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
index f24eddc3..e0ff10e3 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
@@ -7,6 +7,7 @@
运单号
账单号
+ 发票号
-->
-
+
@@ -374,9 +375,10 @@ export default {
openComCode: null,
delFlag: null,
paymentStatus:null,
+ invoiceNo:null,
params:{
billCode:null,
- invoiceNo:null,
+ // invoiceNo:null,
}
},
};
@@ -464,10 +466,17 @@ export default {
if(this.queryOrderType=="1"){
this.queryParams.params.billCode=this.queryParams.queryCode;
this.queryParams.settleBillNo=null;
+ this.queryParams.invoiceNo=null;
}
else if(this.queryOrderType=="2"){
this.queryParams.params.billCode=null;
this.queryParams.settleBillNo=this.queryParams.queryCode;
+ this.queryParams.invoiceNo=null;
+ }
+ else if(this.queryOrderType=="3"){ //发票查询
+ this.queryParams.params.billCode=null;
+ this.queryParams.settleBillNo=null;
+ this.queryParams.invoiceNo=this.queryParams.queryCode;
}
listEmisSettleInvoiceRecord(this.addDateRange(this.queryParams, this.dateTimeRange,'createTime')).then(response => {
diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue
index 238a3650..3e714b86 100644
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@@ -1718,15 +1718,19 @@ methods: {
}
// });
// 获取企业税号
- if(['2', '4', '5'].includes(this.form.paymentType) || this.form.customerType == 2){ // 月结或者月结客户
+ if(['2', '4', '5'].includes(this.form.paymentType) || this.form.customerType == 2 || this.form.mainUserId){ // 月结单 或者 月结客户现金单 或者 月结客户子账户现金单
let params = {
- pageNum: 1, pageSize: 1, customerType: 2
- }
- if (['2', '4', '5'].includes(this.form.paymentType)) {
- params.monthlyPayCode = this.form.custNo; // 支付类型为月结
- } else {
- params.customerCode = this.form.customerCode; // 月结客户下单的现金单
+ pageNum: 1, pageSize: 1
}
+ if (this.form.mainUserId) {
+ params.id = this.form.mainUserId;
+ } else {
+ if (['2', '4', '5'].includes(this.form.paymentType)) {
+ params.monthlyPayCode = this.form.custNo; // 支付类型为月结
+ } else {
+ params.customerCode = this.form.customerCode; // 月结客户下单的现金单
+ }
+ }
const res = await listMonthUserAll(params);
if(res.rows.length > 0){