fix: 修改淘宝选择器

柏杨
1 parent 4cda179e
Showing 7 changed files with 124 additions and 15 deletions
src/pages/Order/Order/index.tsx
src/pages/Order/OrderList/HirePurchaseUploadPayBillModal.tsx
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/Order/OrderList/OrderList.tsx
src/pages/Order/OrderList/PaymentRecordModal.tsx
src/pages/Order/OrderList/UploadPayBillModal.tsx
src/pages/Order/constant.ts
@@ -120,7 +120,7 @@ const OrderPage = () =&gt; {
     <div className="order-page-container">
       <div id="resizeDiv"></div>
       <div id="resizeDiv"></div>
-      {roleCode !== 'SALES_MANAGER' && (
+      {roleCode === 'SALES_MANAGER' && (
         <Modal
           title="订单预警提醒"
           open={open}
@@ -22,6 +22,14 @@ interface HirePurchaseUploadPayBillModalProps {
   subOrders?: any[];
 }
+// Helper function to display dash for empty values
+// const displayValue = (value: any, formatter?: (val: any) => string): string => {
+//   if (value === null || value === undefined || value === '') {
+//     return '-';
+//   }
+//   return formatter ? formatter(value) : String(value);
+// };
+
 const HirePurchaseUploadPayBillModal: React.FC<
   HirePurchaseUploadPayBillModalProps
 > = ({
@@ -309,7 +317,12 @@ const HirePurchaseUploadPayBillModal: React.FC&lt;
               }}
             >
               <span>订单总金额：</span>
-              <span>{totalPayment.toFixed(2)}元</span>
+              <span>
+                {totalPayment !== null && totalPayment !== undefined
+                  ? totalPayment.toFixed(2)
+                  : '-'}
+                元
+              </span>
             </div>
             <div
               style={{
@@ -319,7 +332,12 @@ const HirePurchaseUploadPayBillModal: React.FC&lt;
               }}
             >
               <span>已回款金额：</span>
-              <span>{installedMoney.toFixed(2)}元</span>
+              <span>
+                {installedMoney !== null && installedMoney !== undefined
+                  ? installedMoney.toFixed(2)
+                  : '-'}
+                元
+              </span>
             </div>
             <div
               style={{
@@ -329,7 +347,12 @@ const HirePurchaseUploadPayBillModal: React.FC&lt;
               }}
             >
               <span>待回款金额：</span>
-              <span>{remainingMoney.toFixed(2)}元</span>
+              <span>
+                {remainingMoney !== null && remainingMoney !== undefined
+                  ? remainingMoney.toFixed(2)
+                  : '-'}
+                元
+              </span>
             </div>
           </div>
           <Form.Item
@@ -1895,7 +1895,60 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             disabled={optType('after-sales-check')}
           />
         </div>
-
+        <ProFormSelect
+          placeholder="请输入支付方式"
+          name="paymentMethod"
+          width="lg"
+          key="paymentMethod"
+          label="支付方式"
+          onChange={(val: any) => {
+            setPaymentMethod(val);
+          }}
+          options={[
+            // 默认可选项
+            ...enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD).map((option) => {
+              // 将淘宝选项设置为禁用状态，使其无法手动选择
+              if (option.value === 'PAYMENT_IN_TAOBAO') {
+                return { ...option, disabled: true };
+              }
+              return option;
+            }),
+            // 强制禁用项
+            { label: '未付款', value: 'UNPAID', disabled: true },
+            {
+              label: '淘宝订单已付款',
+              value: 'TAOBAO_ORDER_HAS_BEEN_PAID',
+              disabled: true,
+            },
+            {
+              label: '官网已付',
+              value: 'OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID',
+              disabled: true,
+            },
+            {
+              label: '淘宝',
+              value: 'PAYMENT_IN_TAOBAO',
+              disabled: true,
+            },
+            {
+              label: '预付',
+              value: 'WITHHOLDING_ADVANCE_DEPOSIT',
+              disabled: true,
+            },
+            { label: '平台结算', value: 'PLATFORM_SETTLEMENT', disabled: true },
+            { label: '已回款', value: 'PAYMENT_RECEIPT', disabled: true },
+            {
+              label: '预存款无需发货',
+              value: 'PREPAID_NO_NEED_SEND',
+              disabled: true,
+            },
+          ]}
+          rules={[{ required: true, message: '支付方式必填' }]}
+          disabled={optType('after-sales-check') || paymentMethodDisabled}
+          fieldProps={{
+            style: paymentMethodDisabled ? { backgroundColor: '#f5f5f5' } : {},
+          }}
+        />
         <ProFormSelect
           placeholder="请输入支付渠道"
           name="paymentChannel"
@@ -1934,7 +1987,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             }
           }}
         />
-        <ProFormSelect
+        {/* <ProFormSelect
           placeholder="请输入支付方式"
           name="paymentMethod"
           width="lg"
@@ -1945,7 +1998,13 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           }}
           options={[
             // 默认可选项
-            ...enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD),
+            ...enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD).map(option => {
+              // 将淘宝选项设置为禁用状态，使其无法手动选择
+              if (option.value === 'PAYMENT_IN_TAOBAO') {
+                return { ...option, disabled: true };
+              }
+              return option;
+            }),
             // 强制禁用项
             { label: '未付款', value: 'UNPAID', disabled: true },
             {
@@ -1981,7 +2040,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           fieldProps={{
             style: paymentMethodDisabled ? { backgroundColor: '#f5f5f5' } : {},
           }}
-        />
+        /> */}
         {/* 隐藏字段用于存储真实UID和privatePocket标志 */}
         <ProFormText name="realPrepaidUid" hidden />
         <ProFormText name="privatePocket" hidden />
@@ -2752,7 +2752,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               <div>
                 <span className="text-[#8C8C8C]">已回款金额：￥</span>
                 <span className="text-slate-700">
-                  {record.payedMoney || '0.00'}
+                  {record.payedMoney || '-'}
                 </span>
               </div>
               <Divider type="vertical" />
@@ -2761,7 +2761,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               <div>
                 <span className="text-[#8C8C8C]">未回款金额：￥</span>
                 <span className="text-slate-700">
-                  {record.unPayedMoney || '0.00'}
+                  {record.unPayedMoney || '-'}
                 </span>
               </div>
               <Divider type="vertical" />
@@ -2770,7 +2770,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               <div>
                 <span className="text-[#8C8C8C]">发票核销金额：￥</span>
                 <span className="text-slate-700">
-                  {record.invoiceMoney || '0.00'}
+                  {record.invoiceMoney || '-'}
                 </span>
               </div>
               <Divider type="vertical" />
@@ -2852,7 +2852,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                   <div>
                     <span className="text-[#8C8C8C]">总金额：￥</span>
                     <span className="text-lg font-medium">
-                      {record.totalPayment}
+                      {record.totalPayment || '-'}
                     </span>
                   </div>
                 ) : (
@@ -20,6 +20,14 @@ interface PaymentRecord {
   paymentReceiptAnnexPartial: string | null;
 }
+// Helper function to display dash for empty values
+const displayValue = (value: any, formatter?: (val: any) => string): string => {
+  if (value === null || value === undefined || value === '') {
+    return '-';
+  }
+  return formatter ? formatter(value) : String(value);
+};
+
 const PaymentRecordModal: React.FC<PaymentRecordModalProps> = ({
   visible,
   mainOrderId,
@@ -90,11 +98,14 @@ const PaymentRecordModal: React.FC&lt;PaymentRecordModalProps&gt; = ({
                 <div className="payment-record-content">
                   <div className="payment-record-info">
                     <p>
-                      <strong>提交时间：</strong> {record.createTime}
+                      <strong>提交时间：</strong>{' '}
+                      {displayValue(record.createTime)}
                     </p>
                     <p>
                       <strong>付款金额：</strong>{' '}
-                      {record.refundMoney.toFixed(2)}
+                      {displayValue(record.refundMoney, (val) =>
+                        val.toFixed(2),
+                      )}
                     </p>
                     {imageUrls.length > 0 && (
                       <p>
@@ -217,7 +217,10 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
         onOpenChange={setVisible}
       >
         <div className="pb-4 text-base font-medium">
-          付款金额：￥{mainOrder?.totalPayment?.toLocaleString() || '0.00'}
+          付款金额：￥
+          {mainOrder?.totalPayment
+            ? mainOrder.totalPayment.toLocaleString()
+            : '-'}
         </div>
         <div className="flex items-start pb-4 text-base font-medium">
           <div>付款凭证：</div>
@@ -200,6 +200,12 @@ export const PAYMENT_RECEIPTS_STATUS_OPTIONS = {
   PARTIAL_RECEIVED: '待提交',
 };
+export const PAYMENT_AUDIT_STATUS_OPTIONS = {
+  WAIT_PAYMENT: '待付款',
+  PARTIAL_PAYMENT: '部分付款',
+  COMPLETE_PAYMENT: '已付款',
+};
+
 export const ORDER_STATUS_OPTIONS = {
   WAIT_CONFIRM_DELIVER_AFTER_INVOICE: '待开票后确认发货',
   SALES_CONFIRM: '销售待确认',
@@ -599,6 +605,13 @@ export const MAIN_ORDER_COLUMNS = [
     valueEnum: enumToProTableEnumValue(ORDER_STATUS_OPTIONS),
   },
   {
+    title: '付款状态',
+    dataIndex: 'paymentAuditStatus',
+    valueType: 'select',
+    hideInTable: true,
+    valueEnum: enumToProTableEnumValue(PAYMENT_AUDIT_STATUS_OPTIONS),
+  },
+  {
     title: '修改审核状态',
     dataIndex: 'modifiedAuditStatus',
     valueType: 'select',