feat: 汇总页

src/pages/A1check/A4collect/data.ts

@@ -1,63 +1,13 @@
-import { resDictStr } from '@/utils/select'
-
 export const A4topArr = [
   {
-    key: 'numName',
-    placeholder: '编号类型',
-    type: 'Select',
-    options: resDictStr('编号类型')
+    key: 'cityBase',
+    placeholder: '请选择 省、自治区、直辖市',
+    type: 'Cascader'
   },
   {
-    key: 'num',
-    placeholder: '请输入编号',
+    key: 'collectionUnit',
+    placeholder: '请搜索收藏单位',
     type: 'Input'
-  },
-  {
-    key: 'name',
-    placeholder: '请搜索名称或原名',
-    type: 'Input'
-  },
-  {
-    key: 'level',
-    placeholder: '级别',
-    type: 'Select',
-    options: resDictStr('文物级别')
-  },
-  {
-    key: 'type',
-    placeholder: '类别',
-    type: 'Select',
-    options: resDictStr('类别')
-  },
-  {
-    key: 'status',
-    placeholder: '盘点状态',
-    type: 'Select',
-    options: resDictStr('盘点状态')
-  },
-  {
-    key: 'conform',
-    placeholder: '相符情况',
-    type: 'Select',
-    options: resDictStr('相符情况')
-  },
-  {
-    key: 'unInfo',
-    placeholder: '不符情形',
-    type: 'Select',
-    options: resDictStr('不符情形')
-  },
-  {
-    key: 'reasonInfo',
-    placeholder: '不符原因',
-    type: 'Select',
-    options: resDictStr('不符原因')
-  },
-  {
-    key: 'effect',
-    placeholder: '生效状态',
-    type: 'Select',
-    options: resDictStr('生效状态')
   }
 ]
 

src/pages/A1check/A4collect/index.tsx

@@ -2,27 +2,23 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import styles from './index.module.scss'
 import { A4columnsTemp, A4topArr, A4widthSet } from './data'
 import AAbtn from '@/pages/ZcomPage/AAbtn'
-import { Input, Select, Button } from 'antd'
+import { Cascader, Input, Button } from 'antd'
 import MyTable from '@/components/MyTable'
 import ExportJsonExcel from 'js-export-excel'
 import dayjs from 'dayjs'
 import { MessageFu } from '@/utils/message'
 import { getTokenInfo } from '@/utils/storage'
 import { baseUrlTemp, envFlag } from '@/utils/http'
+import { cityArr } from '@/pages/Z_system/Z4organization/data'
 
 type FormStateType = {
   pageNum: number
   pageSize: number
-  numName?: string
-  num?: string
-  name?: string
-  level?: string
-  type?: string
-  status?: string
-  conform?: string
-  unInfo?: string
-  reasonInfo?: string
-  effect?: string
+  province?: string
+  city?: string
+  region?: string
+  cityBase?: string[]
+  collectionUnit?: string
 }
 
 type CollectRowType = {
@@ -123,6 +119,11 @@ const silentPost = async (url: string, data: any) => {
   }
 }
 
+const buildQueryPayload = (form: FormStateType): FormStateType => {
+  const { cityBase: _cityBase, ...rest } = form
+  return rest
+}
+
 function A4collect() {
   const [formData, setFormData] = useState<FormStateType>({
     pageNum: 1,
@@ -252,15 +253,24 @@ function A4collect() {
         <div className='A4searchRow'>
           {A4topArr.map(item => (
             <div className='A4searchItem' key={item.key}>
-              {item.type === 'Select' ? (
-                <Select
+              {item.type === 'Cascader' ? (
+                <Cascader
                   allowClear
+                  changeOnSelect
+                  options={myCity}
                   placeholder={item.placeholder}
-                  options={item.options}
-                  value={(searchForm as any)[item.key] || null}
-                  onChange={value =>
-                    setSearchForm(prev => ({ ...prev, [item.key]: value || undefined }))
-                  }
+                  value={(searchForm as any)[item.key] || []}
+                  onChange={value => {
+                    const nextValue = (value || []) as string[]
+                    const nextState: FormStateType = {
+                      ...searchForm,
+                      cityBase: nextValue.length ? nextValue : undefined
+                    }
+                    cityArr.forEach((field, index) => {
+                      ;(nextState as any)[field] = nextValue[index] || undefined
+                    })
+                    setSearchForm(nextState)
+                  }}
                 />
               ) : (
                 <Input
@@ -283,18 +293,18 @@ function A4collect() {
           <AAbtn
             txt={1}
             onClick={() =>
-              setFormData({
+              setFormData(buildQueryPayload({
                 ...searchForm,
                 pageNum: 1,
                 pageSize: formData.pageSize
-              })
+              }))
             }
             tit='查询'
           />
           <AAbtn
             txt={2}
             onClick={() => {
-              const resetForm = { pageNum: 1, pageSize: formData.pageSize }
+              const resetForm: FormStateType = { pageNum: 1, pageSize: formData.pageSize }
               setSearchForm(resetForm)
               setFormData(resetForm)
             }}