fix: 增加精确搜索

package.json

 {
   "name": "panda-xform",
-  "version": "5.9.28",
-  "description": "5.9.28 BUG修复",
+  "version": "5.9.29",
+  "description": "5.9.29 增加精确搜索",
   "keywords": [
     "panda-xform"
   ],

src/core/Account/components/SearchGroup/index.js

-import React, { useMemo, useState, forwardRef, useImperativeHandle } from 'react'
-import { Row, DatePicker, Select, Button, Input, message, Upload, Dropdown, Menu, Form } from 'antd'
+import React, { useMemo, useState, forwardRef, useImperativeHandle, useEffect } from 'react'
+import { Row, DatePicker, Select, Button, Input, message, Upload, Dropdown, Menu, Form, Typography, Space } from 'antd'
 import 'dayjs/locale/zh-cn'
 import locale from 'antd/es/date-picker/locale/zh_CN'
 import { PlusOutlined, DeleteOutlined, ImportOutlined, ExportOutlined, QuestionCircleOutlined, EditOutlined, DownOutlined } from '@ant-design/icons'
@@ -17,9 +17,10 @@ const SearchGroup = forwardRef((props, ref) => {
     getQueryInfo,
   }))
 
-  const { accountName, config, notUse, checkName, btnsClick, keys } = props
+  const { accountName, config, notUse, checkName, btnsClick, keys, fieldSearch } = props
   const { enableBatchOperation, enableImportExport, exportTemplateName, enablePrint, enableQuickSearch, enableTimeFilter, parent, accountFieids } = config
   const [form] = Form.useForm()
+  const [searchLabel, setSearchLabel] = useState('快捷搜索')
   const [dateArray, setDateArray] = useState([])
   const [formatterStr, setFormatterStr] = useState('YYYY-MM-DD HH:mm:ss')
   const [queryInfo, setQueryInfo] = useState({ info: '', timeFrom: '', timeTo: '' })
@@ -279,7 +280,7 @@ const SearchGroup = forwardRef((props, ref) => {
         </Button>
       ),
       key: '导出单据',
-    }: null
+    } : null
   ]
 
   const onSearch = e => {
@@ -297,16 +298,65 @@ const SearchGroup = forwardRef((props, ref) => {
     let params = {};
     params.timeFrom = (data.time && data.time[0].format('YYYY-MM-DD HH:mm:ss')) || '';
     params.timeTo = (data.time && data.time[1].format('YYYY-MM-DD HH:mm:ss')) || '';
+    if (searchLabel === '快捷搜索') {
       params.info = data.info;
+      params.queryForm = []
+    } else {
+      params.queryForm = [{ field: searchLabel, type: '模糊查询', value: data.info }]
+      params.info = ''
+    }
+
     props && props.onChange(params);
     return params;
   };
 
   const reset = () => {
     form.resetFields()
+    setSearchLabel('快捷搜索')
     btnsClick({ type: '重置' })
   }
 
+  const getSearchLabel = () => {
+
+    const menuClick = (value) => {
+      setSearchLabel(value.key)
+    }
+
+    const menu = (
+      <Menu onClick={menuClick}>
+        <Menu.Item key={'快捷搜索'}>{'快捷搜索'}</Menu.Item>
+        {
+          accountFieids.map(v => {
+            if (v.likeSearch) {
+              return <Menu.Item key={v.fieldName}>{v.fieldName}</Menu.Item>
+            }
+            return null
+          })
+        }
+      </Menu>
+    )
+
+    if (fieldSearch) {
+      return (
+        <div>
+          <Dropdown
+            overlay={menu}
+          >
+            <Space>
+              {searchLabel}
+              <DownOutlined />
+            </Space>
+          </Dropdown>
+        </div>
+      )
+    }
+    return '快捷搜索'
+  }
+
+  useEffect(() => {
+    setSearchLabel('快捷搜索')
+  }, [accountName])
+
   return (
     <Row className={styles.controlRow}>
       <Form layout={'inline'} form={form} onValuesChange={onValuesChange}>
@@ -327,7 +377,11 @@ const SearchGroup = forwardRef((props, ref) => {
         }
         {
           searchShow ? (
-            <Form.Item label={'快捷搜索'} name="info" style={{ marginBottom: 0 }}>
+            <Form.Item
+              label={getSearchLabel()}
+              name="info"
+              style={{ marginBottom: 0 }}
+            >
               <Search
                 size="middle"
                 style={{
@@ -397,6 +451,7 @@ const SearchGroup = forwardRef((props, ref) => {
       </div>
     </Row>
   )
+
 })
 
 export default SearchGroup

src/core/Account/index.js

@@ -48,7 +48,7 @@ const Account = (props, ref) => {
     getTableColumns,
   }));
 
-  const { accountName, parentConfig, notUse, superAccount, siteLevel } = props;
+  const { accountName, parentConfig, notUse, superAccount, siteLevel, fieldSearch } = props;
   const userID = window?.globalConfig?.userInfo?.OID || 1;
   const initParams = {
     user: userID,
@@ -62,6 +62,8 @@ const Account = (props, ref) => {
     timeFrom: '',
     timeTo: '',
     info: '',
+    queryForm: [],
+    queryTable: [],
     queryWheres: [],
   };
   const [treeShow, setTreeShow] = useState(true);
@@ -317,11 +319,12 @@ const Account = (props, ref) => {
 
   const getDataSource = async (param = {}) => {
     setLoading(true);
-    const { code, data, msg } = await GetAccountPageList({ ...params, ...param });
+    let totalParmas = { ...params, ...param }
+    const { code, data, msg } = await GetAccountPageList({ ...totalParmas, queryWheres: [...totalParmas.queryForm, ...totalParmas.queryTable] });
     if (code === 0) {
       setDataSource(isJson(data.jsonData) ? JSON.parse(data.jsonData) : []);
       setDataList(data.list);
-      setParams({ ...params, ...param, total: data.totalCount, pageIndex: data.pageIndex, pageSize: data.pageSize });
+      setParams({ ...totalParmas, total: data.totalCount, pageIndex: data.pageIndex, pageSize: data.pageSize });
     } else {
       setDataSource([]);
       setDataList([]);
@@ -344,7 +347,7 @@ const Account = (props, ref) => {
     let param = {
       sortFields: sorter.order ? sorter.field : '录入时间',
       direction: sorter.order !== 'ascend' ? 'desc' : 'asc',
-      queryWheres,
+      queryTable: queryWheres,
     };
     setParams({ ...params, ...param });
     getDataSource(param);
@@ -555,9 +558,10 @@ const Account = (props, ref) => {
                 onChange={search}
                 btnsClick={btnsClick}
                 keys={keys}
-                accountName={accountName}
+                accountName={params.accountName}
                 config={config}
                 notUse={notUse}
+                fieldSearch={fieldSearch}
               />
             </div>
             <div className={styles.bottom}>