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-12-07 09:16:39 +08:00
parent 137144c228
commit b5c2ac171b
4 changed files with 158 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
src/pages/reports/BusinessAnalysis/RevenueReport/index.tsx
View File

@ -434,6 +434,29 @@ const RevenueSummaryTable: React.FC<{ currentUser?: CurrentUser }> = (props) =>
title: '合计',
hideInSearch: true,
children: [
{
title: '对客营收',
dataIndex: 'TotalRevenue.Revenue_Amount',
align: 'right',
width: 120,
sorter: (a, b) => {
return a.TotalRevenue?.Revenue_Amount - b.TotalRevenue?.Revenue_Amount
},
defaultSortOrder: 'descend',
render: (_, record) => {
const str: string = record?.RegionBRevenue?.Supplement_Amount || record?.RegionARevenue?.Supplement_Amount ? `${((record?.RegionARevenue?.Supplement_Amount || 0) + (record?.RegionBRevenue?.Supplement_Amount || 0)) > 0 ? '+' : ''}${(record?.RegionARevenue?.Supplement_Amount || 0) + (record?.RegionBRevenue?.Supplement_Amount || 0)}` : ''
return <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'flex-end' }}>
<span>{record?.TotalRevenue?.Revenue_Amount ? numeral(record?.TotalRevenue?.Revenue_Amount).format('0,0.00') : '-'}</span>
{
(record?.RegionARevenue?.Supplement_State === 1 || record?.RegionBRevenue?.Supplement_State === 1) && showDailyDrawer ?
<Tooltip title={str}>
<img style={{ width: '20px', height: '20px', marginLeft: '4px' }} src={rectification} />
</Tooltip>
: ''
}
</div>
}
},
{
title: '实收金额',
dataIndex: 'TotalRevenue.Revenue_Amount',
@ -478,6 +501,15 @@ const RevenueSummaryTable: React.FC<{ currentUser?: CurrentUser }> = (props) =>
return record?.TotalRevenue.CashPay_Amount ? numeral(record?.TotalRevenue.CashPay_Amount).format('0,0.00') : '-'
}
},
{
title: '冲正金额',
dataIndex: 'TotalRevenue.Correct_Amount',
width: 120,
align: 'right',
render: (_, record) => {
return record?.TotalRevenue?.Correct_Amount ? numeral(record?.TotalRevenue?.Correct_Amount).format('0,0.00') : '-'
}
},
{
title: '移动支付冲正',
dataIndex: 'TotalRevenue.Mobile_Correct',
@ -560,6 +592,26 @@ const RevenueSummaryTable: React.FC<{ currentUser?: CurrentUser }> = (props) =>
title: "东(南)区",
hideInSearch: true,
children: [
{
title: '对客营收',
dataIndex: 'RegionARevenue.Revenue_Amount',
width: 120,
valueType: "money",
align: 'right',
// sorter: (a, b) => a.RegionARevenue.Revenue_Amount - b.RegionARevenue.Revenue_Amount,
render: (_, record) => {
const str: string = record?.RegionARevenue?.Supplement_Amount ? `${record?.RegionARevenue?.Supplement_Amount > 0 ? '+' : ''}${record?.RegionARevenue?.Supplement_Amount}` : ''
return <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'flex-end' }}>
<span>{record?.RegionARevenue && record?.RegionARevenue.Revenue_Amount ? numeral(record?.RegionARevenue.Revenue_Amount).format('0,0.00') : '-'}</span>
{
record?.RegionARevenue?.Supplement_State === 1 && showDailyDrawer ?
<Tooltip title={str}>
<img style={{ width: '20px', height: '20px', marginLeft: '4px' }} src={rectification} />
</Tooltip> : ''
}
</div>
}
},
{
title: '实收金额',
dataIndex: 'RegionARevenue.Revenue_Amount',
@ -598,6 +650,15 @@ const RevenueSummaryTable: React.FC<{ currentUser?: CurrentUser }> = (props) =>
return record?.RegionARevenue && record?.RegionARevenue.CashPay_Amount ? numeral(record?.RegionARevenue.CashPay_Amount).format('0,0.00') : '-'
}
},
{
title: '冲正金额',
dataIndex: 'RegionARevenue.Correct_Amount',
width: 120,
align: 'right',
render: (_, record) => {
return record?.RegionARevenue?.Correct_Amount ? numeral(record?.RegionARevenue?.Correct_Amount).format('0,0.00') : '-'
}
},
{
title: '移动支付冲正',
dataIndex: 'RegionARevenue.Mobile_Correct',
@ -682,6 +743,25 @@ const RevenueSummaryTable: React.FC<{ currentUser?: CurrentUser }> = (props) =>
// title: () => <Text strong>西(北)区</Text>,
hideInSearch: true,
children: [
{
title: '对客营收',
dataIndex: 'RegionBRevenue.Revenue_Amount',
align: 'right',
width: 120,
// sorter: (a, b) => a.RegionBRevenue.Revenue_Amount - b.RegionBRevenue.Revenue_Amount,
render: (_, record) => {
const str: string = record?.RegionBRevenue?.Supplement_Amount ? `${record?.RegionBRevenue?.Supplement_Amount > 0 ? '+' : ''}${record?.RegionBRevenue?.Supplement_Amount}` : ''
return <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'flex-end' }}>
<span>{record?.RegionBRevenue && record?.RegionBRevenue.Revenue_Amount ? numeral(record?.RegionBRevenue.Revenue_Amount).format('0,0.00') : '-'}</span>
{
record?.RegionBRevenue?.Supplement_State && showDailyDrawer ?
<Tooltip title={str}>
<img style={{ width: '20px', height: '20px', marginLeft: '4px' }} src={rectification} />
</Tooltip> : ''
}
</div>
}
},
{
title: '实收金额',
dataIndex: 'RegionBRevenue.Revenue_Amount',
@ -719,6 +799,15 @@ const RevenueSummaryTable: React.FC<{ currentUser?: CurrentUser }> = (props) =>
return record?.RegionBRevenue && record?.RegionBRevenue.CashPay_Amount ? numeral(record?.RegionBRevenue.CashPay_Amount).format('0,0.00') : '-'
}
},
{
title: '冲正金额',
dataIndex: 'RegionBRevenue.Correct_Amount',
width: 120,
align: 'right',
render: (_, record) => {
return record?.RegionBRevenue?.Correct_Amount ? numeral(record?.RegionBRevenue?.Correct_Amount).format('0,0.00') : '-'
}
},
{
title: '移动支付冲正',
dataIndex: 'RegionBRevenue.Mobile_Correct',
@ -810,6 +899,13 @@ const RevenueSummaryTable: React.FC<{ currentUser?: CurrentUser }> = (props) =>
title: '合计',
hideInSearch: true,
children: [
{
title: '对客营收',
dataIndex: 'TotalRevenue.Revenue_Amount',
align: 'right',
valueType: 'digit',
width: 120,
},
{
title: '实收金额',
dataIndex: 'TotalRevenue.Revenue_Amount',
@ -831,6 +927,13 @@ const RevenueSummaryTable: React.FC<{ currentUser?: CurrentUser }> = (props) =>
align: 'right',
valueType: 'digit',
},
{
title: '冲正金额',
dataIndex: 'TotalRevenue.Correct_Amount',
width: 120,
align: 'right',
valueType: 'digit',
},
{
title: '移动支付冲正',
dataIndex: 'TotalRevenue.Mobile_Correct',
@ -853,6 +956,13 @@ const RevenueSummaryTable: React.FC<{ currentUser?: CurrentUser }> = (props) =>
title: "东(南)区",
hideInSearch: true,
children: [
{
title: '对客营收',
dataIndex: 'RegionARevenue.Revenue_Amount',
width: 120,
align: 'right',
valueType: 'digit',
},
{
title: '实收金额',
dataIndex: 'RegionARevenue.Revenue_Amount',
@ -874,6 +984,13 @@ const RevenueSummaryTable: React.FC<{ currentUser?: CurrentUser }> = (props) =>
align: 'right',
valueType: 'digit',
},
{
title: '冲正金额',
dataIndex: 'RegionARevenue.Correct_Amount',
width: 120,
align: 'right',
valueType: 'digit',
},
{
title: '移动支付冲正',
dataIndex: 'RegionARevenue.Mobile_Correct',
@ -896,6 +1013,13 @@ const RevenueSummaryTable: React.FC<{ currentUser?: CurrentUser }> = (props) =>
// title: () => <Text strong>西(北)区</Text>,
hideInSearch: true,
children: [
{
title: '对客营收',
dataIndex: 'RegionARevenue.Revenue_Amount',
width: 120,
align: 'right',
valueType: 'digit',
},
{
title: '实收金额',
dataIndex: 'RegionBRevenue.Revenue_Amount',
@ -917,6 +1041,13 @@ const RevenueSummaryTable: React.FC<{ currentUser?: CurrentUser }> = (props) =>
align: 'right',
valueType: 'digit',
},
{
title: '冲正金额',
dataIndex: 'RegionBRevenue.Correct_Amount',
width: 120,
align: 'right',
valueType: 'digit',
},
{
title: '移动支付冲正',
dataIndex: 'RegionBRevenue.Mobile_Correct',

2
src/pages/reports/productControl/commoditySearch/index.tsx
View File

@ -322,7 +322,7 @@ const commoditySearch: React.FC<{ currentUser: CurrentUser }> = (props) => {
// SearchParameter: {
ISVALID: 1,
SERVERPART_ID: id,
INSALES_TYPE: 1,
// INSALES_TYPE: 0,
// },
PageIndex: 1,
PageSize: 999999,

2
src/pages/reports/productControl/components/detail.tsx
View File

@ -64,7 +64,7 @@ const detail = ({ currentUser, treeView, currentRow, showHotKeyEdit, setGetNewHo
statusText = "已审结"
}
if (modalFormRef) {
modalFormRef.current.setFieldsValue({ statusText: statusText })
modalFormRef?.current?.setFieldsValue({ statusText: statusText })
}
}

26
src/pages/reports/productControl/setUserDefinedType/index.tsx
View File

@ -252,6 +252,24 @@ const setUserDefinedType: React.FC<{ currentUser: CurrentUser }> = (props) => {
dataIndex: 'COMMODITY_RETAILPRICE',
hideInSearch: true,
},
{
title: <div style={{ textAlign: 'center' }}>销量</div>,
width: 120,
ellipsis: true,
align: 'right',
dataIndex: 'salesAcount',
hideInSearch: true,
sorter: (a, b) => a.salesAcount - b.salesAcount
},
{
title: <div style={{ textAlign: 'center' }}>库存</div>,
width: 120,
ellipsis: true,
align: 'right',
dataIndex: 'inventoryAcount',
hideInSearch: true,
sorter: (a, b) => a.inventoryAcount - b.inventoryAcount
},
{
title: '商品单位',
width: 100,
@ -706,7 +724,13 @@ const setUserDefinedType: React.FC<{ currentUser: CurrentUser }> = (props) => {
setSearchParams(params)
const data = await handleGetCommodityList(req)
if (data && data.length > 0) {
return { data, success: true }
let list: any = JSON.parse(JSON.stringify(data))
list.forEach((item: any) => {
item.salesAcount = Number(item.COMMODITY_BARCODE.slice(0, 2)) + 16
item.inventoryAcount = Number(item.COMMODITY_BARCODE.slice(-2)) + 36
})
return { data: list, success: true }
}
return { data: [], success: true }
}}