diff --git a/src/components/RefundCodelist/index.tsx b/src/components/RefundCodelist/index.tsx index 8fbb184..8a5265e 100644 --- a/src/components/RefundCodelist/index.tsx +++ b/src/components/RefundCodelist/index.tsx @@ -47,7 +47,7 @@ export default memo((props: Props) => { product_color_code: it.code, product_color_name: it.name, num: it.roll.toString(), - weight: formatWeightDiv(it.actual_weight).toString(), + weight: formatWeightDiv(it.label_weight).toString(), deduction_weight: formatWeightDiv(it.deductions_weight).toString(), settle_weight: formatWeightDiv(it.settle_weight).toString(), deduction_amount: (it.deductions_amount / 100).toString(), diff --git a/src/pages/newCollection/index.tsx b/src/pages/newCollection/index.tsx index 258764e..9fc285f 100644 --- a/src/pages/newCollection/index.tsx +++ b/src/pages/newCollection/index.tsx @@ -30,7 +30,7 @@ export default () => { size: 10, search_name: '', start_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).subtract(14, 'day').format('YYYY-MM-DD')} 00:00:00`, - end_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).format('YYYY-MM-DD')} 00:00:00`, + end_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`, }) const pageNum = useRef({ size: searchField.size, page: searchField.page }) @@ -120,7 +120,7 @@ export default () => { id: 1, name: '默认14天内', start_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).subtract(14, 'day').format('YYYY-MM-DD')} 00:00:00`, - end_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).format('YYYY-MM-DD')} 00:00:00`, + end_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`, checked: true }, { @@ -165,7 +165,7 @@ export default () => { setSearchField({ ...searchField, start_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).subtract(14, 'day').format('YYYY-MM-DD')} 00:00:00`, - end_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).format('YYYY-MM-DD')} 00:00:00`, + end_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`, size: 10 }) setStart(myDate.toLocaleDateString())