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] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=8F=B7=E3=80=81=E6=8E=A5?=
 =?UTF-8?q?=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 @@
                 <el-radio-group class="query-label" v-model="queryOrderType">
                   <el-radio :key="1" label="1">运单号</el-radio>
                   <el-radio :key="2" label="2">账单号</el-radio>
+                  <el-radio :key="3" label="3">发票号</el-radio>
                 </el-radio-group>
             </div>
             <XdTextareaInput
@@ -239,7 +240,7 @@
       <!-- <el-table-column :label="$t('开票地址')" align="center" prop="companyAddress" min-width="100" :show-overflow-tooltip="true"/> -->
       <!-- <el-table-column :label="$t('联系人')" align="center" prop="contact" min-width="100" :show-overflow-tooltip="true"/> -->
       <!-- <el-table-column :label="$t('联系电话')" align="center" prop="phone" min-width="100" :show-overflow-tooltip="true"/> -->
-      <!-- <el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="170" :show-overflow-tooltip="true" /> -->
+      <el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="170" :show-overflow-tooltip="true" />
 
       <el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="170" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('申请人')" align="center" prop="createByName" min-width="100" :show-overflow-tooltip="true"/>
@@ -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){