Commit db18156decf35004d1cbe4e6398d0c5804ec6de6

Authored by boyang
1 parent 213be1c9

fix: 修改支付选择器

src/pages/Order/OrderList/OrderDrawer.tsx
@@ -1137,6 +1137,16 @@ export default ({ onClose, data, subOrders, orderOptType }) => { @@ -1137,6 +1137,16 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1137 // 检查是否是特殊的淘宝销售代码 1137 // 检查是否是特殊的淘宝销售代码
1138 const isTaobaoSalesCode = ['TB', 'TBC', 'HCTB'].includes(value); 1138 const isTaobaoSalesCode = ['TB', 'TBC', 'HCTB'].includes(value);
1139 1139
  1140 + // 清空支付渠道和支付方式
  1141 + form.setFieldsValue({
  1142 + paymentChannel: undefined,
  1143 + paymentMethod: undefined,
  1144 + });
  1145 +
  1146 + // 重置支付渠道和支付方式的禁用状态
  1147 + setPaymentChannelDisabled(false);
  1148 + setPaymentMethodDisabled(false);
  1149 +
1140 if (isTaobaoSalesCode) { 1150 if (isTaobaoSalesCode) {
1141 // 设置支付渠道为淘宝并锁定 1151 // 设置支付渠道为淘宝并锁定
1142 form.setFieldsValue({ paymentChannel: 'TAOBAO' }); 1152 form.setFieldsValue({ paymentChannel: 'TAOBAO' });
src/pages/Order/OrderList/OrderList.tsx
@@ -1065,14 +1065,14 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => { @@ -1065,14 +1065,14 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
1065 </span> 1065 </span>
1066 </div> 1066 </div>
1067 {/* 回款状态 */} 1067 {/* 回款状态 */}
1068 - {/* <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap"> 1068 + <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1069 <span className="text-slate-700"> 1069 <span className="text-slate-700">
1070 {enumValueToLabel( 1070 {enumValueToLabel(
1071 optRecord.paymentReceiptStatus, 1071 optRecord.paymentReceiptStatus,
1072 PAYMENT_RECEIPTS_STATUS_OPTIONS, 1072 PAYMENT_RECEIPTS_STATUS_OPTIONS,
1073 )} 1073 )}
1074 </span> 1074 </span>
1075 - </div> */} 1075 + </div>
1076 {/* 回款审核状态 */} 1076 {/* 回款审核状态 */}
1077 {optRecord.paymentReceiptStatus !== null ? ( 1077 {optRecord.paymentReceiptStatus !== null ? (
1078 <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap"> 1078 <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
@@ -3000,7 +3000,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; { @@ -3000,7 +3000,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
3000 ); 3000 );
3001 }} 3001 }}
3002 > 3002 >
3003 - 回款审核(分期) 3003 + 回款审核
3004 </Button> 3004 </Button>
3005 ) : ( 3005 ) : (
3006 '' 3006 ''