优化加项
This commit is contained in:
@@ -811,7 +811,13 @@ export const ExamAddonPanel = ({ client, onGoToSign }: ExamAddonPanelProps) => {
|
|||||||
if (combinationItemCode === null || combinationItemCode === undefined) {
|
if (combinationItemCode === null || combinationItemCode === undefined) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
const combinationItemPrice = parseFloat(item.currentPrice || item.originalPrice || '0');
|
let combinationItemPrice = parseFloat(item.currentPrice || item.originalPrice || '0');
|
||||||
|
|
||||||
|
// 如果自定义结算审核通过,传申请后的均价(按项平摊)
|
||||||
|
if (customSettlementStatus?.apply_status === 3 && typeof customSettlementStatus.final_settlement_price === 'number') {
|
||||||
|
combinationItemPrice = customSettlementStatus.final_settlement_price / selectedItems.length;
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
combination_item_code: String(combinationItemCode),
|
combination_item_code: String(combinationItemCode),
|
||||||
combination_item_price: combinationItemPrice,
|
combination_item_price: combinationItemPrice,
|
||||||
|
|||||||
@@ -344,9 +344,9 @@ export const ExamDetailPanel = ({
|
|||||||
</div>
|
</div>
|
||||||
<div className='col-span-2'>
|
<div className='col-span-2'>
|
||||||
预约备注:
|
预约备注:
|
||||||
<div className='text-gray-900 max-h-12 overflow-y-auto custom-scroll inline-block align-top'>
|
<span className='text-gray-900'>
|
||||||
{loading ? '' : ((client['appointmentRemarks' as keyof ExamClient] as string | null | undefined) || '—')}
|
{loading ? '' : ((client['appointmentRemarks' as keyof ExamClient] as string | null | undefined) || '—')}
|
||||||
</div>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className='col-span-2'>
|
<div className='col-span-2'>
|
||||||
加项内容:<span className='text-gray-900'>{addonSummary as string}</span>
|
加项内容:<span className='text-gray-900'>{addonSummary as string}</span>
|
||||||
@@ -407,5 +407,3 @@ export const ExamDetailPanel = ({
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user