From e091eabb7aa740db9bd4ac1e36ff075dcba9a555 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 14 Aug 2024 20:38:23 +0800 Subject: [PATCH] md --- src/api/emis/emisSettleBill.js | 9 + src/components/ImageUpload/index.vue | 18 +- src/components/XdTextareaInput/index.vue | 2 +- src/views/emis/emisSettleBill/index.vue | 9 +- .../panel/BillDetailPanelReadOnly.vue | 30 ++- .../panel/ChargeBillMoneyPanel.vue | 2 +- .../panel/ChargeBillMonthPanel.vue | 2 +- .../emisSettleBill/panel/SiteConfimPanel.vue | 22 +- .../panel/SiteWaitOpenBillPanel.vue | 2 +- .../InvoiceChRecordListReadOnly.vue | 32 ++- .../emisSettleInvoiceRecordForm.vue | 2 +- .../panel/InvoiceRecordList.vue | 84 ++++++-- src/views/emis/emisSettlePayRecord/index.vue | 47 ++--- .../panel/PayRecordList.vue | 7 +- .../SubBillConfirmBySiteList.vue | 194 ++++++++++++------ .../emis/emisSettleSubBill/SubBillList.vue | 2 +- .../statpanel/ScanDtlListPanel.vue | 1 + .../emisWaybillAjustApplyForm.vue | 2 +- 18 files changed, 311 insertions(+), 156 deletions(-) diff --git a/src/api/emis/emisSettleBill.js b/src/api/emis/emisSettleBill.js index 25797163..2e783b3c 100644 --- a/src/api/emis/emisSettleBill.js +++ b/src/api/emis/emisSettleBill.js @@ -25,6 +25,15 @@ export function confirmSettleBillBySite(id) { }) } + +// 站点取消确认 +export function cancelConfirmBillBySite(id) { + return request({ + url: '/emis/emisSettleBill/cancelConfirmBillBySite/' + id, + method: 'post' + }) +} + // 站点确认不开票 export function confirmNotOpenBillBySite(id) { return request({ diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 0db48779..cb32f779 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -219,21 +219,21 @@ export default { } :deep .el-upload--picture-card { - width: 50px!important; - height: 50px!important; - line-height:50px!important; + width: 60px!important; + height: 60px!important; + line-height:60px!important; } :deep .el-upload-list--picture-card { - width: 50px!important; - height: 50px!important; - line-height:50px!important; + width: 60px!important; + height: 60px!important; + line-height:60px!important; } :deep .el-upload-list--picture-card .el-upload-list__item { - width: 50px!important; - height: 50px!important; - line-height:50px!important; + width: 60px!important; + height: 60px!important; + line-height:60px!important; } diff --git a/src/components/XdTextareaInput/index.vue b/src/components/XdTextareaInput/index.vue index e2ff1a6f..dd01d1cf 100644 --- a/src/components/XdTextareaInput/index.vue +++ b/src/components/XdTextareaInput/index.vue @@ -69,7 +69,7 @@ export default { .clearButton { position: absolute; border-radius: 5px; - right: 3px; + right: 10px; z-index: 2; border: none; top: -3px; diff --git a/src/views/emis/emisSettleBill/index.vue b/src/views/emis/emisSettleBill/index.vue index a89cb244..4c7f73d1 100644 --- a/src/views/emis/emisSettleBill/index.vue +++ b/src/views/emis/emisSettleBill/index.vue @@ -19,10 +19,6 @@ - - - - @@ -196,6 +192,11 @@ 已核销 + + + diff --git a/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue b/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue index 917ee1e9..27156fb1 100644 --- a/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue +++ b/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue @@ -46,7 +46,7 @@ 已收款 部分收款 -
收款明细：总应收:￥{{ settleBillItem.recMoney }},￥已收:{{ settleBillItem.recedMoney }}
+
收款明细：总应收:￥{{ settleBillItem.recMoney }},已收:￥{{ settleBillItem.recedMoney }}
@@ -54,7 +54,7 @@
- 开票状态: + 开票申请: 未开票 已开票 部分开票 @@ -62,16 +62,23 @@
- + +
+ + +
-
- 子账单列表: -
-
- -
+
+
+ 子账单列表: +
+
+ +
@@ -81,6 +88,8 @@ import { getInfoBySettleBillNo } from "@/api/emis/emisSettleBill"; import PayRecordList from '@/views/emis/emisSettlePayRecord/panel/PayRecordList.vue'; import InvoiceRecordList from '@/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue'; import SubBillList from '@/views/emis/emisSettleSubBill/SubBillList.vue'; +import InvoiceChRecordListReadOnly from '@/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue'; + export default { name: "BillDetailPanel", props:{ @@ -91,7 +100,8 @@ export default { components: { PayRecordList, InvoiceRecordList, - SubBillList + SubBillList, + InvoiceChRecordListReadOnly }, dicts: [ ], diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue index e5f4f52e..60dff340 100644 --- a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue +++ b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue @@ -238,7 +238,7 @@ - + diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue index 2653bca4..e3e2cc39 100644 --- a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue +++ b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue @@ -240,7 +240,7 @@ - + diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue index 0c085c00..9d146f3e 100644 --- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue +++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue @@ -123,7 +123,7 @@ >确认账单 - + - + @@ -111,7 +111,7 @@ - + @@ -131,7 +131,11 @@ export default { }, applySeqNo:{ type:String - } + }, + settleBillNo:{ + type:String + }, + }, components: { elDateSimplePicker,emisSettleInvoiceChRecordForm }, dicts: ['emis_invoice_ch_type' @@ -172,7 +176,7 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 20, + pageSize: 50, reqNo: null, applySeqNo: this.applySeqNo, blEcinv: null, @@ -204,11 +208,14 @@ export default { opDate: null, opSiteCode: null, openChId: null, - openChStatus: null, + openChStatus: '2', openChStatusDesc: null, openComCode: null, extData: null, remark: null, + params:{ + settleBillNo:this.settleBillNo + } }, }; }, @@ -222,6 +229,15 @@ export default { }, deep: true }, + "settleBillNo": { + handler (newValue, oldValue) { + this.queryParams.params.settleBillNo = this.settleBillNo; + if(this.settleBillNo){ + this.getList(); + } + }, + deep: true + }, }, created() { @@ -231,7 +247,7 @@ export default { /** 查询渠道开票记录表列表 */ getList() { this.loading = true; - listEmisSettleInvoiceChRecord(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => { + listEmisSettleInvoiceChRecord(this.queryParams).then(response => { this.emisSettleInvoiceChRecordList = response.rows; this.total = response.total; this.loading = false; diff --git a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue index c0f3123c..6c7958a9 100644 --- a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue +++ b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue @@ -284,7 +284,7 @@ export default { this.$modal.msgSuccess("新增成功"); let empName=this.$store.getters.empName; let message=empName+" 提交了开票申请,请及时开票！"; - this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059",message); + this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059,88888083",message); this.$emit("on-changed"); }); diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue index 6face06d..55632719 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue @@ -16,27 +16,69 @@ @sort-change="handleSortChange" > - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/emis/emisSettlePayRecord/index.vue b/src/views/emis/emisSettlePayRecord/index.vue index 63e1fe88..d26636ca 100644 --- a/src/views/emis/emisSettlePayRecord/index.vue +++ b/src/views/emis/emisSettlePayRecord/index.vue @@ -227,20 +227,12 @@ - - -