From c145b6c9a51d781fa1cf7c69f45dbba36df81ac6 Mon Sep 17 00:00:00 2001
From: ylj20011123 <YLJ>
Date: Thu, 14 Aug 2025 19:33:11 +0800
Subject: [PATCH] update

---
 package.json                                  |  2 +-
 .../components/ShopDetailModal.tsx            | 11 ++++++--
 .../ConvenienceStoreProductReview/index.tsx   |  6 +++--
 src/pages/reports/settlementAccount/index.tsx | 26 ++++++++++++-------
 src/versionEnv.ts                             |  6 ++---
 5 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 5b4be3d..ecc40bb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ant-design-pro",
-  "version": "4.5.21",
+  "version": "4.5.24",
   "private": true,
   "description": "An out-of-box UI solution for enterprise applications",
   "scripts": {
diff --git a/src/pages/reports/productControl/ConvenienceStoreProductReview/components/ShopDetailModal.tsx b/src/pages/reports/productControl/ConvenienceStoreProductReview/components/ShopDetailModal.tsx
index 29779af..548e4d9 100644
--- a/src/pages/reports/productControl/ConvenienceStoreProductReview/components/ShopDetailModal.tsx
+++ b/src/pages/reports/productControl/ConvenienceStoreProductReview/components/ShopDetailModal.tsx
@@ -123,8 +123,15 @@ const ShopDetailModal = ({ showDetailDrawer, handleCloseModal, parentRow, handle
                     </Col>
                     <Col span={8}>
                         <ProFormText
-                            label={"商品编码"}
-                            name={"COMMODITY_CODE"}
+                            label={"商品条码"}
+                            name={"COMMODITY_BARCODE"}
+                            readonly
+                        />
+                    </Col>
+                    <Col span={8}>
+                        <ProFormText
+                            label={"商家自编码"}
+                            name={"COMMODITY_BRAND"}
                             readonly
                         />
                     </Col>
diff --git a/src/pages/reports/productControl/ConvenienceStoreProductReview/index.tsx b/src/pages/reports/productControl/ConvenienceStoreProductReview/index.tsx
index 1e58d72..b65d4cd 100644
--- a/src/pages/reports/productControl/ConvenienceStoreProductReview/index.tsx
+++ b/src/pages/reports/productControl/ConvenienceStoreProductReview/index.tsx
@@ -98,7 +98,7 @@ const ConvenienceStoreProductReview: React.FC<{ currentUser: CurrentUser }> = (p
         },
         // 领导说取这个字段
         {
-            title: "商品编码",
+            title: "商家自编码",
             width: 150,
             dataIndex: "COMMODITY_BRAND",
             hideInSearch: true,
@@ -136,7 +136,9 @@ const ConvenienceStoreProductReview: React.FC<{ currentUser: CurrentUser }> = (p
                     let newTableData: any = []
                     list.forEach((item: any) => {
                         if (item.COMMODITY_ID === record?.COMMODITY_ID) {
-                            item.COMMODITY_CURRPRICE = newPrice
+                            item.COMMODITY_CURRPRICE = newPrice // 商品当前价格 
+                            item.COMMODITY_RETAILPRICE = newPrice  // 零售价
+                            item.COMMODITY_MEMBERPRICE = newPrice // 会员价格
                             newTableData.push(item)
                         } else {
                             newTableData.push(item)
diff --git a/src/pages/reports/settlementAccount/index.tsx b/src/pages/reports/settlementAccount/index.tsx
index fd700a6..6720f5d 100644
--- a/src/pages/reports/settlementAccount/index.tsx
+++ b/src/pages/reports/settlementAccount/index.tsx
@@ -84,10 +84,14 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
         }
         return record?.BUSINESSPROJECT_NAME ? indexStr > 0 ? <span>
           {
-            record?.CLOSED_DATE ?
-              <Tooltip title={record?.CLOSED_DATE}>
-                <span style={{ marginLeft: '4px', color: 'red' }}>【撤场项目】</span>
-              </Tooltip> : ''
+            new Date(record?.PROJECT_ENDDATE).getTime() < new Date().getTime() ?
+              <Tooltip title={record?.PROJECT_ENDDATE}>
+                <span style={{ marginLeft: '4px', color: '#faad14' }}>【退场项目】</span>
+              </Tooltip> :
+              record?.CLOSED_DATE ?
+                <Tooltip title={record?.CLOSED_DATE}>
+                  <span style={{ marginLeft: '4px', color: 'red' }}>【撤场项目】</span>
+                </Tooltip> : ''
           }
           {record?.BUSINESSPROJECT_NAME.slice(0, indexStr)}
           <span style={{ color: '#ffc352' }}>{searchContent}</span>
@@ -99,10 +103,14 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
           :
           <span>
             {
-              record?.CLOSED_DATE ?
-                <Tooltip title={record?.CLOSED_DATE}>
-                  <span style={{ marginLeft: '4px', color: 'red' }}>【撤场项目】</span>
-                </Tooltip> : ''
+              new Date(record?.PROJECT_ENDDATE).getTime() < new Date().getTime() ?
+                <Tooltip title={record?.PROJECT_ENDDATE}>
+                  <span style={{ marginLeft: '4px', color: '#faad14' }}>【退场项目】</span>
+                </Tooltip> :
+                record?.CLOSED_DATE ?
+                  <Tooltip title={record?.CLOSED_DATE}>
+                    <span style={{ marginLeft: '4px', color: 'red' }}>【撤场项目】</span>
+                  </Tooltip> : ''
             }
             {record?.BUSINESSPROJECT_NAME}
             {record?.noShop ? <Tooltip title="缺少门店">
@@ -381,7 +389,7 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
             expandable={{
               expandRowByClick: true
             }}
-            scroll={{ x: 'max-content', y: 'calc(100vh - 450px)' }}
+            scroll={{ x: '100%', y: 'calc(100vh - 510px)' }}
             rowKey={(record: any) => {
               return `${record?.SPREGIONTYPE_ID}-${record?.SERVERPART_ID}-${record?.SERVERPARTSHOP_ID}-${record?.BUSINESSPROJECT_ID}-${record?.CURRENT_PERIOD}-${record?.level}`
             }}
diff --git a/src/versionEnv.ts b/src/versionEnv.ts
index 3aeb0f9..23d90d0 100644
--- a/src/versionEnv.ts
+++ b/src/versionEnv.ts
@@ -1,4 +1,4 @@
 // 由 scripts/writeVersion.js 自动生成
-export const VERSION = "4.5.21";
-export const GIT_HASH = "c1f19fd";
-export const BUILD_TIME = "2025-08-08T10:13:54.850Z";
+export const VERSION = "4.5.24";
+export const GIT_HASH = "415f6a5";
+export const BUILD_TIME = "2025-08-14T01:28:36.852Z";