diff --git a/src/components/SyncForm.tsx b/src/components/SyncForm.tsx index 9d5d260..32c5395 100644 --- a/src/components/SyncForm.tsx +++ b/src/components/SyncForm.tsx @@ -16,7 +16,7 @@ interface SyncFormProps { tableRef: React.MutableRefObject; onFinish: (values: any) => Promise; siteId?: string; - dateRange?: [dayjs.Dayjs, dayjs.Dayjs]; + initialValues?: any; } /** @@ -28,7 +28,10 @@ const SyncForm: React.FC = ({ tableRef, onFinish, siteId, - dateRange, + initialValues = { + // 默认一星期 + dateRange: [dayjs().subtract(1, 'week'), dayjs()], + }, }) => { // 使用 antd 的 App 组件提供的 message API const [loading, setLoading] = React.useState(false); @@ -57,9 +60,7 @@ const SyncForm: React.FC = ({ // 返回一个抽屉表单 return ( - initialValues={{ - dateRange: [dayjs().subtract(1, 'week'), dayjs()], - }} + initialValues={initialValues} title="同步订单" // 表单的触发器,一个带图标的按钮 trigger={ @@ -75,9 +76,20 @@ const SyncForm: React.FC = ({ destroyOnHidden: true, }} // 表单提交成功后的回调 - onFinish={onFinish} + onFinish={async (values) => { + const normalValues = { + ...values, + dateRange: values.dateRange + ? [ + dayjs(values.dateRange[0]).format('YYYY-MM-DDTHH:mm:s[Z]'), + dayjs(values.dateRange[1]).add(1, 'day').format('YYYY-MM-DDTHH:mm:s[Z]'), + ] + : [], + }; + await onFinish(normalValues); + }} > - + {/* 站点选择框 */} = ({ name="dateRange" label="同步日期范围" placeholder={['开始日期', '结束日期']} - transform={(value) => { - return { - dateRange: value, - }; - }} fieldProps={{ showTime: false, - style: { width: '100%' }, }} /> - ); }; diff --git a/src/pages/Customer/StatisticList/index.tsx b/src/pages/Customer/StatisticList/index.tsx index 09d098d..8ee1138 100644 --- a/src/pages/Customer/StatisticList/index.tsx +++ b/src/pages/Customer/StatisticList/index.tsx @@ -27,9 +27,9 @@ const ListPage: React.FC = () => { dataIndex: 'username', hideInSearch: true, render: (_, record) => { - if (record.billing.first_name || record.billing.last_name) - return record.billing.first_name + ' ' + record.billing.last_name; - return record.shipping.first_name + ' ' + record.shipping.last_name; + if (record.billing?.first_name || record.billing?.last_name) + return record.billing?.first_name + ' ' + record.billing?.last_name; + return record.shipping?.first_name + ' ' + record.shipping?.last_name; }, }, { @@ -132,7 +132,7 @@ const ListPage: React.FC = () => { title: '联系电话', dataIndex: 'phone', hideInSearch: true, - render: (_, record) => record?.billing.phone || record?.shipping.phone, + render: (_, record) => record.phone ?? record?.billing?.phone ?? record?.shipping?.phone ?? '-', }, { title: '账单地址', diff --git a/src/pages/Order/List/index.tsx b/src/pages/Order/List/index.tsx index 36fd5cb..27053ea 100644 --- a/src/pages/Order/List/index.tsx +++ b/src/pages/Order/List/index.tsx @@ -612,13 +612,14 @@ const ListPage: React.FC = () => { { try { + console.log('values',values); const { success, message: errMsg, data, } = await ordercontrollerSyncorders(values, { - after: values.dateRange?.[0] + 'T00:00:00Z', - before: values.dateRange?.[1] + 'T23:59:59Z', + after: values.dateRange?.[0], + before: values.dateRange?.[1], }); if (!success) { throw new Error(errMsg); diff --git a/src/pages/Product/List/index.tsx b/src/pages/Product/List/index.tsx index 3f8a35e..b7b9a7a 100644 --- a/src/pages/Product/List/index.tsx +++ b/src/pages/Product/List/index.tsx @@ -467,7 +467,9 @@ const List: React.FC = () => { 批量修改 , // 批量创建 bundle 产品按钮 - , // 批量同步按钮