diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue index 56ce17c9..e0ff10e3 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue @@ -7,6 +7,7 @@ 运单号 账单号 + 发票号 审核不通过 - + @@ -239,7 +240,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/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 @@ 审核不通过 - + 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){