feat: 人员出入库

src/components/MyTable/index.tsx

@@ -250,7 +250,6 @@ const MyTable = forwardRef<MyTableMethods, MyTableProps>(
     return (
       <Form form={form} component={false}>
         <Table
-          {...rest}
           className={`${styles.MyTable} MyTable${classKey}`}
           scroll={{ y: yHeight ? yHeight : '' }}
           dataSource={list}
@@ -267,6 +266,7 @@ const MyTable = forwardRef<MyTableMethods, MyTableProps>(
                 }
               : false
           }
+          {...rest}
         />
       </Form>
     )

src/pages/D_storeManage/D3staff/D3edit/index.tsx

@@ -19,11 +19,13 @@ import {
   D3_APIsaveCreate,
   D3_APIsaveDraft
 } from '@/store/action/D3staff'
-import { D3StaffOversiderType, ID3StaffItem } from '../types'
-import { useSelector } from 'react-redux'
+import { D3StaffOversiderType, ID3StaffItem, SON_TYPE_NAME } from '../types'
+import { useDispatch, useSelector } from 'react-redux'
 import { RootState } from '@/store'
 import { OutsiderModal } from '../components/OutsiderModal'
 import { D3STAFF_OUTSIDER_TABLE_COLUMNS } from '../constants'
+import { D2_APIgetList } from '@/store/action/D2storSet'
+import dayjs from 'dayjs'
 
 export const pageTitTxtObj = {
   1: '新增',
@@ -43,12 +45,25 @@ function C21edit() {
   const storeList = useSelector((state: RootState) => state.D2storSet.tableInfo.list)
   const [outsiderVisible, setOutsiderVisible] = useState(false)
   const [oversiderList, setOversiderList] = useState<D3StaffOversiderType[]>([])
+  const { list: storageIdArr } = useSelector((state: RootState) => state.D2storSet.tableInfo)
+  const pageDisabled = ['3', '4'].includes(key)
+  const [checkedOversider, setCheckedOversider] = useState<null | D3StaffOversiderType>(null)
+
+  const dispatch = useDispatch()
+
+  useEffect(() => {
+    dispatch(D2_APIgetList({ pageNum: 1, pageSize: 99999 }))
+  }, [dispatch])
 
   // 创建订单
   const creatFu = useCallback(async () => {
     const res = await D3_APIcreate()
     if (res.code === 0) {
-      setTopInfo(res.data)
+      setTopInfo({
+        ...res.data,
+        sonTypeName: SON_TYPE_NAME.OUT,
+        date: dayjs().format('YYYY-MM-DD')
+      })
     }
   }, [])
 
@@ -56,7 +71,9 @@ function C21edit() {
   const getInfoFu = useCallback(async () => {
     const res = await D3_APIgetInfo(id)
     if (res.code === 0) {
-      setTopInfo(res.data)
+      const { memberIds, ...rest } = res.data
+      setTopInfo(rest)
+      setOversiderList(JSON.parse(memberIds || '') || [])
     }
   }, [id])
 
@@ -127,7 +144,8 @@ function C21edit() {
 
         const obj = {
           ...topInfo,
-          rtf: JSON.stringify(rtf1.val || '')
+          rtf: JSON.stringify(rtf1.val || ''),
+          memberIds: JSON.stringify(oversiderList)
         }
         // console.log(123, obj)
 
@@ -149,7 +167,7 @@ function C21edit() {
         }
       }
     },
-    [auditSta, checkDataFu, topInfo]
+    [auditSta, checkDataFu, oversiderList, topInfo]
   )
 
   // 查看的按钮创建-提交-撤回
@@ -179,7 +197,7 @@ function C21edit() {
     const res = await D3_APIdel(id)
     if (res.code === 0) {
       MessageFu.success('删除成功')
-      history.push('/wealth')
+      history.push('/staff')
     }
   }, [id])
 
@@ -238,7 +256,7 @@ function C21edit() {
           />
         ) : null}
 
-        <Button onClick={() => history.push('/wealth')}>返回</Button>
+        <Button onClick={() => history.push('/staff')}>返回</Button>
       </>
     )
   }, [delFu, lookBtnFu, lookJumpFu, topInfo])
@@ -295,8 +313,12 @@ function C21edit() {
             </div>
             <div className='D4rowrr'>
               <DatePicker
-                showTime
-                onChange={(e, dateString) => setTopInfo({ ...topInfo, date: dateString as string })}
+                disabled={pageDisabled}
+                defaultValue={dayjs(topInfo.date)}
+                style={{ width: '300px' }}
+                onChange={e => {
+                  setTopInfo({ ...topInfo, date: e.format('YYYY-MM-DD') })
+                }}
               />
             </div>
           </div>
@@ -309,7 +331,7 @@ function C21edit() {
               <Input
                 value={topInfo.reason}
                 onChange={e => setTopInfo({ ...topInfo, reason: e.target.value })}
-                readOnly={['3', '4'].includes(key)}
+                readOnly={pageDisabled}
                 placeholder='请输入内容'
                 maxLength={200}
                 showCount
@@ -329,10 +351,21 @@ function C21edit() {
             <div className='D4rowll'>库别名称：</div>
             <div className='D4rowrr'>
               <Select
-                placeholder='请选择'
-                options={storeList}
-                fieldNames={{ label: 'name', value: 'id' }}
-                onChange={e => setTopInfo({ ...topInfo, storageId: e })}
+                disabled={pageDisabled}
+                placeholder='请搜索选择'
+                showSearch
+                filterOption={(input, option) => {
+                  const txt = option!.label
+
+                  return txt.toLowerCase().includes(input.toLowerCase())
+                }}
+                options={storageIdArr.map(v => ({ label: v.num + ' - ' + v.name, value: v.id }))}
+                // fieldNames={{ label: 'num', value: 'num' }}
+                allowClear={false}
+                value={topInfo.storageId || null}
+                onChange={e => {
+                  setTopInfo({ ...topInfo, storageId: e ? e : null })
+                }}
               />
             </div>
           </div>
@@ -352,42 +385,87 @@ function C21edit() {
             type='card'
             items={[
               {
-                key: '0',
+                key: SON_TYPE_NAME.OUT,
                 label: '外部人员',
+                disabled: pageDisabled,
                 children: (
                   <>
                     <div className={styles.tabRow}>
                       <Input
+                        readOnly={pageDisabled}
+                        value={topInfo.authUser}
                         addonBefore='陪同人员'
                         placeholder='请填入姓名，以逗号分隔'
                         style={{ width: 500 }}
                         allowClear
+                        onChange={e => setTopInfo({ ...topInfo, authUser: e.target.value })}
                       />
 
-                      <Button type='primary' onClick={() => setOutsiderVisible(true)}>
-                        新增
-                      </Button>
+                      {!pageDisabled && (
+                        <Button type='primary' onClick={() => setOutsiderVisible(true)}>
+                          新增
+                        </Button>
+                      )}
                     </div>
                     <MyTable
+                      readOnly={pageDisabled}
                       rowKey='name'
                       yHeight={200}
                       list={oversiderList}
+                      pagination={false}
                       columnsTemp={D3STAFF_OUTSIDER_TABLE_COLUMNS}
+                      lastBtn={
+                        pageDisabled
+                          ? undefined
+                          : [
+                              {
+                                title: '操作',
+                                render(item: D3StaffOversiderType, _: any, index: number) {
+                                  return (
+                                    <>
+                                      <Button
+                                        size='small'
+                                        type='text'
+                                        onClick={() => {
+                                          setCheckedOversider(item)
+                                          setOutsiderVisible(true)
+                                        }}
+                                      >
+                                        编辑
+                                      </Button>
+                                      <MyPopconfirm
+                                        txtK='删除'
+                                        onConfirm={() => {
+                                          const temp = [...oversiderList]
+                                          temp.splice(index, 1)
+                                          setOversiderList(temp)
+                                        }}
+                                      />
+                                    </>
+                                  )
+                                }
+                              }
+                            ]
+                      }
                     />
                   </>
                 )
               },
               {
-                key: '1',
+                key: SON_TYPE_NAME.IN,
                 label: '内部人员',
+                disabled: pageDisabled,
                 children: (
                   <>
                     <div className={styles.tabRow}>
                       <Input
-                        addonBefore='进库人员 '
+                        readOnly={pageDisabled}
+                        value={topInfo.authUser}
+                        addonBefore='进库人员'
                         placeholder='请填入姓名，以逗号分隔'
                         style={{ width: 500 }}
                         allowClear
+                        onChange={e => setTopInfo({ ...topInfo, authUser: e.target.value })}
                       />
                     </div>
                   </>
@@ -405,7 +483,7 @@ function C21edit() {
 
       {/* 底部按钮 */}
       <div className='D4btn'>
-        {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+        {pageDisabled && topInfo.audits && topInfo.audits.length ? (
           <Button type='primary' onClick={() => setAuditsShow(true)}>
             申请记录
           </Button>
@@ -431,13 +509,14 @@ function C21edit() {
               </Button>
             ) : null}
 
-            <MyPopconfirm txtK='取消' onConfirm={() => history.push('/wealth')} />
+            <MyPopconfirm txtK='取消' onConfirm={() => history.push('/staff')} />
           </>
         )}
       </div>
 
       {/* 添加外部人员 */}
       <OutsiderModal
+        item={checkedOversider}
         visible={outsiderVisible}
         setVisible={setOutsiderVisible}
         onOk={item => setOversiderList([...oversiderList, item])}

src/pages/D_storeManage/D3staff/components/OutsiderModal/index.tsx

@@ -1,28 +1,34 @@
 import { Form, Input, Modal } from 'antd'
-import { FC } from 'react'
+import { FC, useEffect } from 'react'
 import { D3StaffOversiderType } from '../../types'
 
 export interface OutsiderModalProps {
   visible: boolean
+  item: D3StaffOversiderType | null
   setVisible: (v: boolean) => void
   onOk: (item: D3StaffOversiderType) => void
 }
 
-export const OutsiderModal: FC<OutsiderModalProps> = ({ visible, setVisible, onOk }) => {
+export const OutsiderModal: FC<OutsiderModalProps> = ({ visible, item, setVisible, onOk }) => {
   const [form] = Form.useForm()
 
   const handleCancel = () => {
     setVisible(false)
+    form.resetFields()
   }
 
   const handleSubmit = async () => {
     if (!(await form.validateFields())) return
 
     onOk(form.getFieldsValue())
-    setVisible(false)
-    form.resetFields()
+    handleCancel()
   }
 
+  useEffect(() => {
+    if (!item) return
+    form.setFieldsValue(item)
+  }, [item, form])
+
   return (
     <Modal title='外部人员' open={visible} onCancel={handleCancel} onOk={handleSubmit}>
       <Form form={form} labelCol={{ span: 5 }}>

src/pages/D_storeManage/D3staff/constants.ts

@@ -1,17 +1,9 @@
 import { selectObj } from '@/utils/select'
 import { D3StaffSearchType, ID3StaffParams } from './types'
-import { statusObj } from '@/utils/tableData'
-
-export const D3STAFF_PARAM_ROWS: D3StaffSearchType[] = [
-  { name: '业务编号', key: 'num', type: '输入框' },
-  { name: '入库日期范围', key: 'inDate', type: '日期选择' },
-  // { name: '入库人员类型', key: '', type: '输入框' },
-  // { name: '相关库房', key: '', type: '输入框' },
-  { name: '发起部门', key: 'deptName', type: '输入框' }
-]
+import { sonTypeNameObj, statusObj } from '@/utils/tableData'
 
 export const D3STAFF_PARAM_ROWS2: D3StaffSearchType[] = [
-  { name: '发起人', key: 'userName', type: '输入框' },
+  { name: '发起人', key: 'creatorName', type: '输入框' },
   { name: '发起日期范围', key: 'date', type: '日期选择' },
   { name: '申请状态', key: 'status', type: '下拉框', data: selectObj['流程申请状态'] },
   { name: '选择角色', key: 'userType', type: '下拉框', data: selectObj['角色'] }
@@ -20,11 +12,11 @@ export const D3STAFF_PARAM_ROWS2: D3StaffSearchType[] = [
 export const D3STAFF_TABLE_COLUMNS = [
   ['txt', '业务编号', 'num'],
   ['txt', '入库时间', 'name'],
-  ['txt', '入库人员', 'deptName'],
-  ['txt', '入库事由', 'userName'],
-  ['txt', '相关库房', 'createTime'],
+  ['txtChange', '入库人员', 'sonTypeName', sonTypeNameObj],
+  ['txt', '入库事由', 'reason'],
+  ['txt', '相关库房', 'storageName'],
   ['txt', '发起部门', 'deptName'],
-  ['txt', '发起人', 'userName'],
+  ['txt', '发起人', 'creatorName'],
   ['txt', '发起日期', 'createTime'],
   ['txtChange', '申请状态', 'status', statusObj]
 ]
@@ -40,7 +32,7 @@ export const DEFAULT_D3STAFF_PARAMS: ID3StaffParams = {
   pageNum: 1,
   pageSize: 10,
   num: '',
-  userName: '',
+  creatorName: '',
   deptName: '',
   status: '',
   userType: ''

src/pages/D_storeManage/D3staff/index.tsx

@@ -1,25 +1,20 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import styles from './index.module.scss'
 import { useDispatch, useSelector } from 'react-redux'
-import { RootState } from '@/store'
+import store, { RootState } from '@/store'
 import { Button, Cascader, DatePicker, Input, Select } from 'antd'
 import history, { btnFlagFu } from '@/utils/history'
 import MyPopconfirm from '@/components/MyPopconfirm'
 import MyTable from '@/components/MyTable'
-import {
-  D3STAFF_PARAM_ROWS,
-  D3STAFF_PARAM_ROWS2,
-  D3STAFF_TABLE_COLUMNS,
-  DEFAULT_D3STAFF_PARAMS
-} from './constants'
+import { D3STAFF_PARAM_ROWS2, D3STAFF_TABLE_COLUMNS, DEFAULT_D3STAFF_PARAMS } from './constants'
 import { D3StaffSearchType, ID3StaffItem, ID3StaffParams } from './types'
 import { C21_APIdel } from '@/store/action/C21wealth'
 import { MessageFu } from '@/utils/message'
-import dayjs from 'dayjs'
-import { statusObj } from '@/utils/tableData'
-import ExportJsonExcel from 'js-export-excel'
+import { sonTypeNameObj, statusObj } from '@/utils/tableData'
 import { D3_APIList } from '@/store/action/D3staff'
 import { filterEmptyStrings } from '@/utils/objects'
+import { selectObj } from '@/utils/select'
+import { D2_APIgetList } from '@/store/action/D2storSet'
 
 const { RangePicker } = DatePicker
 
@@ -30,6 +25,25 @@ function D3staff() {
   const formDataRef = useRef({ ...DEFAULT_D3STAFF_PARAMS })
   const formDataOldRef = useRef({ ...DEFAULT_D3STAFF_PARAMS })
   const dispatch = useDispatch()
+  const { list: storageIdArr } = useSelector((state: RootState) => state.D2storSet.tableInfo)
+  const D3StaffParamRows = useMemo<D3StaffSearchType[]>(
+    () => [
+      { name: '业务编号', key: 'num', type: '输入框' },
+      // { name: '入库日期范围', key: 'inDate', type: '日期选择' },
+      { name: '入库人员类型', key: 'sonTypeName', type: '下拉框', data: selectObj['入库人员类型'] },
+      {
+        name: '相关库房',
+        key: 'storageInId',
+        type: '下拉框',
+        data: storageIdArr.map(i => ({
+          label: i.name,
+          value: i.id as number
+        }))
+      },
+      { name: '发起部门', key: 'deptName', type: '输入框' }
+    ],
+    [storageIdArr]
+  )
 
   // 输入框的改变
   const txtChangeFu = useCallback(
@@ -135,7 +149,7 @@ function D3staff() {
 
   // 点击操作按钮
   const tableBtnFu = useCallback((id: any, key: string) => {
-    history.push(`/wealth_edit/${key}/${id}`)
+    history.push(`/staff_edit/${key}/${id}`)
   }, [])
 
   // 点击删除
@@ -189,8 +203,6 @@ function D3staff() {
 
   // 点击导出
   const deriveFu = useCallback(async () => {
-    const name = '人员出入库' + dayjs(new Date()).format('YYYY-MM-DD HH:mm')
-
     const res = await D3_APIList(
       {
         ...formDataOldRef.current,
@@ -202,25 +214,29 @@ function D3staff() {
 
     if (res.code === 0) {
       if (res.data.records.length <= 0) return MessageFu.warning('当前搜索条件没有数据!')
-
-      const option = {
-        fileName: name,
-        datas: [
-          {
-            sheetData: res.data.records.map((v: ID3StaffItem) => ({
-              ...v,
-              status: statusObj[v.status as 1]
-            })),
-            sheetName: name,
-            sheetFilter: ['num', 'dateStart', 'authUnit', 'creatorName', 'createTime', 'status'],
-            sheetHeader: ['申请编号', '交修日期', '交修部门', '发起人', '发送日期', '申请状态'],
-            columnWidths: [10, 10, 10, 10, 10, 10]
-          }
-        ]
-      }
-
-      const toExcel = new ExportJsonExcel(option) //new
-      toExcel.saveExcel() //保存
+      store.dispatch({
+        type: 'layout/exInfo',
+        payload: {
+          name: '人员出入库',
+          show: true,
+          arr: [
+            { key: 'num', txt: '业务编号' },
+            { key: 'name', txt: '入库时间' },
+            { key: 'sonTypeName', txt: '入库人员' },
+            { key: 'reason', txt: '入库事由' },
+            { key: 'storageName', txt: '相关库房' },
+            { key: 'deptName', txt: '发起部门' },
+            { key: 'creatorName', txt: '发起人' },
+            { key: 'createTime', txt: '发起日期' },
+            { key: 'status', txt: '申请状态' }
+          ],
+          data: res.data.records.map((v: ID3StaffItem) => ({
+            ...v,
+            status: statusObj[v.status as 1],
+            sonTypeName: sonTypeNameObj[v.sonTypeName]
+          }))
+        }
+      })
     }
   }, [])
 
@@ -232,13 +248,17 @@ function D3staff() {
     formDataRef.current = formData
   }, [formData])
 
+  useEffect(() => {
+    dispatch(D2_APIgetList({ pageNum: 1, pageSize: 99999 }))
+  }, [dispatch])
+
   return (
     <div className={styles.D3staff}>
       <div className='pageTitle'>资源使用</div>
 
       {/* 第一行 */}
       <div className='C1top'>
-        <div className='C1topll C1topllAll'>{searchDom(D3STAFF_PARAM_ROWS)}</div>
+        <div className='C1topll C1topllAll'>{searchDom(D3StaffParamRows)}</div>
       </div>
 
       {/* 第二行 */}
@@ -265,7 +285,7 @@ function D3staff() {
 
       {/* 表格 */}
       <MyTable
-        yHeight={580}
+        yHeight={540}
         list={tableInfo.list}
         columnsTemp={D3STAFF_TABLE_COLUMNS}
         lastBtn={tableLastBtn}

src/pages/D_storeManage/D3staff/types.ts

@@ -1,8 +1,8 @@
 import { FourTableType } from '@/pages/B_enterTibet/B1collect/type'
 
 export interface ID3StaffItem extends FourTableType {
-  id: number
-  num: string
+  memberIds: string
+  sonTypeName: SON_TYPE_NAME
 }
 
 export type D3StaffSearchType = {
@@ -20,8 +20,10 @@ export interface ID3StaffParams {
   date?: string[]
   userType: string
   status: string
-  userName: string
+  creatorName: string
   deptName: string
+  sonTypeName?: SON_TYPE_NAME
+  storageInId?: string
 }
 
 export type D3StaffOversiderType = {
@@ -30,3 +32,13 @@ export type D3StaffOversiderType = {
   papers: string
   remark: string
 }
+
+/**
+ * 人员类型
+ */
+export enum SON_TYPE_NAME {
+  // 外部人员
+  OUT = '1',
+  // 内部人员
+  IN = '2'
+}

src/pages/F_exhibition/F1exhibition/F1edit/index.tsx

@@ -96,7 +96,7 @@ function F1edit() {
   // 查看模式点击审批 编辑
   const lookJumpFu = useCallback(
     (val: '审批' | '编辑') => {
-      history.push(`/impStor_edit/${val === '审批' ? 3 : 2}/${id}`)
+      history.push(`/exhibition_edit/${val === '审批' ? 3 : 2}/${id}`)
       MessageFu.success(`已跳转至${val}页面`)
     },
     [id]
@@ -205,7 +205,7 @@ function F1edit() {
           />
         ) : null}
 
-        <Button onClick={() => history.push('/impStor')}>返回</Button>
+        <Button onClick={() => history.push('/exhibition')}>返回</Button>
       </>
     )
   }, [delFu, lookBtnFu, lookJumpFu, topInfo])
@@ -259,7 +259,7 @@ function F1edit() {
         if (res.code === 0) {
           MessageFu.success('审批成功')
           // 跳详情页
-          history.push(`/impStor_edit/4/${topInfo.id}`)
+          history.push(`/exhibition_edit/4/${topInfo.id}`)
         }
       } else {
         const rtf1 = ZRichTextRef.current?.fatherBtnOkFu() || { flag: true }
@@ -293,7 +293,7 @@ function F1edit() {
           if (res.code === 0) {
             MessageFu.success(`${val}成功`)
             // 跳到详情页
-            history.push(`/impStor_edit/4/${topInfo.id}`)
+            history.push(`/exhibition_edit/4/${topInfo.id}`)
           }
         }
       }

src/pages/Layout/data.ts

@@ -237,7 +237,7 @@ const tabLeftArr: RouterType = [
     ]
   },
   {
-    id: 6,
+    id: 900,
     name: '展品管理',
     son: [
       {

src/utils/exportWordTemplates.ts

@@ -29,7 +29,30 @@ export enum EXPORT_WORD_ENUM {
 const WORD_FILE_NAME_MAP = {
   [EXPORT_WORD_ENUM.BORROW]: {
     fileName: '义乌市博物馆借用藏品点交凭证',
-    templateName: '1.docx'
+    templateName: '1.docx',
+    // 每个字段单行最大字符数
+    perLine: {
+      num: 9,
+      name: 14,
+      rtf: 11,
+      dictTexture3: 6
+    },
+    row: {
+      // 首页最大行数
+      maxRowFirstPage: 1,
+      // 尾页最大行数
+      maxRowLastPage: 2,
+      // 每页最大行数
+      maxRowPage: 5,
+      // 首页单行最大字符行数
+      maxFirstCharLine: 9,
+      // 尾页单行最大字符行数
+      maxLastCharLine: 11,
+      // 每页最大字符行数
+      maxCharLine: 27,
+      // 表格每行最小字符行数
+      minRowCharLine: 4
+    }
   },
   [EXPORT_WORD_ENUM.HALL_PUT_BACK]: {
     fileName: '义乌市博物馆藏品馆内提退凭单',
@@ -154,8 +177,12 @@ export const exportWordHandler = async (type: EXPORT_WORD_ENUM, data: Record<any
   temp.sizeUnit && (temp.sizeUnit = resJiLianFu(temp.sizeUnit))
   temp.qualityUnit && (temp.qualityUnit = resJiLianFu(temp.qualityUnit))
   temp.dictAge && (temp.dictAge = resJiLianFu(temp.dictAge))
+  temp.goods =
+    (Array.isArray(temp.snaps) && temp.snaps.length
+      ? temp.snaps.map((i: any) => JSON.parse(i.snap || ''))
+      : temp.collects) ?? []
 
-  if (Array.isArray(temp.goods) && temp.goods.length) {
+  if (temp.goods.length) {
     for (let i = 0; i < temp.goods.length; i++) {
       const good = temp.goods[i]
       good.index = i + 1

src/utils/select.ts

@@ -1,3 +1,5 @@
+import { SON_TYPE_NAME } from '@/pages/D_storeManage/D3staff/types'
+
 export const selectObj = {
   申请状态: [
     { value: 1, label: '草稿' },
@@ -105,5 +107,9 @@ export const selectObj = {
     { value: 'XF', label: '文物修复' },
     { value: 'ZL', label: '展览申请' },
     { value: 'ZDJ', label: '藏品总登记号' }
+  ],
+  入库人员类型: [
+    { value: SON_TYPE_NAME.IN, label: '内部人员' },
+    { value: SON_TYPE_NAME.OUT, label: '外部人员' }
   ]
 }

src/utils/tableData.ts

@@ -16,6 +16,7 @@
 
 import { D6typeArr } from '@/pages/D_storeManage/D6putsStor/data'
 import { selectObj } from './select'
+import { SON_TYPE_NAME } from '@/pages/D_storeManage/D3staff/types'
 
 // 附件归档
 export const ZypFileTable = [
@@ -254,7 +255,10 @@ export const D4tableC = [
 ]
 
 // 提退类型obj
-export const sonTypeNameObj: any = {}
+export const sonTypeNameObj = {
+  [SON_TYPE_NAME.IN]: '内部人员',
+  [SON_TYPE_NAME.OUT]: '外部人员'
+}
 D6typeArr.forEach(v => {
   businessTypeObj[v.value] = v.label
 })