From 53bf932d9b1c814e1589ea68c5ee7d7b66181111 Mon Sep 17 00:00:00 2001
From: z <2199297992@qq.com>
Date: Tue, 13 May 2025 16:16:34 +0800
Subject: [PATCH] feat(Order): 开票状态显示错误bug修复
---
src/pages/Order/FeedBack/OrderList.tsx | 4 ++--
src/pages/Order/FeedBack/constant.ts | 14 ++++++++++----
src/pages/Order/OrderList/OrderList.tsx | 4 ++--
src/pages/Order/constant.ts | 8 ++++----
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/pages/Order/FeedBack/OrderList.tsx b/src/pages/Order/FeedBack/OrderList.tsx
index 7f2c96f..2c8149b 100644
--- a/src/pages/Order/FeedBack/OrderList.tsx
+++ b/src/pages/Order/FeedBack/OrderList.tsx
@@ -1193,8 +1193,8 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
<div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
<Tag
color={
- optRecord.invoicingTime === null ||
- optRecord.invoicingTime === undefined
+ optRecord.afterInvoicingStatus !== 'COMPLETE_INVOICING' &&
+ optRecord.afterInvoicingStatus !== 'PARTIAL_INVOICING'
? TAGS_COLOR.get(optRecord.invoicingStatus)
: 'success'
}
diff --git a/src/pages/Order/FeedBack/constant.ts b/src/pages/Order/FeedBack/constant.ts
index 9e02657..e08985c 100644
--- a/src/pages/Order/FeedBack/constant.ts
+++ b/src/pages/Order/FeedBack/constant.ts
@@ -121,10 +121,10 @@ export const CHECK_TYPE = {
* @param subOrder
*/
export const getNeedInvoicing = (subOrder: any) => {
- if (subOrder.invoicingTime !== null && subOrder.invoicingTime !== undefined) {
- return '已开票';
- }
- if (subOrder.afterInvoicingStatus === 'COMPLETE_INVOICING') {
+ if (
+ subOrder.afterInvoicingStatus === 'COMPLETE_INVOICING' ||
+ subOrder.afterInvoicingStatus === 'PARTIAL_INVOICING'
+ ) {
return '已开票';
}
if (subOrder.afterInvoicingStatus === 'REISSUE') {
@@ -133,6 +133,12 @@ export const getNeedInvoicing = (subOrder: any) => {
if (subOrder.invoicingStatus === 'UN_INVOICE') {
return '不需开票';
}
+ if (subOrder.afterInvoicingStatus === 'WAIT_FLUSH') {
+ return '待冲红';
+ }
+ if (subOrder.afterInvoicingStatus === 'FLUSHED') {
+ return '已冲红';
+ }
return '需要开票';
};
diff --git a/src/pages/Order/OrderList/OrderList.tsx b/src/pages/Order/OrderList/OrderList.tsx
index ff7e691..bc74373 100644
--- a/src/pages/Order/OrderList/OrderList.tsx
+++ b/src/pages/Order/OrderList/OrderList.tsx
@@ -1219,8 +1219,8 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
<div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
<Tag
color={
- optRecord.invoicingTime === null ||
- optRecord.invoicingTime === undefined
+ optRecord.afterInvoicingStatus !== 'COMPLETE_INVOICING' &&
+ optRecord.afterInvoicingStatus !== 'PARTIAL_INVOICING'
? TAGS_COLOR.get(optRecord.invoicingStatus)
: 'success'
}
diff --git a/src/pages/Order/constant.ts b/src/pages/Order/constant.ts
index b2f37c0..1a3383c 100644
--- a/src/pages/Order/constant.ts
+++ b/src/pages/Order/constant.ts
@@ -136,10 +136,10 @@ export const CHECK_TYPE = {
* @param subOrder
*/
export const getNeedInvoicing = (subOrder: any) => {
- if (subOrder.invoicingTime !== null && subOrder.invoicingTime !== undefined) {
- return '已开票';
- }
- if (subOrder.afterInvoicingStatus === 'COMPLETE_INVOICING') {
+ if (
+ subOrder.afterInvoicingStatus === 'COMPLETE_INVOICING' ||
+ subOrder.afterInvoicingStatus === 'PARTIAL_INVOICING'
+ ) {
return '已开票';
}
if (subOrder.afterInvoicingStatus === 'REISSUE') {
--
libgit2 0.23.3