xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🎈 perf(ID1000763): 新报小程序报表默认全部销售类型，不要默认货主自营

Browse Source 
https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001000763
This commit is contained in:
xuan 2022-11-18 17:43:21 +08:00
parent 949bb9149b
commit c6f3173e5e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/util.ts
View File

@ -44,7 +44,8 @@ export const throttle = (fn, delay) => {
export const getFilterData = (val = {}, arr: string[] = []) => { export const getFilterData = (val = {}, arr: string[] = []) => {
let res = {} let res = {}
for (let key in val) { 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 (typeof val[key] == 'number') {
if (!isNaN(val[key])) { if (!isNaN(val[key])) {
res[key] = val[key] res[key] = val[key]

4
src/pages/saleStatistic/index.tsx
View File

@ -79,7 +79,7 @@ const FilterTimeOptions = {
const saleStatistic = () => { const saleStatistic = () => {
const { fetchData } = SaleOrderDataFormApi() const { fetchData } = SaleOrderDataFormApi()
const [saleType, setSaleType] = useState<number | null>(0) const [saleType, setSaleType] = useState<number | null>(null)
const [saleDepartmentId, setSaleDepartmentId] = useState<number | null>(null) const [saleDepartmentId, setSaleDepartmentId] = useState<number | null>(null)
const [dateRange, setDateRange] = useState({ const [dateRange, setDateRange] = useState({
date_min: FilterTimeOptions[0].date_min, date_min: FilterTimeOptions[0].date_min,
@ -165,7 +165,7 @@ const saleStatistic = () => {
<View className={styles.saleStatistic}> <View className={styles.saleStatistic}>
<View className={styles['saleStatistic--filterBar']}> <View className={styles['saleStatistic--filterBar']}>
<SelectGroup> <SelectGroup>
<SelectSaleType onChange={onChangeSaleType} onCloseOverlay={()=>true} ref={selectSaleTypeRef}></SelectSaleType> <SelectSaleType onChange={onChangeSaleType} defaultValue={-1} onCloseOverlay={()=>true} ref={selectSaleTypeRef}></SelectSaleType>
<SelectMarketingDepartment onChange={onChangeDepartment} onCloseOverlay={()=>true} ref={selectMarketingDepartmentRef}></SelectMarketingDepartment> <SelectMarketingDepartment onChange={onChangeDepartment} onCloseOverlay={()=>true} ref={selectMarketingDepartmentRef}></SelectMarketingDepartment>
<SelectTimePicker onChange={onChangeTimePicker} onCloseOverlay={()=>true} defaultValue='0' timeOptions={FilterTimeOptions} ref={selectTimePickerRef}></SelectTimePicker> <SelectTimePicker onChange={onChangeTimePicker} onCloseOverlay={()=>true} defaultValue='0' timeOptions={FilterTimeOptions} ref={selectTimePickerRef}></SelectTimePicker>
</SelectGroup> </SelectGroup>