From 5485a827beb03ecdb70e94512cca510eeecc1cbd Mon Sep 17 00:00:00 2001 From: chenhao Date: Thu, 8 Jan 2026 17:00:09 +0800 Subject: [PATCH] =?UTF-8?q?fix(finance):=20=E4=BF=AE=E5=A4=8D=E8=B4=A2?= =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E5=9D=97=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E5=92=8C=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为申请开票表单添加disabled属性控制 - 注释掉开票详情表格中的操作列 - 调整condensed-item样式间距和错误提示层级 - 为申请付款对话框添加表单验证规则 - 修复银行账号字段名称错误 - 为申请退款对话框添加表单验证规则 - 实现退款信息变更确认提示功能 - 动态显示开票单和红冲开票详情标题 - 为财务详情页面金额字段添加负数红色显示 - 在表格中显示绝对值金额 - 为审批页面添加标签状态颜色 - 修复审批历史加载的单据编号 - 调整审批页面付款编号显示 - 为开票列表页面金额字段添加负数红色显示 - 修正生成收票单按钮文本为生成开票单 - 修复上传发票对话框票据类型显示问题 --- .../finance/invoiceReceipt/approved/index.vue | 4 +- .../approve/finance/invoiceReceipt/index.vue | 4 +- .../finance/invoiceRed/approved/index.vue | 4 +- .../approve/finance/invoiceRed/index.vue | 4 +- .../finance/payment/approved/index.vue | 2 +- .../finance/paymentRefund/approved/index.vue | 4 +- .../approve/finance/paymentRefund/index.vue | 2 +- .../finance/receipt/approved/index.vue | 2 +- .../views/approve/finance/receipt/index.vue | 2 +- .../finance/receiptRefound/approved/index.vue | 2 +- .../approve/finance/receiptRefound/index.vue | 2 +- .../receivableInvoice/approved/index.vue | 2 +- .../finance/receivableInvoice/index.vue | 2 +- .../approved/index.vue | 2 +- .../finance/receivableInvoiceRefund/index.vue | 2 +- .../invoice/components/ApplyInvoice.vue | 24 +++--- .../invoice/components/DetailDrawer.vue | 29 +++++--- .../invoice/components/InvoiceDialog.vue | 22 +++--- .../src/views/finance/invoice/index.vue | 22 ++++-- .../payment/components/DetailDrawer.vue | 23 ++++-- .../receipt/components/DetailDrawer.vue | 17 +++-- .../receipt/components/ReceiptDialog.vue | 17 +++-- .../src/views/finance/receivable/index.vue | 2 +- .../receive/components/ApplyPaymentDialog.vue | 29 +++++++- .../receive/components/ApplyRefundDialog.vue | 73 +++++++++++++++++-- .../receive/components/DetailDrawer.vue | 27 +++++-- .../src/views/finance/receive/index.vue | 6 +- 27 files changed, 238 insertions(+), 93 deletions(-) diff --git a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/approved/index.vue index 3564b745..951c891b 100644 --- a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/approved/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/approved/index.vue @@ -75,7 +75,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态: {{ getStatusText(log.approveStatus) }}

@@ -152,7 +152,7 @@ export default { getInvoiceReceipt(this.currentInvoiceReceiptId).then(response => { this.form = response.data; - this.loadApproveHistory(this.form.receiptBillCode); + this.loadApproveHistory(this.form.ticketBillCode); this.detailLoading = false; }).catch(() => { this.detailLoading = false; diff --git a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/index.vue b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/index.vue index 7827c70b..07e45c90 100644 --- a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/index.vue @@ -89,7 +89,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态:{{ getStatusText(log.approveStatus) }}

@@ -195,7 +195,7 @@ export default { getInvoiceReceipt(this.currentInvoiceReceiptId).then(response => { this.form = response.data; - this.loadApproveHistory(this.form.receiptBillCode); + this.loadApproveHistory(this.form.ticketBillCode); this.detailLoading = false; }).catch(() => { this.detailLoading = false; diff --git a/oms_web/oms_vue/src/views/approve/finance/invoiceRed/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/invoiceRed/approved/index.vue index ce2ac48b..96e7fedf 100644 --- a/oms_web/oms_vue/src/views/approve/finance/invoiceRed/approved/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/invoiceRed/approved/index.vue @@ -76,7 +76,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态: {{ getStatusText(log.approveStatus) }}

@@ -153,7 +153,7 @@ export default { getInvoiceReceipt(this.currentInvoiceReceiptId).then(response => { this.form = response.data; - this.loadApproveHistory(this.form.receiptBillCode); + this.loadApproveHistory(this.form.ticketBillCode); this.detailLoading = false; }).catch(() => { this.detailLoading = false; diff --git a/oms_web/oms_vue/src/views/approve/finance/invoiceRed/index.vue b/oms_web/oms_vue/src/views/approve/finance/invoiceRed/index.vue index bc063960..ddccd3c8 100644 --- a/oms_web/oms_vue/src/views/approve/finance/invoiceRed/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/invoiceRed/index.vue @@ -93,7 +93,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态: {{ getStatusText(log.approveStatus) }}

@@ -199,7 +199,7 @@ export default { getInvoiceReceipt(this.currentInvoiceReceiptId).then(response => { this.form = response.data; - this.loadApproveHistory(this.form.receiptBillCode); + this.loadApproveHistory(this.form.ticketBillCode); this.detailLoading = false; }).catch(() => { this.detailLoading = false; diff --git a/oms_web/oms_vue/src/views/approve/finance/payment/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/payment/approved/index.vue index 22bddcdc..74d4a5f0 100644 --- a/oms_web/oms_vue/src/views/approve/finance/payment/approved/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/payment/approved/index.vue @@ -65,7 +65,7 @@ diff --git a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/approved/index.vue index ccfe6512..3a56045e 100644 --- a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/approved/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/approved/index.vue @@ -69,7 +69,7 @@ @@ -81,7 +81,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态: {{ getStatusText(log.approveStatus) }}

diff --git a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/index.vue b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/index.vue index 1c23fae3..e3159853 100644 --- a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/index.vue @@ -93,7 +93,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态: {{ getStatusText(log.approveStatus) }}

diff --git a/oms_web/oms_vue/src/views/approve/finance/receipt/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/receipt/approved/index.vue index a3271bb4..91f945c6 100644 --- a/oms_web/oms_vue/src/views/approve/finance/receipt/approved/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/receipt/approved/index.vue @@ -77,7 +77,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态: {{ getStatusText(log.approveStatus) }}

diff --git a/oms_web/oms_vue/src/views/approve/finance/receipt/index.vue b/oms_web/oms_vue/src/views/approve/finance/receipt/index.vue index 74bfb518..8af597fa 100644 --- a/oms_web/oms_vue/src/views/approve/finance/receipt/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/receipt/index.vue @@ -89,7 +89,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态: {{ getStatusText(log.approveStatus) }}

diff --git a/oms_web/oms_vue/src/views/approve/finance/receiptRefound/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/receiptRefound/approved/index.vue index 06c8e6cd..0eff8c6b 100644 --- a/oms_web/oms_vue/src/views/approve/finance/receiptRefound/approved/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/receiptRefound/approved/index.vue @@ -77,7 +77,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态: {{ getStatusText(log.approveStatus) }}

diff --git a/oms_web/oms_vue/src/views/approve/finance/receiptRefound/index.vue b/oms_web/oms_vue/src/views/approve/finance/receiptRefound/index.vue index e2e41d5f..3facb691 100644 --- a/oms_web/oms_vue/src/views/approve/finance/receiptRefound/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/receiptRefound/index.vue @@ -93,7 +93,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态:{{ getStatusText(log.approveStatus) }}

diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/approved/index.vue index 1b39a1d1..0fec97d3 100644 --- a/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/approved/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/approved/index.vue @@ -75,7 +75,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态: {{ getStatusText(log.approveStatus) }}

diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/index.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/index.vue index 5d50bfab..2cabf906 100644 --- a/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoice/index.vue @@ -87,7 +87,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态: {{ getStatusText(log.approveStatus) }}

diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/approved/index.vue index 9b8758c2..06ccdaa5 100644 --- a/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/approved/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/approved/index.vue @@ -79,7 +79,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态: {{ getStatusText(log.approveStatus) }}

diff --git a/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/index.vue b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/index.vue index 52ff0883..4848c662 100644 --- a/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/receivableInvoiceRefund/index.vue @@ -91,7 +91,7 @@

{{ log.approveOpinion }}

操作人: {{ log.approveUserName }}

-

审批状态: {{ getStatusText(log.approveStatus) }}

+

审批状态: {{ getStatusText(log.approveStatus) }}

diff --git a/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue b/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue index 4e64929f..0143bfd2 100644 --- a/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue +++ b/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue @@ -1,7 +1,7 @@ - - - + + + + + + + + @@ -677,7 +677,11 @@ export default { } .condensed-item { - margin-bottom: 5px; + margin-bottom: 18px; +} + +.condensed-item ::v-deep .el-form-item__error { + z-index: 10; } .condensed-item ::v-deep .el-form-item__label { diff --git a/oms_web/oms_vue/src/views/finance/invoice/components/DetailDrawer.vue b/oms_web/oms_vue/src/views/finance/invoice/components/DetailDrawer.vue index b90bb89d..daee855f 100644 --- a/oms_web/oms_vue/src/views/finance/invoice/components/DetailDrawer.vue +++ b/oms_web/oms_vue/src/views/finance/invoice/components/DetailDrawer.vue @@ -1,6 +1,6 @@ - - - + + + + + + + + + diff --git a/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue b/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue index 1b7d08a5..cc77cf6d 100644 --- a/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue +++ b/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue @@ -1,6 +1,6 @@