canrd-main / canrd-erp-front · Commits

Commit 4cda179e4dd755ad15d647fa56dadee0de96c162

Authored by 柏杨
1 parent fa87b7a2
build: skipped

fix: 修改选择器

Inline Side-by-side
Showing 3 changed files with 15 additions and 12 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
  View file @4cda179
... ... @@ -156,7 +156,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
156 156 let entity_number = await getTeacherCustomFieldNumber();
157 157  
158 158 //在单位详细信息中拿到自定义字段的值
159   - let customField = res?.custom_field;
  159 + let customField = res?.customField;
160 160 if (customField) {
161 161 let teacherName = customField[entity_number];
162 162 //填充到课题组老师表单字段中
... ... @@ -1199,8 +1199,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1199 1199  
1200 1200 const currentPaymentMethod = form.getFieldValue('paymentMethod');
1201 1201 if (!currentPaymentMethod) {
1202   - form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_ADVANCE' });
1203   - setPaymentMethod('PAYMENT_IN_ADVANCE');
  1202 + form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_TAOBAO' });
  1203 + setPaymentMethod('PAYMENT_IN_TAOBAO');
1204 1204 }
1205 1205 } else if (!optType('copy')) {
1206 1206 // 非复制操作时，清空支付渠道和支付方式
... ... @@ -1218,9 +1218,9 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1218 1218 form.setFieldsValue({ paymentChannel: 'TAOBAO' });
1219 1219 setPaymentChannelDisabled(true);
1220 1220  
1221   - // 支付方式默认锁定为预付
1222   - form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_ADVANCE' });
1223   - setPaymentMethod('PAYMENT_IN_ADVANCE');
  1221 + // 支付方式默认锁定为淘宝
  1222 + form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_TAOBAO' });
  1223 + setPaymentMethod('PAYMENT_IN_TAOBAO');
1224 1224 setPaymentMethodDisabled(true);
1225 1225 } else {
1226 1226 // 如果不是淘宝销售代码，解除锁定
... ... @@ -1924,10 +1924,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1924 1924 });
1925 1925 setPaymentMethod('WITHHOLDING_ADVANCE_DEPOSIT');
1926 1926 } else if (val === 'TAOBAO') {
1927   - // 支付渠道为淘宝时，支付方式设置为预付
  1927 + // 支付渠道为淘宝时，支付方式设置为淘宝
1928 1928 setPaymentMethodDisabled(true);
1929   - form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_ADVANCE' });
1930   - setPaymentMethod('PAYMENT_IN_ADVANCE');
  1929 + form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_TAOBAO' });
  1930 + setPaymentMethod('PAYMENT_IN_TAOBAO');
1931 1931 } else {
1932 1932 // 支付渠道修改为其他的去除锁定状态
1933 1933 setPaymentMethodDisabled(false);
... ... @@ -1960,7 +1960,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1960 1960 },
1961 1961 {
1962 1962 label: '淘宝',
1963   - value: 'PAYMENT_IN_ADVANCE',
  1963 + value: 'PAYMENT_IN_TAOBAO',
1964 1964 disabled: true,
1965 1965 },
1966 1966 {
... ...
src/pages/Order/OrderList/OrderList.tsx
  View file @4cda179
... ... @@ -1084,14 +1084,14 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
1084 1084 </span>
1085 1085 </div>
1086 1086 {/* 回款状态 */}
1087   - <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
  1087 + {/* <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
1088 1088 <span className="text-slate-700">
1089 1089 {enumValueToLabel(
1090 1090 optRecord.paymentReceiptStatus,
1091 1091 PAYMENT_RECEIPTS_STATUS_OPTIONS,
1092 1092 )}
1093 1093 </span>
1094   - </div>
  1094 + </div> */}
1095 1095 {/* 回款审核状态 */}
1096 1096 {optRecord.paymentReceiptStatus !== null ? (
1097 1097 <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
... ...
src/pages/Order/constant.ts
  View file @4cda179
... ... @@ -28,6 +28,7 @@ export const PAYMENT_METHOD_OPTIONS = {
28 28 TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款',
29 29 OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网订单已付款',
30 30 PAYMENT_IN_ADVANCE: '预付款',
  31 + PAYMENT_IN_TAOBAO: '淘宝',
31 32 WITHHOLDING_ADVANCE_DEPOSIT: '预付',
32 33 PLATFORM_SETTLEMENT: '平台结算',
33 34 CASH_ON_DELIVERY: '货到付款',
... ... @@ -38,8 +39,10 @@ export const PAYMENT_METHOD_OPTIONS = {
38 39  
39 40 export const PAYMENT_METHOD_OPTIONS_4_ADD = {
40 41 PAYMENT_IN_ADVANCE: '预付',
  42 + PAYMENT_IN_TAOBAO: '淘宝',
41 43 CASH_ON_DELIVERY: '货到付款',
42 44 HIRE_PURCHASE: '分期付款',
  45 + PREPAID_NO_NEED_SEND: '预存款无需发货',
43 46 };
44 47  
45 48 export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
... ...