vluk@2fi-solutions.com.hk před 4 hodinami
rodič
revize
e0f34ca8f6
2 změnil soubory, kde provedl 41 přidání a 6 odebrání
  1. +39
    -4
      src/pages/client/ClientMaintainPage/ClientForm.js
  2. +2
    -2
      src/pages/pdf/PdfSearchPage/PdfTable.js

+ 39
- 4
src/pages/client/ClientMaintainPage/ClientForm.js Zobrazit soubor

@@ -218,6 +218,8 @@ const ClientForm = ({ refClientDetail, isNewRecord, getClientDetail }) => {
netBusinessInterestLast: '',
personalPropertiesCurrent: '',
personalPropertiesLast: '',
realEstateCurrent: '',
realEstateLast: '',
otherNonLiquidCurrent: '',
otherNonLiquidLast: ''
});
@@ -232,11 +234,14 @@ const ClientForm = ({ refClientDetail, isNewRecord, getClientDetail }) => {
(parseFloat(assets.otherLiquidLast) || 0);

const totalNonLiquidAssetCurrent = (parseFloat(assets.netBusinessInterestCurrent) || 0) +
(parseFloat(assets.personalPropertiesCurrent) || 0) +
(parseFloat(assets.otherNonLiquidCurrent) || 0);
(parseFloat(assets.personalPropertiesCurrent) || 0) +
(parseFloat(assets.realEstateCurrent) || 0) + // ← NEW
(parseFloat(assets.otherNonLiquidCurrent) || 0);

const totalNonLiquidAssetLast = (parseFloat(assets.netBusinessInterestLast) || 0) +
(parseFloat(assets.personalPropertiesLast) || 0) +
(parseFloat(assets.otherNonLiquidLast) || 0);
(parseFloat(assets.personalPropertiesLast) || 0) +
(parseFloat(assets.realEstateLast) || 0) + // ← NEW
(parseFloat(assets.otherNonLiquidLast) || 0);

const totalAssetsCurrent = totalLiquidAssetCurrent + totalNonLiquidAssetCurrent;
const totalAssetsLast = totalLiquidAssetLast + totalNonLiquidAssetLast;
@@ -477,6 +482,8 @@ const ClientForm = ({ refClientDetail, isNewRecord, getClientDetail }) => {
assets.netBusinessInterestLast = refClient.netBusinessInterestLast;
assets.personalPropertiesCurrent = refClient.personalPropertiesCurrent;
assets.personalPropertiesLast = refClient.personalPropertiesLast;
assets.realEstateCurrent = refClient.realEstateCurrent;
assets.realEstateLast = refClient.realEstateLast;
assets.otherNonLiquidCurrent = refClient.otherNonLiquidCurrent;
assets.otherNonLiquidLast = refClient.otherNonLiquidLast;
@@ -1723,6 +1730,34 @@ const ClientForm = ({ refClientDetail, isNewRecord, getClientDetail }) => {
/>
</TableCell>
</TableRow>
{/* Real Estate - NEW ROW */}
<TableRow>
<TableCell>Real Estate 房地產</TableCell>
<TableCell align="right">
<TextField
onFocus={handleFocus}
disabled={!isEditing}
fullWidth
variant="outlined"
size="small"
inputProps={{ min: "0", step: "0.01" }}
value={formatNumberForDisplay(assets.realEstateCurrent)}
onChange={(e) => handleAssetsChange('realEstateCurrent', cleanNumberForState(e.target.value))}
/>
</TableCell>
<TableCell align="right">
<TextField
onFocus={handleFocus}
disabled={!isEditing}
fullWidth
variant="outlined"
size="small"
inputProps={{ min: "0", step: "0.01" }}
value={formatNumberForDisplay(assets.realEstateLast)}
onChange={(e) => handleAssetsChange('realEstateLast', cleanNumberForState(e.target.value))}
/>
</TableCell>
</TableRow>
{/* Other Non-Liquid */}
<TableRow>
<TableCell>Other 其他</TableCell>


+ 2
- 2
src/pages/pdf/PdfSearchPage/PdfTable.js Zobrazit soubor

@@ -226,7 +226,7 @@ export default function PdfTable({recordList}) {
case "SLGII":
return "Upload Page 13";
case "SLAPP":
return "Upload Page 16";
return "Upload Page 17";
case "SLFNA_EN":
return "Upload Page 5";
case "SLFNA_CHI":
@@ -241,7 +241,7 @@ export default function PdfTable({recordList}) {
case "SLGII":
return "Upload Page 15-16";
case "SLAPP":
return "Upload Page 18-19";
return "Upload Page 19-20";
default:
return "Unknown Form";
}


Načítá se…
Zrušit
Uložit