Commit 6940a4c6b7a29adb384e17c927506752a2a5fc0a
1 parent
702fac0f
feat: 详情不添加省市区
Showing
3 changed files
with
6 additions
and
2 deletions
src/pages/Order/components/OrderDrawer.tsx
@@ -870,8 +870,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -870,8 +870,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
870 | values.institution = values.institution?.trim(); | 870 | values.institution = values.institution?.trim(); |
871 | values.institutionContactName = values.institutionContactName?.trim(); | 871 | values.institutionContactName = values.institutionContactName?.trim(); |
872 | values.customerName = values.customerNameString.trim(); | 872 | values.customerName = values.customerNameString.trim(); |
873 | - values.customerShippingAddress = | ||
874 | - province + city + district + values.customerShippingAddress; | 873 | + // values.customerShippingAddress = |
874 | + // province + city + district + values.customerShippingAddress; | ||
875 | 875 | ||
876 | if (typeof values.erpCustomerId !== 'string') { | 876 | if (typeof values.erpCustomerId !== 'string') { |
877 | values.erpCustomerId = values.erpCustomerId?.id; | 877 | values.erpCustomerId = values.erpCustomerId?.id; |
src/pages/Order/hooks.ts
@@ -46,6 +46,8 @@ export const useFieldAuth = ({ operation }: { operation: OPERATION_TYPE }) => { | @@ -46,6 +46,8 @@ export const useFieldAuth = ({ operation }: { operation: OPERATION_TYPE }) => { | ||
46 | }, | 46 | }, |
47 | } as Record<string, boolean | object>; | 47 | } as Record<string, boolean | object>; |
48 | 48 | ||
49 | + console.log(role); | ||
50 | + | ||
49 | if (operation === OPERATION_TYPE.CREATE) { | 51 | if (operation === OPERATION_TYPE.CREATE) { |
50 | return authFields; | 52 | return authFields; |
51 | } else if (operation === OPERATION_TYPE.EDIT) { | 53 | } else if (operation === OPERATION_TYPE.EDIT) { |
src/pages/Order/index.tsx
@@ -634,6 +634,8 @@ const OrderPage = () => { | @@ -634,6 +634,8 @@ const OrderPage = () => { | ||
634 | * @param optRecord | 634 | * @param optRecord |
635 | */ | 635 | */ |
636 | function getOrderStatusTag(optRecord: any): import('react').ReactNode { | 636 | function getOrderStatusTag(optRecord: any): import('react').ReactNode { |
637 | + console.log(optRecord); | ||
638 | + | ||
637 | const orderStatus = optRecord.orderStatus; | 639 | const orderStatus = optRecord.orderStatus; |
638 | const paymentMethod = optRecord.paymentMethod; | 640 | const paymentMethod = optRecord.paymentMethod; |
639 | let orderStatusTagText = enumValueToLabel( | 641 | let orderStatusTagText = enumValueToLabel( |