canrd-main / canrd-erp-front · Commits

Commit ad24bea11805140d6e2dbaa9a4701bd365e7c461

Authored by boyang
1 parent 17ed7bec
build: skipped

fix: 修改预存账号选择器bug

Inline Side-by-side
Showing 2 changed files with 13 additions and 5 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
  View file @ad24bea
@@ -1131,7 +1131,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => { @@ -1131,7 +1131,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1131 autoFillSalesInfo(option); 1131 autoFillSalesInfo(option);
1132 1132
1133 // 检查是否是特殊的淘宝销售代码 1133 // 检查是否是特殊的淘宝销售代码
1134 - const isTaobaoSalesCode = ['TB', 'TBHC', 'HCTB'].includes(value); 1134 + const isTaobaoSalesCode = ['TB', 'TBC', 'HCTB'].includes(value);
1135 1135
1136 if (isTaobaoSalesCode) { 1136 if (isTaobaoSalesCode) {
1137 // 设置支付渠道为淘宝并锁定 1137 // 设置支付渠道为淘宝并锁定
@@ -1831,8 +1831,16 @@ export default ({ onClose, data, subOrders, orderOptType }) => { @@ -1831,8 +1831,16 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1831 rules={[{ required: true, message: '支付渠道必填' }]} 1831 rules={[{ required: true, message: '支付渠道必填' }]}
1832 disabled={optType('after-sales-check') || paymentChannelDisabled} 1832 disabled={optType('after-sales-check') || paymentChannelDisabled}
1833 onChange={(val: any) => { 1833 onChange={(val: any) => {
1834 - // 当支付渠道选为扣预存或淘宝时，付款方式默认锁定为预付  
1835 - if (val === 'BALANCE' || val === 'TAOBAO') { 1834 + // 根据支付渠道设置不同的支付方式
  1835 + if (val === 'BALANCE') {
  1836 + // 支付渠道为扣预存时，支付方式设置为扣预存
  1837 + setPaymentMethodDisabled(true);
  1838 + form.setFieldsValue({
  1839 + paymentMethod: 'WITHHOLDING_ADVANCE_DEPOSIT',
  1840 + });
  1841 + setPaymentMethod('WITHHOLDING_ADVANCE_DEPOSIT');
  1842 + } else if (val === 'TAOBAO') {
  1843 + // 支付渠道为淘宝时，支付方式设置为预付
1836 setPaymentMethodDisabled(true); 1844 setPaymentMethodDisabled(true);
1837 form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_ADVANCE' }); 1845 form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_ADVANCE' });
1838 setPaymentMethod('PAYMENT_IN_ADVANCE'); 1846 setPaymentMethod('PAYMENT_IN_ADVANCE');
@@ -1867,7 +1875,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => { @@ -1867,7 +1875,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1867 disabled: true, 1875 disabled: true,
1868 }, 1876 },
1869 { 1877 {
1870 - label: '扣预存', 1878 + label: '预付',
1871 value: 'WITHHOLDING_ADVANCE_DEPOSIT', 1879 value: 'WITHHOLDING_ADVANCE_DEPOSIT',
1872 disabled: true, 1880 disabled: true,
1873 }, 1881 },
src/pages/Order/constant.ts
  View file @ad24bea
@@ -28,7 +28,7 @@ export const PAYMENT_METHOD_OPTIONS = { @@ -28,7 +28,7 @@ export const PAYMENT_METHOD_OPTIONS = {
28 TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款', 28 TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款',
29 OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网订单已付款', 29 OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网订单已付款',
30 PAYMENT_IN_ADVANCE: '预付款', 30 PAYMENT_IN_ADVANCE: '预付款',
31 - WITHHOLDING_ADVANCE_DEPOSIT: '扣预存', 31 + WITHHOLDING_ADVANCE_DEPOSIT: '预付',
32 PLATFORM_SETTLEMENT: '平台结算', 32 PLATFORM_SETTLEMENT: '平台结算',
33 CASH_ON_DELIVERY: '货到付款', 33 CASH_ON_DELIVERY: '货到付款',
34 HIRE_PURCHASE: '分期付款', 34 HIRE_PURCHASE: '分期付款',