diff --git a/src/components/search/SearchForm.jsx b/src/components/search/SearchForm.jsx index cf63c57..1a4a40a 100644 --- a/src/components/search/SearchForm.jsx +++ b/src/components/search/SearchForm.jsx @@ -1,8 +1,8 @@ import { createContext, useContext } from 'react'; -import { toJS } from "mobx"; +import { toJS } from 'mobx'; import { observer } from 'mobx-react'; import { DATE_FORMAT, stores_Context } from './../../config'; -import { SearchOutlined, } from "@ant-design/icons"; +import { SearchOutlined } from '@ant-design/icons'; import { Form, Row, Col, Select, Button, Space, DatePicker } from 'antd'; import moment from 'moment'; // import locale from 'antd/es/date-picker/locale/zh_CN'; @@ -52,6 +52,13 @@ export default observer((props) => { transform: (value) => value?.key || '', default: '', }, + 'HTBusinessUnits': { + key: 'HTBusinessUnits', + transform: (value) => { + return Array.isArray(value) ? value.map((ele) => ele.key).join(',') : value ? (!isNaN(parseInt(value.key), 10) ? value.key : '') : '-1'; + }, + default: '', + }, 'businessUnits': { key: 'businessUnits', transform: (value) => { @@ -69,7 +76,7 @@ export default observer((props) => { 'WebCode': { key: 'WebCode', transform: (value) => { - return Array.isArray(value) ? value.map((ele) => ele.key).join(',') : value ? (value.key) : 'ALL'; + return Array.isArray(value) ? value.map((ele) => ele.key).join(',') : value ? value.key : 'ALL'; }, default: '', }, @@ -131,6 +138,11 @@ export default observer((props) => { default: '', }, ], + 'country': { + key: 'country', + transform: (value) => value?.key || '', + default: '', + }, }; let dest = {}; const { applyDate, applyDate2, year, yearDiff, ...omittedValue } = values; @@ -169,7 +181,7 @@ export default observer((props) => { {getFields({ sort, initialValue, hides, shows, fieldProps, form })} {/* 'textAlign': 'right' */} - +