入馆、入藏 登记 删除 妈的4个页面一个B样

src/pages/B_enterTibet/B3_4page/B3add/index.tsx

@@ -7,10 +7,18 @@ import history from '@/utils/history'
 import { MessageFu } from '@/utils/message'
 import B3aTop from './B3aTop'
 
-const objUrl = {
-  1: '/entering_edit',
-  2: '/enterTibet_edit',
-  3: '/register_edit'
+export const B3TiaoObjUrl = {
+  1: '/entering',
+  2: '/enterTibet',
+  3: '/register',
+  4: '/delete'
+}
+
+export const B3TitObjKey = {
+  '1': '入馆',
+  '2': '入藏',
+  '3': '登记',
+  '4': '删除'
 }
 
 function B3add() {
@@ -29,8 +37,8 @@ function B3add() {
         // 存草稿 当前页保存 不跳转
         MessageFu.success('草稿保存成功')
       } else {
-        const url = Reflect.get(objUrl, key)
-        history.push(`${url}/${key}/${99}`)
+        const url = Reflect.get(B3TiaoObjUrl, key)
+        history.push(`${url}_edit/${key}/${99}`)
       }
     },
     [key]
@@ -41,9 +49,7 @@ function B3add() {
 
   return (
     <div className={styles.B3add}>
-      <div className='pageTitle'>
-        藏品{key === '1' ? '入馆' : key === '2' ? '入藏' : '登记'}-新增
-      </div>
+      <div className='pageTitle'>藏品{Reflect.get(B3TitObjKey, key)}-新增</div>
       <B3aTop info='xx' pageSta='新增' ref={topRef} />
       {/* 底部按钮 */}
       <div className='B3aBtn'>

src/pages/B_enterTibet/B3_4page/B3edit/main.tsx

@@ -8,6 +8,7 @@ import MyTable from '@/components/MyTable'
 import { B3eTableC } from '@/utils/tableData'
 import MyPopconfirm from '@/components/MyPopconfirm'
 import history from '@/utils/history'
+import { B3TiaoObjUrl, B3TitObjKey } from '../B3add'
 
 type Props = {
   pageSta: TypeB3PageSta
@@ -48,16 +49,14 @@ function B3editMain({ pageSta }: Props) {
 
   // 点击取消
   const btnX = useCallback(() => {
-    let url = '/entering'
-    if (key === '2') url = '/enterTibet'
-    else if (key === '3') url = '/register'
+    let url = Reflect.get(B3TiaoObjUrl, key)
     history.push(url)
   }, [key])
 
   return (
     <div className={styles.B3editMain}>
       <div className='pageTitle'>
-        藏品{key === '1' ? '入馆' : key === '2' ? '入藏' : '登记'}-{pageSta}
+        藏品{Reflect.get(B3TitObjKey, key)}-{pageSta}
         {id}
       </div>
 

src/pages/B_enterTibet/B3_4page/index.tsx

@@ -15,9 +15,17 @@ const { RangePicker } = DatePicker
 type InputKeyType = 'aaaa' | 'bbbb' | 'cccc' | 'dddd'
 
 const objUrl = {
-  入馆: '/entering_',
-  入藏: '/enterTibet_',
-  登记: '/register_'
+  入馆: '/entering',
+  入藏: '/enterTibet',
+  登记: '/register',
+  删除: '/delete'
+}
+
+const objKey = {
+  入馆: '1',
+  入藏: '2',
+  登记: '3',
+  删除: '4'
 }
 
 export const B3_4inputKeyArr: {
@@ -44,7 +52,7 @@ const baseFormData: TypeB3Form = {
 }
 
 type Props = {
-  pageSta: '入馆' | '入藏' | '登记'
+  pageSta: '入馆' | '入藏' | '登记' | '删除'
 }
 
 // 没有接入后端 待完善
@@ -148,16 +156,16 @@ function B34page({ pageSta }: Props) {
     (val: TypeB3PageSta, id: number) => {
       const url = Reflect.get(objUrl, pageSta)
 
-      const key = pageSta === '入馆' ? '1' : pageSta === '入藏' ? '2' : '3'
+      const key = Reflect.get(objKey, pageSta)
 
       if (val === '新增') {
-        history.push(`${url}add/${key}`)
+        history.push(`${url}_add/${key}`)
       } else if (val === '编辑') {
-        history.push(`${url}edit/${key}/${id}`)
+        history.push(`${url}_edit/${key}/${id}`)
       } else if (val === '审批') {
-        history.push(`${url}audit/${key}/${id}`)
+        history.push(`${url}_audit/${key}/${id}`)
       } else {
-        history.push(`${url}look/${key}/${id}`)
+        history.push(`${url}_look/${key}/${id}`)
       }
     },
     [pageSta]

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

@@ -1,4 +0,0 @@
-.C7delete {
-  :global {
-  }
-}

src/pages/C_goodsManage/C7delete/index.tsx

@@ -1,12 +1,7 @@
 import React from 'react'
-import styles from './index.module.scss'
+import B34page from '@/pages/B_enterTibet/B3_4page'
 function C7delete() {
-  return (
-    <div className={styles.C7delete}>
-      <div className='pageTitle'>藏品删除</div>
-      <p>待开发</p>
-    </div>
-  )
+  return <B34page pageSta='删除' />
 }
 
 const MemoC7delete = React.memo(C7delete)

src/pages/Layout/data.ts

@@ -89,19 +89,19 @@ const tabLeftArr: RouterType = [
         name: '藏品登记',
         path: '/register',
         Com: React.lazy(() => import('../C_goodsManage/C5register'))
-      }
+      },
       // {
       //   id: 360,
       //   name: '藏品编辑',
       //   path: '/edit',
       //   Com: React.lazy(() => import('../C_goodsManage/C6edit'))
       // },
-      // {
-      //   id: 370,
-      //   name: '藏品删除',
-      //   path: '/delete',
-      //   Com: React.lazy(() => import('../C_goodsManage/C7delete'))
-      // },
+      {
+        id: 370,
+        name: '藏品删除',
+        path: '/delete',
+        Com: React.lazy(() => import('../C_goodsManage/C7delete'))
+      }
       // {
       //   id: 380,
       //   name: '回收站',
@@ -288,6 +288,12 @@ export const routerSon: RouterTypeRow = [
     Com: React.lazy(() => import('../B_enterTibet/B3_4page/B3add'))
   },
   {
+    id: 100,
+    name: '藏品删除-新增',
+    path: '/delete_add/:key',
+    Com: React.lazy(() => import('../B_enterTibet/B3_4page/B3add'))
+  },
+  {
     id: 7,
     name: '藏品入馆-编辑',
     path: '/entering_edit/:key/:id',
@@ -305,6 +311,12 @@ export const routerSon: RouterTypeRow = [
     path: '/register_edit/:key/:id',
     Com: React.lazy(() => import('../B_enterTibet/B3_4page/B3edit'))
   },
+  {
+    id: 101,
+    name: '藏品删除-编辑',
+    path: '/delete_edit/:key/:id',
+    Com: React.lazy(() => import('../B_enterTibet/B3_4page/B3edit'))
+  },
 
   {
     id: 10,
@@ -326,6 +338,13 @@ export const routerSon: RouterTypeRow = [
   },
 
   {
+    id: 102,
+    name: '藏品删除-审批',
+    path: '/delete_audit/:key/:id',
+    Com: React.lazy(() => import('../B_enterTibet/B3_4page/B3edit/audit'))
+  },
+
+  {
     id: 13,
     name: '藏品入馆-查看',
     path: '/entering_look/:key/:id',
@@ -342,5 +361,11 @@ export const routerSon: RouterTypeRow = [
     name: '藏品登记-查看',
     path: '/register_look/:key/:id',
     Com: React.lazy(() => import('../B_enterTibet/B3_4page/B3edit/look'))
+  },
+  {
+    id: 103,
+    name: '藏品删除-查看',
+    path: '/delete_look/:key/:id',
+    Com: React.lazy(() => import('../B_enterTibet/B3_4page/B3edit/look'))
   }
 ]