upp

src/pages/A3_ledger/A31register/index.tsx

@@ -1,14 +0,0 @@
-import React from 'react'
-import styles from './index.module.scss'
-function A31register() {
-  return (
-    <div className={styles.A31register}>
-      <div className='pageTitle'>文物信息查询</div>
-      <p>待开发</p>
-    </div>
-  )
-}
-
-const MemoA31register = React.memo(A31register)
-
-export default MemoA31register

src/pages/A3_ledger/A31register/index.module.scss

@@ -1,4 +1,4 @@
-.A31register {
+.A32Routing {
   :global {
   }
 }

src/pages/A3_ledger/A32Routing/index.tsx

@@ -0,0 +1,14 @@
+import React from 'react'
+import styles from './index.module.scss'
+function A32Routing() {
+  return (
+    <div className={styles.A32Routing}>
+      <h1>开发中</h1>
+      <div className='pageTitle'>藏品分账</div>
+    </div>
+  )
+}
+
+const MemoA32Routing = React.memo(A32Routing)
+
+export default MemoA32Routing

src/pages/C_goodsManage/C1ledger/data.ts

@@ -13,7 +13,9 @@ export const C1baseFormData1: TYpeC1Form1 = {
   dictTorn: '',
   source: '',
   statusCollect: '',
-  statusStorage: ''
+  statusStorage: '',
+  aaaa: '',
+  bbbb: ''
 }
 
 export const C1baseFormData2: TYpeC1Form2 = {
@@ -61,12 +63,12 @@ export const C1InputKeyArr2: C1DomArrType = [
     type: '级联',
     data: cascaderObjFu()['入藏日期范围']
   },
-  { name: '征集经过', key: 'sourcePass', type: '输入框' }
-]
-
-export const C1InputKeyArr3: C1DomArrType = [
+  { name: '征集经过', key: 'sourcePass', type: '输入框' },
   { name: '铭记题跋', key: 'sourcePreface', type: '输入框' },
   { name: '鉴藏印记', key: 'sourceStamp', type: '输入框' },
   { name: '著作书目', key: 'historyWork', type: '输入框' },
-  { name: '流转经历', key: 'historyUndergo', type: '输入框' }
+  { name: '流转经历', key: 'historyUndergo', type: '输入框' },
+  // 待完善
+  { name: '入藏去向', key: 'aaaa', type: '下拉框', data: selectObj['入藏去向'] },
+  { name: '展览状态', key: 'aaaa', type: '下拉框', data: selectObj['展览状态'] }
 ]

src/pages/C_goodsManage/C1ledger/index.module.scss

@@ -2,11 +2,17 @@
   background-color: #fff;
   border-radius: 10px;
   padding: 24px 24px 0;
+  position: relative;
   :global {
+    .C4tit {
+      color: #999;
+      margin-left: 10px;
+      font-size: 14px;
+      font-weight: 400;
+    }
     .C1top {
       display: flex;
       justify-content: space-between;
-      margin-bottom: 15px;
       .C1topll {
         display: flex;
         & > div {
@@ -24,6 +30,21 @@
         }
       }
 
+      .C1toprrSuo {
+        width: 100%;
+        margin-top: 15px;
+        text-align: right;
+      }
+
+      .C1toprrKai {
+        position: relative;
+        top: 10px;
+        width: 300px;
+        height: 84px;
+        display: flex;
+        flex-wrap: wrap;
+      }
+
       .C1topllAll {
         width: 100%;
         & > div {
@@ -39,11 +60,22 @@
     }
 
     .C1top2 {
-      height: 40px;
       align-items: center;
+      margin-bottom: 15px;
       .C1topll {
-        margin-top: 8px;
-        width: 980px;
+        width: calc(100% - 320px);
+        flex-wrap: wrap;
+        & > div {
+          margin-top: 23px;
+
+          width: 15%;
+          .ant-input {
+            width: 100%;
+          }
+          .ant-select {
+            width: 100%;
+          }
+        }
       }
     }
     .ant-select-selection-placeholder {

src/pages/C_goodsManage/C1ledger/index.tsx

@@ -1,15 +1,9 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import styles from './index.module.scss'
 import { Button, Cascader, Input, Select } from 'antd'
-import {
-  C1InputKeyArr1,
-  C1InputKeyArr2,
-  C1InputKeyArr3,
-  C1baseFormData,
-  C1baseFormData2
-} from './data'
+import { C1InputKeyArr1, C1InputKeyArr2, C1baseFormData, C1baseFormData2 } from './data'
 import { C1InputKeyType } from './type'
-import history, { openGoodsInfoFu, resJiLianFu } from '@/utils/history'
+import { openGoodsInfoFu, resJiLianFu } from '@/utils/history'
 import MyTable from '@/components/MyTable'
 import { C1tableC, statusCollectObj, statusStorageObj } from '@/utils/tableData'
 import classNames from 'classnames'
@@ -21,6 +15,8 @@ import dayjs from 'dayjs'
 import { MessageFu } from '@/utils/message'
 import { FourTableType } from '@/pages/B_enterTibet/B3_4page/type'
 import ExportJsonExcel from 'js-export-excel'
+import C8recycleBin from '../ComPage/C8recycleBin'
+import C4import from '../ComPage/C4import'
 
 function C1ledger() {
   const dispatch = useDispatch()
@@ -87,6 +83,15 @@ function C1ledger() {
   const tableLastBtn = useMemo(() => {
     return [
       {
+        title: '展览状态',
+        render: (item: FourTableType) => '待完善'
+      },
+      {
+        title: '创建日期',
+        render: (item: FourTableType) => '待完善'
+      },
+
+      {
         title: '操作',
         render: (item: FourTableType) => {
           return (
@@ -223,9 +228,9 @@ function C1ledger() {
               'dictTexture3',
               'dictTorn',
               'source',
-
               'statusCollect',
               'statusStorage'
+              // 待完善 2个字段
             ],
             sheetHeader: [
               '藏品编号',
@@ -251,9 +256,24 @@ function C1ledger() {
     }
   }, [])
 
+  // 点击回收站
+  const [recycleBin, setRecycleBin] = useState(false)
+
+  // 点击数据导入
+  const [importPage, setImportPage] = useState(false)
+
   return (
     <div className={styles.C1ledger}>
-      <div className='pageTitle'>藏品总账</div>
+      <div className='pageTitle'>
+        藏品总账{recycleBin ? '-回收站' : ''}
+        {importPage ? (
+          <>
+            -数据导入<span className='C4tit'>最多支持单次导入1000条</span>
+          </>
+        ) : (
+          ''
+        )}
+      </div>
       {/* 第一行 */}
       <div className='C1top'>
         <div className='C1topll C1topllAll'>{searchDom(C1InputKeyArr1)}</div>
@@ -267,47 +287,31 @@ function C1ledger() {
           <div className='C1topll'></div>
         )}
 
-        <div className='C1toprr'>
-          <Button danger={advanced} onClick={() => advancedFu(!advanced)}>
-            {advanced ? '收起' : ''}高级搜索
+        <div className={classNames(advanced ? 'C1toprrKai' : 'C1toprrSuo')}>
+          <Button type='primary' onClick={() => setRecycleBin(true)}>
+            回收站
+          </Button>
+          &emsp;
+          <Button type='primary' onClick={() => setImportPage(true)}>
+            数据导入
           </Button>
           &emsp;
           <Button type='primary' onClick={deriveFu}>
             批量导出
           </Button>
           &emsp;
-          <Button type='primary' onClick={() => history.push('/register_edit/1/null/3')}>
-            藏品登记
+          <Button danger={advanced} onClick={() => advancedFu(!advanced)}>
+            {advanced ? '收起' : ''}高级搜索
+          </Button>
+          &emsp;
+          <Button type='primary' onClick={clickSearch}>
+            查询
           </Button>
-          {advanced ? null : (
-            <>
-              &emsp;
-              <Button type='primary' onClick={clickSearch}>
-                查询
-              </Button>
-              &emsp;
-              <Button onClick={resetSelectFu}>重置</Button>
-            </>
-          )}
+          &emsp;
+          <Button onClick={resetSelectFu}>重置</Button>
         </div>
       </div>
 
-      {/* 第三行 */}
-      {advanced ? (
-        <div className='C1top C1top2'>
-          <div className='C1topll'>{searchDom(C1InputKeyArr3)}</div>
-          <div className='C1toprr'>
-            <Button type='primary' onClick={clickSearch}>
-              查询
-            </Button>
-            &emsp;
-            <Button type='primary' onClick={resetSelectFu}>
-              重置
-            </Button>
-          </div>
-        </div>
-      ) : null}
-
       {/* 表格 */}
       <MyTable
         yHeight={advanced ? 540 : 595}
@@ -323,6 +327,27 @@ function C1ledger() {
 
       {/* 打开侧边栏 */}
       <Y1cathet sId={cathet} closeFu={() => setCathet(0)} />
+
+      {/* 回收站 */}
+      {recycleBin ? (
+        <C8recycleBin
+          closeFu={flag => {
+            if (flag) getListFu()
+
+            setRecycleBin(false)
+          }}
+        />
+      ) : null}
+
+      {/* 数据导入 */}
+      {importPage ? (
+        <C4import
+          colseFu={flag => {
+            if (flag) resetSelectFu()
+            setImportPage(false)
+          }}
+        />
+      ) : null}
     </div>
   )
 }

src/pages/C_goodsManage/C1ledger/type.d.ts

@@ -17,6 +17,9 @@ export interface TYpeC1Form1 {
   source: string
   statusCollect: string
   statusStorage: string
+  // 待完善
+  aaaa: string
+  bbbb: string
 }
 
 export interface TYpeC1Form2 {

src/pages/A3_ledger/ComPage/C4import/index.module.scss

@@ -0,0 +1,33 @@
+.C4import {
+  background-color: #fff;
+  border-radius: 10px;
+  padding: 15px 24px 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 10;
+  :global {
+    .C4top {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 35px;
+      font-size: 16px;
+      .jianGe {
+        display: inline-block;
+        width: 100px;
+      }
+      .ant-btn {
+        margin-left: 15px;
+      }
+    }
+
+    .C4base {
+      height: 80%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+}

src/pages/A3_ledger/ComPage/C4import/index.tsx

@@ -0,0 +1,69 @@
+import React, { useMemo, useRef, useState } from 'react'
+import styles from './index.module.scss'
+import { Button } from 'antd'
+import MyTable from '@/components/MyTable'
+import { C4tableC } from '@/utils/tableData'
+import MyPopconfirm from '@/components/MyPopconfirm'
+
+type Props = {
+  colseFu: (flag: boolean) => void
+}
+
+function C4import({ colseFu }: Props) {
+  const tableLastBtn = useMemo(() => {
+    return [
+      {
+        title: '导入结果',
+        render: (item: any) => (
+          <Button size='small' type='text'>
+            <a href={item.src} download target='_blank' rel='noreferrer'>
+              下载
+            </a>
+          </Button>
+        )
+      },
+      {
+        title: '操作',
+        render: (item: any) => {
+          return (
+            <>
+              <MyPopconfirm txtK='导入当前合格数据' onConfirm={() => {}} />
+              <Button size='small' type='text' onClick={() => setList([])}>
+                重新上传
+              </Button>
+              <MyPopconfirm txtK='清空数据' onConfirm={() => {}} />
+            </>
+          )
+        }
+      }
+    ]
+  }, [])
+
+  const [list, setList] = useState<any[]>([])
+
+  const flagRef = useRef(false)
+  // 导入合格数据之后变成true
+
+  // 待完善
+  return (
+    <div className={styles.C4import}>
+      <div className='C4top'>
+        <div>
+          一普数据<Button type='primary'>上传表格</Button>
+          <Button>下载模板</Button>
+          <span className='jianGe'></span>
+          省平台数据<Button type='primary'>上传表格</Button>
+          <Button>下载模板</Button>
+        </div>
+        <Button onClick={() => colseFu(flagRef.current)}>返回</Button>
+      </div>
+      <MyTable list={list} columnsTemp={C4tableC} lastBtn={tableLastBtn} pagingInfo={false} />
+
+      {/* 表格 */}
+    </div>
+  )
+}
+
+const MemoC4import = React.memo(C4import)
+
+export default MemoC4import

src/pages/C_goodsManage/C8recycleBin/data.ts

@@ -1,5 +1,5 @@
-import { C1baseFormData1 } from '../C1ledger/data'
-import { TYpeC1Form1 } from '../C1ledger/type'
+import { C1baseFormData1 } from '../../C1ledger/data'
+import { TYpeC1Form1 } from '../../C1ledger/type'
 
 export interface TYpeC8Form extends TYpeC1Form1 {
   pageSize: number

src/pages/C_goodsManage/C8recycleBin/index.module.scss

@@ -2,6 +2,12 @@
   background-color: #fff;
   border-radius: 10px;
   padding: 24px 24px 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 10;
   :global {
     .C8top {
       display: flex;
@@ -32,7 +38,10 @@
         }
       }
       .C8toprr {
+        display: flex;
+        flex-wrap: wrap;
         width: 150px;
+        justify-content: flex-end;
       }
     }
     .ant-select-selection-placeholder {

src/pages/C_goodsManage/C8recycleBin/index.tsx

@@ -1,11 +1,11 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import styles from './index.module.scss'
-import { C1InputKeyArr1 } from '../C1ledger/data'
+import { C1InputKeyArr1 } from '../../C1ledger/data'
 import { Button, Cascader, Input, Select } from 'antd'
 import { C8baseFormData } from './data'
 import { openGoodsInfoFu } from '@/utils/history'
 import classNames from 'classnames'
-import { C1InputKeyType } from '../C1ledger/type'
+import { C1InputKeyType } from '../../C1ledger/type'
 import MyTable from '@/components/MyTable'
 import { C1tableC } from '@/utils/tableData'
 import Y1cathet from '@/pages/Y_goodsDetails/Y1cathet'
@@ -15,7 +15,11 @@ import { C8_APIgetList, C8_APIrecover } from '@/store/action/C8recycleBin'
 import { MessageFu } from '@/utils/message'
 import { RootState } from '@/store'
 
-function C8recycleBin() {
+type Props = {
+  closeFu: (falg: boolean) => void
+}
+
+function C8recycleBin({ closeFu }: Props) {
   const dispatch = useDispatch()
 
   const [formData, setFormData] = useState(C8baseFormData)
@@ -74,10 +78,13 @@ function C8recycleBin() {
     [formData]
   )
 
+  const changeRef = useRef(false)
+
   const regainFu = useCallback(
     async (id: number) => {
       const res = await C8_APIrecover(id)
       if (res.code === 0) {
+        changeRef.current = true
         MessageFu.success('恢复成功')
         getListFu()
       }
@@ -172,7 +179,7 @@ function C8recycleBin() {
 
   return (
     <div className={styles.C8recycleBin}>
-      <div className='pageTitle'>回收站</div>
+      {/* <div className='pageTitle'>回收站</div> */}
       <div className='C8top'>
         <div className='C8topll'>{searchDom(C1InputKeyArr1)}</div>
         <div className='C8toprr'>
@@ -181,11 +188,14 @@ function C8recycleBin() {
           </Button>
           &emsp;
           <Button onClick={resetSelectFu}>重置</Button>
+          &emsp;
+          <Button onClick={() => closeFu(changeRef.current)}>返回</Button>
         </div>
       </div>
 
       {/* 表格 */}
       <MyTable
+        classKey='C8recycleBin'
         yHeight={586}
         list={tableInfo.list}
         columnsTemp={[...C1tableC, ['txt', '删除日期', 'updateTime']]}

src/pages/B_enterTibet/B3goodsTable/B3GaddNew/index.tsx

@@ -28,7 +28,7 @@ import { baseURL } from '@/utils/http'
 import { fileImgArr, fileVideoArr } from '@/store/action/layout'
 import { API_C2dels } from '@/store/action/C2files'
 import { API_goodsAdd, API_goodsInfo } from '@/store/action/C1ledger'
-import { C1GoodType } from '@/pages/C_goodsManage/C1ledger/type'
+import { C1GoodType } from '@/pages/A3_ledger/C1ledger/type'
 import { MessageFu } from '@/utils/message'
 import { cascaderObjFu } from '@/utils/history'
 

src/pages/B_enterTibet/B3goodsTable/B3GaddNow/index.tsx

@@ -6,7 +6,7 @@ import MyTable from '@/components/MyTable'
 import { B3eTableC } from '@/utils/tableData'
 import { cascaderObjFu, openGoodsInfoFu } from '@/utils/history'
 import { MessageFu } from '@/utils/message'
-import { C1GoodType } from '@/pages/C_goodsManage/C1ledger/type'
+import { C1GoodType } from '@/pages/A3_ledger/C1ledger/type'
 import { API_goodsNowAdd } from '@/store/action/C1ledger'
 import { selectObj } from '@/utils/select'
 import { B3nowSearchType } from './type'

src/pages/B_enterTibet/B3goodsTable/index.tsx

@@ -12,7 +12,7 @@ import B3GaddNow from './B3GaddNow'
 import { forwardRef, useImperativeHandle } from 'react'
 import B3GaddNew from './B3GaddNew'
 import { TypeB3PageSta } from '../B3_4page/type'
-import { C1GoodType } from '@/pages/C_goodsManage/C1ledger/type'
+import { C1GoodType } from '@/pages/A3_ledger/C1ledger/type'
 
 const sonUrlObj = {
   1: 'cms/orderHouse/goods/getList',

src/pages/C_goodsManage/C3focus/index.tsx

@@ -1,10 +1,10 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import styles from './index.module.scss'
 import { useDispatch, useSelector } from 'react-redux'
-import { C1baseFormData, C1InputKeyArr1 } from '../C1ledger/data'
+import { C1baseFormData, C1InputKeyArr1 } from '../../A3_ledger/C1ledger/data'
 import ExportJsonExcel from 'js-export-excel'
 import { C3_APIfocusNo, C3_APIgetList } from '@/store/action/C3focus'
-import { C1InputKeyType } from '../C1ledger/type'
+import { C1InputKeyType } from '../../A3_ledger/C1ledger/type'
 import { FourTableType } from '@/pages/B_enterTibet/B3_4page/type'
 import { Button, Cascader, Input, Select } from 'antd'
 import { openGoodsInfoFu, resJiLianFu } from '@/utils/history'

src/pages/C_goodsManage/C4import/index.module.scss

@@ -1,24 +0,0 @@
-.C4import {
-  background-color: #fff;
-  border-radius: 10px;
-  padding: 15px 24px 0;
-  :global {
-    .C4tit {
-      color: #999;
-      margin-left: 10px;
-      font-size: 14px;
-      font-weight: 400;
-    }
-    .C4top {
-      text-align: right;
-      margin-bottom: 35px;
-    }
-
-    .C4base {
-      height: 80%;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-  }
-}

src/pages/C_goodsManage/C4import/index.tsx

@@ -1,73 +0,0 @@
-import React, { useMemo, useState } from 'react'
-import styles from './index.module.scss'
-import { Button } from 'antd'
-import MyTable from '@/components/MyTable'
-import { C4tableC } from '@/utils/tableData'
-import MyPopconfirm from '@/components/MyPopconfirm'
-function C4import() {
-  const tableLastBtn = useMemo(() => {
-    return [
-      {
-        title: '导入结果',
-        render: (item: any) => (
-          <Button size='small' type='text'>
-            <a href={item.src} download target='_blank' rel='noreferrer'>
-              下载
-            </a>
-          </Button>
-        )
-      },
-      {
-        title: '操作',
-        render: (item: any) => {
-          return (
-            <>
-              <>
-                <MyPopconfirm txtK='导入当前合格数据' onConfirm={() => {}} />
-                <Button size='small' type='text' onClick={() => setList([])}>
-                  重新上传
-                </Button>
-                <MyPopconfirm txtK='清空数据' onConfirm={() => {}} />
-              </>
-            </>
-          )
-        }
-      }
-    ]
-  }, [])
-
-  const [list, setList] = useState<any[]>([])
-
-  return (
-    <div className={styles.C4import}>
-      <div className='pageTitle'>
-        藏品导入<span className='C4tit'>最多支持单次导入1000条</span>
-      </div>
-
-      <div className='C4top'>
-        <Button>下载模板</Button>
-      </div>
-      {list.length ? (
-        <MyTable list={list} columnsTemp={C4tableC} lastBtn={tableLastBtn} pagingInfo={false} />
-      ) : (
-        <div className='C4base'>
-          <Button
-            size='large'
-            type='primary'
-            onClick={() =>
-              setList([{ id: 1, hang1: '560', hang2: '520', hang3: '40', src: 'xxxx' }])
-            }
-          >
-            上传表格
-          </Button>
-        </div>
-      )}
-
-      {/* 表格 */}
-    </div>
-  )
-}
-
-const MemoC4import = React.memo(C4import)
-
-export default MemoC4import

src/pages/D_storeManage/D4impStor/D4edit/index.tsx

@@ -38,7 +38,7 @@ import { useDispatch, useSelector } from 'react-redux'
 import { RootState } from '@/store'
 import { D2_APIgetList } from '@/store/action/D2storSet'
 import { D1_APIgetSiteList } from '@/store/action/D1storage'
-import { C1GoodType } from '@/pages/C_goodsManage/C1ledger/type'
+import { C1GoodType } from '@/pages/A3_ledger/C1ledger/type'
 import { TypeD2list } from '../../D2storSet/type'
 import { KuIsTreeType } from '../type'
 import { EXbtnFu } from '@/utils/EXBtn'
@@ -263,6 +263,17 @@ function D4edit() {
     ]
   }, [cathet])
 
+  const siteStrRes = useCallback((siteStr: string) => {
+    let res: any = undefined
+
+    if (siteStr) {
+      let arr = siteStr.split(',')
+      if (arr.length >= 5) arr = arr.slice(1)
+      res = arr
+    }
+    return res
+  }, [])
+
   const tableLastBtn = useMemo(() => {
     return [
       {
@@ -276,7 +287,7 @@ function D4edit() {
               placeholder='请选择'
               // fieldNames={{ label: 'name', value: 'id', children: 'children' }}
               allowClear={false}
-              value={item.siteStr ? item.siteStr.split(',') : undefined}
+              value={siteStrRes(item.siteStr)}
               onChange={(e, e2) => {
                 let lastId: any = ''
                 if (e2 && e2.length === 4) lastId = e2[3].lastId
@@ -318,7 +329,7 @@ function D4edit() {
         }
       }
     ]
-  }, [key, kuIsTree, topInfo])
+  }, [key, kuIsTree, topInfo, siteStrRes])
 
   // 点击新增
   const [nowSta, setNowSta] = useState({ key: '', id: '' })

src/pages/D_storeManage/D6putsStor/D6edit/index.tsx

@@ -31,7 +31,7 @@ import {
   D6_APIsaveCreate,
   D6_APIsaveDraft
 } from '@/store/action/D6putsStor'
-import { C1GoodType } from '@/pages/C_goodsManage/C1ledger/type'
+import { C1GoodType } from '@/pages/A3_ledger/C1ledger/type'
 import { EXbtnFu } from '@/utils/EXBtn'
 import D6impRelation from '../D6impRelation'
 

src/pages/E_goodsStorage/E2damaged/E2edit/index.tsx

@@ -15,7 +15,7 @@ import {
 import { pageTitTxtObj } from '@/pages/D_storeManage/D4impStor/D4edit'
 import { MessageFu } from '@/utils/message'
 import history, { btnFlagFu2, openGoodsInfoFu } from '@/utils/history'
-import { C1GoodType } from '@/pages/C_goodsManage/C1ledger/type'
+import { C1GoodType } from '@/pages/A3_ledger/C1ledger/type'
 import classNames from 'classnames'
 import dayjs from 'dayjs'
 import { Button, DatePicker, Input, Select } from 'antd'

src/pages/Layout/data.ts

@@ -52,9 +52,15 @@ const tabLeftArr: RouterType = [
     son: [
       {
         id: 9801,
-        name: '藏品总登记帐',
+        name: '藏品总账',
         path: '/machineReg',
-        Com: React.lazy(() => import('../A3_ledger/A31register'))
+        Com: React.lazy(() => import('../A3_ledger/C1ledger'))
+      },
+      {
+        id: 9802,
+        name: '藏品分账',
+        path: '/Routing',
+        Com: React.lazy(() => import('../A3_ledger/A32Routing'))
       }
     ]
   },
@@ -94,12 +100,6 @@ const tabLeftArr: RouterType = [
     name: '藏品管理',
     son: [
       {
-        id: 310,
-        name: '藏品总账',
-        path: '/ledger',
-        Com: React.lazy(() => import('../C_goodsManage/C1ledger'))
-      },
-      {
         id: 320,
         name: '藏品附件',
         path: '/files',
@@ -112,12 +112,6 @@ const tabLeftArr: RouterType = [
         Com: React.lazy(() => import('../C_goodsManage/C3focus'))
       },
       {
-        id: 340,
-        name: '藏品导入',
-        path: '/import',
-        Com: React.lazy(() => import('../C_goodsManage/C4import'))
-      },
-      {
         id: 350,
         name: '藏品登记',
         path: '/register',
@@ -140,13 +134,6 @@ const tabLeftArr: RouterType = [
         name: '藏品删除',
         path: '/delete',
         Com: React.lazy(() => import('../C_goodsManage/C7delete'))
-      },
-
-      {
-        id: 380,
-        name: '回收站',
-        path: '/recycleBin',
-        Com: React.lazy(() => import('../C_goodsManage/C8recycleBin'))
       }
     ]
   },

src/pages/Y_goodsDetails/Y1cathet/Y11com.tsx

@@ -2,7 +2,7 @@ import ImageLazy from '@/components/ImageLazy'
 import React from 'react'
 import classNames from 'classnames'
 import { Y11infoArr1, Y11infoArr2, Y11infoArr3, Y11infoArr4, Y11infoArr5 } from './data'
-import { C1GoodType } from '@/pages/C_goodsManage/C1ledger/type'
+import { C1GoodType } from '@/pages/A3_ledger/C1ledger/type'
 
 type Props = {
   info: C1GoodType

src/pages/Y_goodsDetails/Y1cathet/Y1main.tsx

@@ -5,7 +5,7 @@ import Y22com from './Y22com'
 import Y33com from './Y33com'
 import Y44com from './Y44com'
 import { API_goodsInfo } from '@/store/action/C1ledger'
-import { C1GoodType } from '@/pages/C_goodsManage/C1ledger/type'
+import { C1GoodType } from '@/pages/A3_ledger/C1ledger/type'
 
 export type Y1TabArrType = '藏品信息' | '库存信息' | '藏品附件' | '藏品日志'
 

src/pages/Y_goodsDetails/Y1cathet/Y22com.tsx

@@ -1,4 +1,4 @@
-import { C1GoodType } from '@/pages/C_goodsManage/C1ledger/type'
+import { C1GoodType } from '@/pages/A3_ledger/C1ledger/type'
 import { D1siteListType } from '@/pages/D_storeManage/D1storage/type'
 import { D1_APIgetInfo } from '@/store/action/D1storage'
 import { statusStorageObj } from '@/utils/tableData'

src/pages/Y_goodsDetails/Y1cathet/data.tsx

@@ -1,4 +1,4 @@
-import { C1GoodType } from '@/pages/C_goodsManage/C1ledger/type'
+import { C1GoodType } from '@/pages/A3_ledger/C1ledger/type'
 import { resJiLianFu, textFu } from '@/utils/history'
 
 export type ArrKeyType = {

src/pages/Y_goodsDetails/Y2look/index.tsx

@@ -10,7 +10,7 @@ import Y11com from '../Y1cathet/Y11com'
 import Y22com from '../Y1cathet/Y22com'
 import Y33com from '../Y1cathet/Y33com'
 import Y44com from '../Y1cathet/Y44com'
-import { C1GoodType } from '@/pages/C_goodsManage/C1ledger/type'
+import { C1GoodType } from '@/pages/A3_ledger/C1ledger/type'
 import { API_goodsInfo } from '@/store/action/C1ledger'
 import { EXPORT_WORD_ENUM, exportWordHandler } from '@/utils/exportWordTemplates'
 import { API_goodFileList } from '@/store/action/C2files'

src/utils/history.ts

@@ -298,7 +298,7 @@ export function kuIsTreeChangeFu(arr: any[]): KuIsTreeType[] {
     let layer2Node = layer2Map.get(layer2Key)
     if (!layer2Node) {
       layer2Node = {
-        value: item.layer2,
+        value: String(item.layer2),
         label: String(item.layer2),
         children: []
       }
@@ -308,7 +308,7 @@ export function kuIsTreeChangeFu(arr: any[]): KuIsTreeType[] {
 
     // 创建layer3节点
     const layer3Node: KuIsTreeType = {
-      value: item.layer3,
+      value: String(item.layer3),
       label: String(item.layer3),
       lastId: item.id
     }

src/utils/select.ts

@@ -68,5 +68,15 @@ export const selectObj = {
     { value: '学术研究', label: '学术研究' },
     { value: '市场流通', label: '市场流通' },
     { value: '其他', label: '其他' }
+  ],
+  入藏去向: [
+    { value: '藏品', label: '藏品' },
+    { value: '参考品', label: '参考品' },
+    { value: '资料', label: '资料' },
+    { value: '标本', label: '标本' }
+  ],
+  展览状态: [
+    { value: '外部借展', label: '外部借展' },
+    { value: '内部借展', label: '内部借展' }
   ]
 }

src/utils/tableData.ts

@@ -111,6 +111,7 @@ export const C2tableC = [
 
 // 待完善
 export const C4tableC = [
+  ['txt', '数据类型', 'type'],
   ['txt', '导入数据行数', 'hang1'],
   ['txt', '合格数据行数', 'hang2'],
   ['txt', '异常数据行数', 'hang3']