lanxin 6 дней назад
Родитель
Сommit
28b34db53d
2 измененных файлов с 86 добавлено и 23 удалено
  1. 65 14
      src/pages/Benter/B3auth/B3edit/index.tsx
  2. 21 9
      src/pages/Cledger/C1ledger/index.tsx

+ 65 - 14
src/pages/Benter/B3auth/B3edit/index.tsx

@@ -10,7 +10,7 @@ import { Button, Input } from 'antd'
 import { API_getGoodsLists } from '@/store/action/Cledger/C1ledger'
 import { B3_APIgetClueList, B3_APIgoodsSave, B3API_obj } from '@/store/action/Benter/B3auth'
 import EditBtn from '@/pages/Zother/EditBtn'
-import SonGoodsList from '@/pages/Zother/SonGoodsList'
+import history from '@/utils/history'
 import MyPopconfirm from '@/components/MyPopconfirm'
 import { goodsSonTableC } from '@/utils/tableData'
 import { sgBaseFormDataGood, sgTopSelectDomGood } from '@/pages/Zother/SonGoodsList/data'
@@ -32,6 +32,7 @@ const rowArrDom = [
     must: true,
     type: 'ChildTable',
     key: 'goods',
+    full: true,
     placeHolder: '选择藏品',
     SelectGoodsProps: {
       myType: '藏品',
@@ -46,23 +47,73 @@ const rowArrDom = [
     },
     callBackChildren: (selectedRows: GoodsType[], setSnapsFu: any) => {
       return (
-        <div className='snipInfo' style={{ height: '80px', display: 'flex', alignItems: 'center' }}>
+        <div
+          className='snipInfo'
+          style={{
+            height: '80px',
+            display: 'flex',
+            alignItems: 'center',
+            gap: '20px',
+            justifyContent: 'space-around'
+          }}
+        >
           <ImageLazy width={80} height={80} src={selectedRows[0].thumb || ''} />
-          {selectedRows[0]?.num ? selectedRows[0]?.num + '-' + selectedRows[0]?.name : ''}
-          <Button type='default' size='small'>
-            查看
-          </Button>
-          <MyPopconfirm
-            txtK='删除'
-            onConfirm={() =>
-              setSnapsFu((prevSnaps: GoodsType[]) =>
-                prevSnaps.filter(snap => snap.id !== selectedRows[0].id)
-              )
-            }
-          />
+          <div style={{ flex: 1, textAlign: 'center' }}>
+            {selectedRows[0]?.num ? selectedRows[0]?.num + '-' + selectedRows[0]?.name : ''}
+          </div>
+          <div>
+            <Button
+              style={{ marginRight: '0' }}
+              type='text'
+              size='small'
+              danger
+              onClick={() => history.push(`/goodsInfo`)}
+            >
+              查看
+            </Button>
+            <MyPopconfirm
+              txtK='删除'
+              onConfirm={() =>
+                setSnapsFu((prevSnaps: GoodsType[]) =>
+                  prevSnaps.filter(snap => snap.id !== selectedRows[0].id)
+                )
+              }
+            />
+          </div>
         </div>
       )
     }
+  },
+  {
+    name: '鉴定部门',
+    type: 'Input',
+    key: 'unit',
+    noNull: true
+  },
+  {
+    name: '鉴定人员',
+    must: true,
+    type: 'Input',
+    key: 'member',
+    noNull: true
+  },
+  {
+    name: '鉴定过程',
+    type: 'TextArea',
+    full: true,
+    key: 'course'
+  },
+  {
+    name: '鉴定结论',
+    type: 'TextArea',
+    full: true,
+    key: 'conclusion'
+  },
+  {
+    name: '备注',
+    type: 'TextArea',
+    full: true,
+    key: 'remark'
   }
 ]
 

+ 21 - 9
src/pages/Cledger/C1ledger/index.tsx

@@ -95,54 +95,66 @@ function C1ledger() {
         {
           key: '1',
           label: '登记',
-          onClick: () => authorityFu(410, '您没有藏品登记权限!', () => history.push(`/register`))
+          onClick: () =>
+            authorityFu(410, '您没有藏品登记权限!', () => history.push(`/register_edit/1/null`))
         },
         {
           key: '2',
           label: '注销',
-          onClick: () => authorityFu(430, '您没有藏品注销权限!', () => history.push(`/writeOff`))
+          onClick: () =>
+            authorityFu(430, '您没有藏品注销权限!', () => history.push(`/writeOff_edit/1/null`))
         }
       ],
       kufang: [
         {
           key: '1',
           label: '入库',
-          onClick: () => authorityFu(420, '您没有藏品入库权限!', () => history.push(`/inStorage`))
+          onClick: () =>
+            authorityFu(1010, '您没有藏品入库权限!', () => history.push(`/inStorage_edit/1/null`))
         },
         {
           key: '2',
           label: '移库',
           onClick: () =>
-            authorityFu(421, '您没有藏品移库权限!', () => history.push(`/moveStorage`))
+            authorityFu(1020, '您没有藏品移库权限!', () =>
+              history.push(`/moveStorage_edit/1/null`)
+            )
         },
         {
           key: '3',
           label: '出库',
-          onClick: () => authorityFu(422, '您没有藏品出库权限!', () => history.push(`/outStorage`))
+          onClick: () =>
+            authorityFu(1030, '您没有藏品出库权限!', () => history.push(`/outStorage_edit/1/null`))
         }
       ],
       weihu: [
         {
           key: '1',
           label: '鉴定登记',
-          onClick: () => authorityFu(440, '您没有藏品鉴定登记权限!', () => history.push(`/auth`))
+          onClick: () =>
+            authorityFu(230, '您没有藏品鉴定登记权限!', () => history.push(`/auth_edit/1/null`))
         },
         {
           key: '2',
           label: '事故登记',
           onClick: () =>
-            authorityFu(441, '您没有藏品事故登记权限!', () => history.push(`/accident`))
+            authorityFu(510, '您没有藏品事故登记权限!', () =>
+              history.push(`/accident_edit/1/null`)
+            )
         },
         {
           key: '3',
           label: '现状登记',
           onClick: () =>
-            authorityFu(442, '您没有藏品现状登记权限!', () => history.push(`/actuality`))
+            authorityFu(540, '您没有藏品现状登记权限!', () =>
+              history.push(`/actuality_edit/1/null`)
+            )
         },
         {
           key: '4',
           label: '修复登记',
-          onClick: () => authorityFu(443, '您没有藏品修复登记权限!', () => history.push(`/repair`))
+          onClick: () =>
+            authorityFu(550, '您没有藏品修复登记权限!', () => history.push(`/repair_edit/1/null`))
         }
       ]
     }