Commit 8b207170226066cf7dd89507b58f61fa233fa6aa

Authored by boyang
1 parent e82d7a13

feat: 修改回款

src/pages/Order/OrderList/OrderList.tsx
... ... @@ -244,6 +244,22 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
244 244 }, [selectedSubOrderKeys]);
245 245 const [procureNotes, setProcureNotes] = useState<string>('');
246 246 console.log(JSON.stringify(userInfo));
  247 +
  248 + // 付款状态枚举映射
  249 + const getPaymentStatusText = (status: string | undefined): string => {
  250 + if (!status) return '无';
  251 + switch (status) {
  252 + case 'WAIT_PAYMENT':
  253 + return '待付款';
  254 + case 'PARTIAL_PAYMENT':
  255 + return '部分付款';
  256 + case 'COMPLETE_PAYMENT':
  257 + return '已付款';
  258 + default:
  259 + return status;
  260 + }
  261 + };
  262 +
247 263 const triggerRecordOptNode = async (id) => {
248 264 const res = await postServiceOrderGetCurrentOptNode({
249 265 query: {
... ... @@ -1610,7 +1626,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1610 1626 ) : (
1611 1627 ''
1612 1628 )}
1613   - {optRecord.paths?.includes('saleCancelInvoicing') ? (
  1629 + {/* {optRecord.paths?.includes('saleCancelInvoicing') ? (
1614 1630 <ButtonConfirm
1615 1631 className="p-0"
1616 1632 title="确认取消申请开票?"
... ... @@ -1630,7 +1646,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1630 1646 />
1631 1647 ) : (
1632 1648 ''
1633   - )}
  1649 + )} */}
1634 1650 {optRecord.paths?.includes('noNeedInvoicingEdit') ? (
1635 1651 <Button
1636 1652 className="p-0"
... ... @@ -1845,7 +1861,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1845 1861 ''
1846 1862 )}
1847 1863  
1848   - {optRecord.paths?.includes('applyInvoicing') ? (
  1864 + {/* {optRecord.paths?.includes('applyInvoicing') ? (
1849 1865 <Button
1850 1866 className="p-0"
1851 1867 type="link"
... ... @@ -1860,7 +1876,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1860 1876 </Button>
1861 1877 ) : (
1862 1878 ''
1863   - )}
  1879 + )} */}
1864 1880  
1865 1881 {optRecord.paths?.includes('applyInvoicing_old') ? (
1866 1882 <Button
... ... @@ -2723,6 +2739,42 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
2723 2739  
2724 2740 {roleCode === 'finance' ? <Divider type="vertical" /> : ''}
2725 2741  
  2742 + {/* 添加付款审核状态 */}
  2743 + <div>
  2744 + <span className="text-[#8C8C8C]">付款状态:</span>
  2745 + <span className="text-slate-700">
  2746 + {getPaymentStatusText(record.paymentAuditStatus)}
  2747 + </span>
  2748 + </div>
  2749 + <Divider type="vertical" />
  2750 +
  2751 + {/* 添加已回款金额 */}
  2752 + <div>
  2753 + <span className="text-[#8C8C8C]">已回款金额:¥</span>
  2754 + <span className="text-slate-700">
  2755 + {record.payedMoney || '0.00'}
  2756 + </span>
  2757 + </div>
  2758 + <Divider type="vertical" />
  2759 +
  2760 + {/* 添加未回款金额 */}
  2761 + <div>
  2762 + <span className="text-[#8C8C8C]">未回款金额:¥</span>
  2763 + <span className="text-slate-700">
  2764 + {record.unPayedMoney || '0.00'}
  2765 + </span>
  2766 + </div>
  2767 + <Divider type="vertical" />
  2768 +
  2769 + {/* 添加发票核销金额 */}
  2770 + <div>
  2771 + <span className="text-[#8C8C8C]">发票核销金额:¥</span>
  2772 + <span className="text-slate-700">
  2773 + {record.invoiceMoney || '0.00'}
  2774 + </span>
  2775 + </div>
  2776 + <Divider type="vertical" />
  2777 +
2726 2778 <div title={record.notes}>
2727 2779 <div
2728 2780 className="max-w-[850px] whitespace-normal overflow-hidden overflow-ellipsis hover:cursor-pointer"
... ... @@ -3173,6 +3225,36 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
3173 3225 ) : (
3174 3226 ''
3175 3227 )}
  3228 + {record.paths?.includes('saleCancelInvoicing') ? (
  3229 + <ButtonConfirm
  3230 + className="p-0"
  3231 + title="确认取消申请开票?"
  3232 + text="取消申请(新)"
  3233 + onConfirm={async () => {
  3234 + let selectedSubOrders = subOrderSelectedMap.get(
  3235 + record.id,
  3236 + );
  3237 + if (selectedSubOrders === undefined) {
  3238 + selectedSubOrders = record.subOrderInformationLists;
  3239 + }
  3240 + let subOrderIds = selectedSubOrders.map(
  3241 + (item) => item.id,
  3242 + );
  3243 + let res = await postServiceInvoiceCancelApply({
  3244 + data: {
  3245 + subOrderIds: subOrderIds,
  3246 + },
  3247 + });
  3248 +
  3249 + if (res && res.result === RESPONSE_CODE.SUCCESS) {
  3250 + message.success(res.message);
  3251 + refreshTable();
  3252 + }
  3253 + }}
  3254 + />
  3255 + ) : (
  3256 + ''
  3257 + )}
3176 3258  
3177 3259 {record.paths?.includes('leaderAudit') ? (
3178 3260 <Button
... ...