up

后台管理/src/pages/A1record/A1add/index.tsx

@@ -13,9 +13,8 @@ import {
 } from 'antd'
 import MyPopconfirm from '@/components/MyPopconfirm'
 import { nationSelect } from '../data'
-import { useDispatch, useSelector } from 'react-redux'
+import { useDispatch } from 'react-redux'
 import { A1_APIgetInfo, A1_APIgetNumList, A1_APIsave } from '@/store/action/A1record'
-import { RootState } from '@/store'
 import A1num from '../A1num'
 import { myCity } from '@/utils/history'
 import TextArea from 'antd/es/input/TextArea'
@@ -161,7 +160,7 @@ function A1add({ sId, closeFu, addTableFu, upTableFu }: Props) {
     dispatch(A1_APIgetNumList())
   }, [dispatch])
 
-  const numList = useSelector((state: RootState) => state.A1record.numList)
+  // const numList = useSelector((state: RootState) => state.A1record.numList)
 
   const [numShow, setNumShow] = useState(false)
 
@@ -220,24 +219,9 @@ function A1add({ sId, closeFu, addTableFu, upTableFu }: Props) {
                     options={nationSelect}
                   />
                 </Form.Item>
-                <div className='A1aRowSon'>
-                  <Form.Item label='番号' name='dictPanId'>
-                    <Select
-                      onChange={e => (fanHaoRef.current = e)}
-                      getPopupContainer={() => formDomRef.current!}
-                      filterOption={(input, option) =>
-                        (option?.label ?? '').toLowerCase().includes(input.toLowerCase())
-                      }
-                      allowClear
-                      placeholder='请搜索并选择'
-                      showSearch
-                      options={numList.map(v => ({ value: v.id, label: v.name }))}
-                    />
-                  </Form.Item>
-                  <Button type='primary' onClick={() => setNumShow(true)}>
-                    管理
-                  </Button>
-                </div>
+                <Form.Item label='番号' name='intro'>
+                  <Input maxLength={50} showCount placeholder='请输入内容' />
+                </Form.Item>
               </div>
 
               <div className='A1aRow'>

后台管理/src/pages/A1record/A1look/index.tsx

@@ -105,7 +105,7 @@ function A1look({ sId }: Props) {
               </div>
               <div className='A1topRow'>
                 <div className='A1top1LL'>番号：</div>
-                <div className='A1top1RR'>{info.dictPanName || '（空）'}</div>
+                <div className='A1top1RR'>{info.intro || '（空）'}</div>
               </div>
               <div className='A1topRow'>
                 <div className='A1top1LL'>籍贯：</div>

后台管理/src/pages/A1record/index.module.scss

@@ -18,6 +18,7 @@
 
       .A1topLeft {
         display: flex;
+        align-items: center;
 
         & > div {
           margin-right: 24px;

后台管理/src/pages/A1record/index.tsx

@@ -5,7 +5,7 @@ import { useDispatch, useSelector } from 'react-redux'
 import { A1_APIdel, A1_APIgetList } from '@/store/action/A1record'
 import { RootState } from '@/store'
 import { MessageFu } from '@/utils/message'
-import { Button, Input, Table } from 'antd'
+import { Button, Checkbox, Input, Table } from 'antd'
 import MyPopconfirm from '@/components/MyPopconfirm'
 import { A1ListType, jiGuanFu, LookInfoType } from './data'
 import A1add from './A1add'
@@ -14,7 +14,8 @@ import ImageLazy from '@/components/ImageLazy'
 const baseFromData = {
   pageNum: 1,
   pageSize: 10,
-  searchKey: ''
+  searchKey: '',
+  display: ''
 }
 
 function A1record() {
@@ -93,7 +94,7 @@ function A1record() {
         render: (item: A1ListType) => (item.gender === 1 ? '男' : '女')
       },
       { title: '民族', width: 100, render: (item: A1ListType) => item.nation || '（空）' },
-      { title: '番号', render: (item: A1ListType) => item.dictPanName || '（空）' },
+      { title: '番号', render: (item: A1ListType) => item.intro || '（空）' },
       {
         title: '籍贯',
 
@@ -177,6 +178,17 @@ function A1record() {
               onChange={e => fromKeyChangeFu(e, 'searchKey')}
             />
           </div>
+          <div>
+            <Checkbox
+              onChange={e => {
+                const val: any = e.target.checked ? 1 : ''
+
+                setFromData({ ...fromData, display: val, pageNum: 1 })
+              }}
+            >
+              寻亲烈士
+            </Checkbox>
+          </div>
         </div>
 
         <div>

后台管理/src/utils/http.ts

@@ -7,8 +7,8 @@ import { domShowFu } from './domShow'
 
 const envFlag = process.env.NODE_ENV === 'development'
 
-// const baseUrlTemp = 'https://sit-jinanlsly.4dage.com' // 测试环境
-const baseUrlTemp = 'http://192.168.20.61:8104' // 线下环境
+const baseUrlTemp = 'https://sit-jinanlsly.4dage.com' // 测试环境
+// const baseUrlTemp = 'http://192.168.20.61:8104' // 线下环境
 
 const baseFlag = baseUrlTemp.includes('https://')