ylj/cloud-JG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2025-08-14 19:33:11 +08:00
parent 415f6a5560
commit c145b6c9a5
5 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ant-design-pro", "name": "ant-design-pro",
"version": "4.5.21", "version": "4.5.24",
"private": true, "private": true,
"description": "An out-of-box UI solution for enterprise applications", "description": "An out-of-box UI solution for enterprise applications",
"scripts": { "scripts": {

11
src/pages/reports/productControl/ConvenienceStoreProductReview/components/ShopDetailModal.tsx
View File

@ -123,8 +123,15 @@ const ShopDetailModal = ({ showDetailDrawer, handleCloseModal, parentRow, handle
</Col> </Col>
<Col span={8}> <Col span={8}>
<ProFormText <ProFormText
label={"商品编码"} label={"商品条码"}
name={"COMMODITY_CODE"} name={"COMMODITY_BARCODE"}
readonly
/>
</Col>
<Col span={8}>
<ProFormText
label={"商家自编码"}
name={"COMMODITY_BRAND"}
readonly readonly
/> />
</Col> </Col>

6
src/pages/reports/productControl/ConvenienceStoreProductReview/index.tsx
View File

@ -98,7 +98,7 @@ const ConvenienceStoreProductReview: React.FC<{ currentUser: CurrentUser }> = (p
}, },
// 领导说取这个字段 // 领导说取这个字段
{ {
title: "商品编码", title: "商家自编码",
width: 150, width: 150,
dataIndex: "COMMODITY_BRAND", dataIndex: "COMMODITY_BRAND",
hideInSearch: true, hideInSearch: true,
@ -136,7 +136,9 @@ const ConvenienceStoreProductReview: React.FC<{ currentUser: CurrentUser }> = (p
let newTableData: any = [] let newTableData: any = []
list.forEach((item: any) => { list.forEach((item: any) => {
if (item.COMMODITY_ID === record?.COMMODITY_ID) { 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) newTableData.push(item)
} else { } else {
newTableData.push(item) newTableData.push(item)

10
src/pages/reports/settlementAccount/index.tsx
View File

@ -84,6 +84,10 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
} }
return record?.BUSINESSPROJECT_NAME ? indexStr > 0 ? <span> return record?.BUSINESSPROJECT_NAME ? indexStr > 0 ? <span>
{ {
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 ? record?.CLOSED_DATE ?
<Tooltip title={record?.CLOSED_DATE}> <Tooltip title={record?.CLOSED_DATE}>
<span style={{ marginLeft: '4px', color: 'red' }}>【撤场项目】</span> <span style={{ marginLeft: '4px', color: 'red' }}>【撤场项目】</span>
@ -99,6 +103,10 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
: :
<span> <span>
{ {
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 ? record?.CLOSED_DATE ?
<Tooltip title={record?.CLOSED_DATE}> <Tooltip title={record?.CLOSED_DATE}>
<span style={{ marginLeft: '4px', color: 'red' }}>【撤场项目】</span> <span style={{ marginLeft: '4px', color: 'red' }}>【撤场项目】</span>
@ -381,7 +389,7 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
expandable={{ expandable={{
expandRowByClick: true expandRowByClick: true
}} }}
scroll={{ x: 'max-content', y: 'calc(100vh - 450px)' }} scroll={{ x: '100%', y: 'calc(100vh - 510px)' }}
rowKey={(record: any) => { rowKey={(record: any) => {
return `${record?.SPREGIONTYPE_ID}-${record?.SERVERPART_ID}-${record?.SERVERPARTSHOP_ID}-${record?.BUSINESSPROJECT_ID}-${record?.CURRENT_PERIOD}-${record?.level}` return `${record?.SPREGIONTYPE_ID}-${record?.SERVERPART_ID}-${record?.SERVERPARTSHOP_ID}-${record?.BUSINESSPROJECT_ID}-${record?.CURRENT_PERIOD}-${record?.level}`
}} }}

6
src/versionEnv.ts
View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成 // 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.21"; export const VERSION = "4.5.24";
export const GIT_HASH = "c1f19fd"; export const GIT_HASH = "415f6a5";
export const BUILD_TIME = "2025-08-08T10:13:54.850Z"; export const BUILD_TIME = "2025-08-14T01:28:36.852Z";