fix: 修改选择器

柏杨
1 parent fa87b7a2
Showing 3 changed files with 15 additions and 12 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/Order/OrderList/OrderList.tsx
src/pages/Order/constant.ts
@@ -156,7 +156,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     let entity_number = await getTeacherCustomFieldNumber();
     //在单位详细信息中拿到自定义字段的值
-    let customField = res?.custom_field;
+    let customField = res?.customField;
     if (customField) {
       let teacherName = customField[entity_number];
       //填充到课题组老师表单字段中
@@ -1199,8 +1199,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               const currentPaymentMethod = form.getFieldValue('paymentMethod');
               if (!currentPaymentMethod) {
-                form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_ADVANCE' });
-                setPaymentMethod('PAYMENT_IN_ADVANCE');
+                form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_TAOBAO' });
+                setPaymentMethod('PAYMENT_IN_TAOBAO');
               }
             } else if (!optType('copy')) {
               // 非复制操作时，清空支付渠道和支付方式
@@ -1218,9 +1218,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 form.setFieldsValue({ paymentChannel: 'TAOBAO' });
                 setPaymentChannelDisabled(true);
-                // 支付方式默认锁定为预付
-                form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_ADVANCE' });
-                setPaymentMethod('PAYMENT_IN_ADVANCE');
+                // 支付方式默认锁定为淘宝
+                form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_TAOBAO' });
+                setPaymentMethod('PAYMENT_IN_TAOBAO');
                 setPaymentMethodDisabled(true);
               } else {
                 // 如果不是淘宝销售代码，解除锁定
@@ -1924,10 +1924,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               });
               setPaymentMethod('WITHHOLDING_ADVANCE_DEPOSIT');
             } else if (val === 'TAOBAO') {
-              // 支付渠道为淘宝时，支付方式设置为预付
+              // 支付渠道为淘宝时，支付方式设置为淘宝
               setPaymentMethodDisabled(true);
-              form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_ADVANCE' });
-              setPaymentMethod('PAYMENT_IN_ADVANCE');
+              form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_TAOBAO' });
+              setPaymentMethod('PAYMENT_IN_TAOBAO');
             } else {
               // 支付渠道修改为其他的去除锁定状态
               setPaymentMethodDisabled(false);
@@ -1960,7 +1960,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             },
             {
               label: '淘宝',
-              value: 'PAYMENT_IN_ADVANCE',
+              value: 'PAYMENT_IN_TAOBAO',
               disabled: true,
             },
             {
@@ -1084,14 +1084,14 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                   </span>
                 </div>
                 {/* 回款状态 */}
-                <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
+                {/* <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                   <span className="text-slate-700">
                     {enumValueToLabel(
                       optRecord.paymentReceiptStatus,
                       PAYMENT_RECEIPTS_STATUS_OPTIONS,
                     )}
                   </span>
-                </div>
+                </div> */}
                 {/* 回款审核状态 */}
                 {optRecord.paymentReceiptStatus !== null ? (
                   <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
@@ -28,6 +28,7 @@ export const PAYMENT_METHOD_OPTIONS = {
   TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款',
   OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网订单已付款',
   PAYMENT_IN_ADVANCE: '预付款',
+  PAYMENT_IN_TAOBAO: '淘宝',
   WITHHOLDING_ADVANCE_DEPOSIT: '预付',
   PLATFORM_SETTLEMENT: '平台结算',
   CASH_ON_DELIVERY: '货到付款',
@@ -38,8 +39,10 @@ export const PAYMENT_METHOD_OPTIONS = {
 export const PAYMENT_METHOD_OPTIONS_4_ADD = {
   PAYMENT_IN_ADVANCE: '预付',
+  PAYMENT_IN_TAOBAO: '淘宝',
   CASH_ON_DELIVERY: '货到付款',
   HIRE_PURCHASE: '分期付款',
+  PREPAID_NO_NEED_SEND: '预存款无需发货',
 };
 export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {