Merge branch 'feature-installment2' into 'dev'

feat: 修改回款 See merge request !58

Merge branch 'feature-installment2' into 'dev'
feat: 修改回款 See merge request !58
boyang
2 parents 19e4d1a1 8b207170
Showing 1 changed file with 86 additions and 4 deletions
src/pages/Order/OrderList/OrderList.tsx
@@ -244,6 +244,22 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
   }, [selectedSubOrderKeys]);
   const [procureNotes, setProcureNotes] = useState<string>('');
   console.log(JSON.stringify(userInfo));
+
+  // 付款状态枚举映射
+  const getPaymentStatusText = (status: string | undefined): string => {
+    if (!status) return '无';
+    switch (status) {
+      case 'WAIT_PAYMENT':
+        return '待付款';
+      case 'PARTIAL_PAYMENT':
+        return '部分付款';
+      case 'COMPLETE_PAYMENT':
+        return '已付款';
+      default:
+        return status;
+    }
+  };
+
   const triggerRecordOptNode = async (id) => {
     const res = await postServiceOrderGetCurrentOptNode({
       query: {
@@ -1610,7 +1626,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             ) : (
               ''
             )}
-            {optRecord.paths?.includes('saleCancelInvoicing') ? (
+            {/* {optRecord.paths?.includes('saleCancelInvoicing') ? (
               <ButtonConfirm
                 className="p-0"
                 title="确认取消申请开票？"
@@ -1630,7 +1646,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               />
             ) : (
               ''
-            )}
+            )} */}
             {optRecord.paths?.includes('noNeedInvoicingEdit') ? (
               <Button
                 className="p-0"
@@ -1845,7 +1861,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               ''
             )}
-            {optRecord.paths?.includes('applyInvoicing') ? (
+            {/* {optRecord.paths?.includes('applyInvoicing') ? (
               <Button
                 className="p-0"
                 type="link"
@@ -1860,7 +1876,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               </Button>
             ) : (
               ''
-            )}
+            )} */}
             {optRecord.paths?.includes('applyInvoicing_old') ? (
               <Button
@@ -2723,6 +2739,42 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               {roleCode === 'finance' ? <Divider type="vertical" /> : ''}
+              {/* 添加付款审核状态 */}
+              <div>
+                <span className="text-[#8C8C8C]">付款状态：</span>
+                <span className="text-slate-700">
+                  {getPaymentStatusText(record.paymentAuditStatus)}
+                </span>
+              </div>
+              <Divider type="vertical" />
+
+              {/* 添加已回款金额 */}
+              <div>
+                <span className="text-[#8C8C8C]">已回款金额：￥</span>
+                <span className="text-slate-700">
+                  {record.payedMoney || '0.00'}
+                </span>
+              </div>
+              <Divider type="vertical" />
+
+              {/* 添加未回款金额 */}
+              <div>
+                <span className="text-[#8C8C8C]">未回款金额：￥</span>
+                <span className="text-slate-700">
+                  {record.unPayedMoney || '0.00'}
+                </span>
+              </div>
+              <Divider type="vertical" />
+
+              {/* 添加发票核销金额 */}
+              <div>
+                <span className="text-[#8C8C8C]">发票核销金额：￥</span>
+                <span className="text-slate-700">
+                  {record.invoiceMoney || '0.00'}
+                </span>
+              </div>
+              <Divider type="vertical" />
+
               <div title={record.notes}>
                 <div
                   className="max-w-[850px] whitespace-normal overflow-hidden overflow-ellipsis hover:cursor-pointer"
@@ -3173,6 +3225,36 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                   ) : (
                     ''
                   )}
+                  {record.paths?.includes('saleCancelInvoicing') ? (
+                    <ButtonConfirm
+                      className="p-0"
+                      title="确认取消申请开票？"
+                      text="取消申请（新）"
+                      onConfirm={async () => {
+                        let selectedSubOrders = subOrderSelectedMap.get(
+                          record.id,
+                        );
+                        if (selectedSubOrders === undefined) {
+                          selectedSubOrders = record.subOrderInformationLists;
+                        }
+                        let subOrderIds = selectedSubOrders.map(
+                          (item) => item.id,
+                        );
+                        let res = await postServiceInvoiceCancelApply({
+                          data: {
+                            subOrderIds: subOrderIds,
+                          },
+                        });
+
+                        if (res && res.result === RESPONSE_CODE.SUCCESS) {
+                          message.success(res.message);
+                          refreshTable();
+                        }
+                      }}
+                    />
+                  ) : (
+                    ''
+                  )}
                   {record.paths?.includes('leaderAudit') ? (
                     <Button