diff --git a/src/common/util.ts b/src/common/util.ts index 4d5ae00..a7d93a9 100644 --- a/src/common/util.ts +++ b/src/common/util.ts @@ -44,7 +44,8 @@ export const throttle = (fn, delay) => { export const getFilterData = (val = {}, arr: string[] = []) => { let res = {} for (let key in val) { - if (val[key] !== undefined && val[key] !== null && val[key] !== '' && !arr.includes(key)) { + // undefined == null output: true + if (val[key] != null && val[key] !== '' && !arr.includes(key)) { if (typeof val[key] == 'number') { if (!isNaN(val[key])) { res[key] = val[key] diff --git a/src/pages/saleStatistic/index.tsx b/src/pages/saleStatistic/index.tsx index 8b17652..6d84e30 100644 --- a/src/pages/saleStatistic/index.tsx +++ b/src/pages/saleStatistic/index.tsx @@ -79,7 +79,7 @@ const FilterTimeOptions = { const saleStatistic = () => { const { fetchData } = SaleOrderDataFormApi() - const [saleType, setSaleType] = useState(0) + const [saleType, setSaleType] = useState(null) const [saleDepartmentId, setSaleDepartmentId] = useState(null) const [dateRange, setDateRange] = useState({ date_min: FilterTimeOptions[0].date_min, @@ -165,7 +165,7 @@ const saleStatistic = () => { - true} ref={selectSaleTypeRef}> + true} ref={selectSaleTypeRef}> true} ref={selectMarketingDepartmentRef}> true} defaultValue='0' timeOptions={FilterTimeOptions} ref={selectTimePickerRef}>