藏品详情-藏品日志完善

src/assets/styles/base.css

@@ -332,7 +332,6 @@ textarea {
 }
 .Y1info .Y22com .Y22Info .Y22row {
   display: flex;
-  align-items: center;
 }
 .Y1info .Y22com .Y22Info .Y22row > div {
   width: 200px;
@@ -340,6 +339,11 @@ textarea {
   padding: 8px 4px;
   border-bottom: 1px solid #ccc;
 }
+.Y1info .Y22com .Y22Info .Y22row > div:nth-of-type(1) {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 .Y1info .Y22com .Y22Info .Y22row > div:nth-of-type(2) {
   width: 600px;
 }

src/assets/styles/base.less

@@ -478,12 +478,17 @@ textarea {
       border-bottom: none;
       .Y22row {
         display: flex;
-        align-items: center;
+        // align-items: center;
         & > div {
           width: 200px;
           text-align: center;
           padding: 8px 4px;
           border-bottom: 1px solid #ccc;
+          &:nth-of-type(1) {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+          }
           &:nth-of-type(2) {
             width: 600px;
           }

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

@@ -144,4 +144,5 @@ export type C1GoodType = {
   date: string
   txt4: string
   beiZhu: string
+  storageId: number
 }

src/pages/A_workbench/A1dataSta/index.tsx

@@ -19,8 +19,6 @@ const dataTemp = [
 ]
 
 function A1dataSta() {
-  // 待完善 跳转 和 数据
-
   // 加载折线图，固定12个月
   const echartRef1 = useRef<HTMLDivElement>(null)
   useEffect(() => {

src/pages/B_enterTibet/B1collect/data.ts

@@ -53,14 +53,14 @@ export const B3aForm1 = [
   { name: '业务单号', key: 'num' }
 ]
 
-export type D3InputKeyType = 'num' | 'name' | 'deptName' | 'userName'
+export type D3InputKeyType = 'num' | 'name' | 'deptName' | 'creatorName'
 
 export const B3_4inputKeyArr: {
   name: string
   key: D3InputKeyType
 }[] = [
-  { name: '业务单号', key: 'num' },
-  { name: '申请名称', key: 'name' },
+  { name: '申请编号', key: 'num' },
+  { name: '业务名称', key: 'name' },
   { name: '发起部门', key: 'deptName' },
-  { name: '发起人', key: 'userName' }
+  { name: '发起人', key: 'creatorName' }
 ]

src/pages/D_storeManage/D6putsStor/index.tsx

@@ -182,7 +182,7 @@ function D6putsStor() {
             { key: 'date', txt: '提用日期' },
             { key: 'sonTypeName', txt: '提退类型' },
             { key: 'num', txt: '提退单编号' },
-            { key: 'sonUnit', txt: '提用单位（部门）' },
+            { key: 'sonUnit', txt: '提用/借入单位' },
             { key: 'sonNum', txt: '分库缩写' },
             { key: 'creatorName', txt: '发起人' },
             { key: 'createTime', txt: '发起日期' },
@@ -239,10 +239,10 @@ function D6putsStor() {
           </div>
 
           <div>
-            <span>提用单位（部门）：</span>
+            <span>提用/借入单位：</span>
             <Input
-              style={{ width: 186 }}
-              placeholder='请输入提用单位（部门）'
+              style={{ width: 225 }}
+              placeholder='请输入提用/借入单位'
               maxLength={30}
               value={formData.sonUnit}
               onChange={e => txtChangeFu(e.target.value, 'sonUnit')}
@@ -300,7 +300,7 @@ function D6putsStor() {
             <Select
               allowClear={true}
               placeholder='全部'
-              style={{ width: 120 }}
+              style={{ width: 128 }}
               value={formData.status ? formData.status : null}
               onChange={e => setFormData({ ...formData, status: e })}
               options={selectObj['申请状态'].filter(v => v.label !== '待盘点')}
@@ -311,7 +311,7 @@ function D6putsStor() {
             <span>选择角色：</span>
             <Select
               allowClear={true}
-              style={{ width: 120 }}
+              style={{ width: 128 }}
               placeholder='全部'
               options={selectObj['角色']}
               // fieldNames={{ value: 'id', label: 'roleName' }}

src/pages/Layout/data.ts

@@ -24,9 +24,8 @@ const tabLeftArr: RouterType = [
         path: '/process',
         Com: React.lazy(() => import('../A_workbench/A3flow'))
       },
-      // 待完善
       {
-        id: 9801,
+        id: 140,
         name: '凭证管理',
         path: '/voucher',
         Com: React.lazy(() => import('../A_workbench/A4voucher'))
@@ -37,34 +36,32 @@ const tabLeftArr: RouterType = [
     id: 8,
     name: '藏品查询',
     son: [
-      // 待完善
       {
-        id: 9802,
+        id: 1001,
         name: '藏品信息',
         path: '/antiqueSearch',
         Com: React.lazy(() => import('../A2_query/A22antique'))
       },
       {
-        id: 9803,
+        id: 1002,
         name: '多媒体信息',
         path: '/mediaSearch',
         Com: React.lazy(() => import('../A2_query/A23media'))
       }
     ]
   },
-  // 待完善
   {
     id: 9,
     name: '台账管理',
     son: [
       {
-        id: 9801,
+        id: 601,
         name: '藏品总账',
         path: '/machineReg',
         Com: React.lazy(() => import('../A3_ledger/C1ledger'))
       },
       {
-        id: 9802,
+        id: 602,
         name: '藏品分账',
         path: '/Routing',
         Com: React.lazy(() => import('../A3_ledger/A32Routing'))
@@ -75,42 +72,43 @@ const tabLeftArr: RouterType = [
     id: 3,
     name: '藏品管理',
     son: [
-      // 待完善
       {
-        id: 9800,
+        id: 310,
         name: '藏品登记',
+        isLog: true,
         path: '/register',
         Com: React.lazy(() => import('../C_goodsManage/C1register'))
       },
 
       {
-        id: 480,
+        id: 320,
         name: '藏品注销',
+        isLog: true,
         path: '/cancel',
         Com: React.lazy(() => import('../D_storeManage/D8cancel'))
       },
       {
-        id: 320,
+        id: 330,
         name: '藏品附件',
         path: '/files',
         Com: React.lazy(() => import('../C_goodsManage/C2files'))
       },
-      // 待完善
       {
-        id: 9801,
+        id: 340,
         name: '资源使用',
+        isLog: true,
         path: '/wealth',
         Com: React.lazy(() => import('../C_goodsManage/C21wealth'))
       },
-      // 待完善
       {
-        id: 9802,
+        id: 350,
         name: '藏品编辑',
+        isLog: true,
         path: '/goodEdit',
         Com: React.lazy(() => import('../C_goodsManage/C22goodEdit'))
       },
       {
-        id: 330,
+        id: 360,
         name: '藏品关注',
         path: '/focus',
         Com: React.lazy(() => import('../C_goodsManage/C3focus'))
@@ -124,24 +122,28 @@ const tabLeftArr: RouterType = [
       {
         id: 210,
         name: '藏品征集',
+        isLog: true,
         path: '/collect',
         Com: React.lazy(() => import('../B_enterTibet/B1collect'))
       },
       {
         id: 220,
         name: '藏品鉴定',
+        isLog: true,
         path: '/identify',
         Com: React.lazy(() => import('../B_enterTibet/B2identify'))
       },
       {
         id: 230,
         name: '藏品入馆',
+        isLog: true,
         path: '/entering',
         Com: React.lazy(() => import('../B_enterTibet/B3entering'))
       },
       {
         id: 240,
         name: '藏品入藏',
+        isLog: true,
         path: '/enterTibet',
         Com: React.lazy(() => import('../B_enterTibet/B4enterTibet'))
       }
@@ -173,24 +175,28 @@ const tabLeftArr: RouterType = [
       {
         id: 440,
         name: '藏品入库',
+        isLog: true,
         path: '/impStor',
         Com: React.lazy(() => import('../D_storeManage/D4impStor'))
       },
       {
         id: 450,
         name: '藏品移库',
+        isLog: true,
         path: '/moveStor',
         Com: React.lazy(() => import('../D_storeManage/D5moveStor'))
       },
       {
         id: 460,
         name: '藏品出库',
+        isLog: true,
         path: '/putsStor',
         Com: React.lazy(() => import('../D_storeManage/D6putsStor'))
       },
       {
         id: 470,
         name: '藏品盘点',
+        isLog: true,
         path: '/check',
         Com: React.lazy(() => import('../D_storeManage/D7check'))
       }
@@ -203,6 +209,7 @@ const tabLeftArr: RouterType = [
       {
         id: 510,
         name: '事故登记',
+        isLog: true,
         path: '/accident',
         Com: React.lazy(() => import('../E_goodsStorage/E1accident'))
       },
@@ -216,26 +223,27 @@ const tabLeftArr: RouterType = [
       {
         id: 530,
         name: '现状登记',
+        isLog: true,
         path: '/actuality',
         Com: React.lazy(() => import('../E_goodsStorage/E3actuality'))
       },
       {
         id: 540,
         name: '文物修复',
+        isLog: true,
         path: '/repair',
         Com: React.lazy(() => import('../E_goodsStorage/E4repair'))
       }
     ]
   },
-  // 待完善-借展管理
   {
     id: 6,
     name: '展品管理',
     son: [
       {
-        // 待完善
-        id: 9800,
+        id: 900,
         name: '借展管理',
+        isLog: true,
         path: '/exhibition',
         Com: React.lazy(() => import('../F_exhibition/F1exhibition'))
       }
@@ -370,7 +378,6 @@ export const routerSon: RouterTypeRow[] = [
     path: '/repair_edit/:key/:id',
     Com: React.lazy(() => import('../E_goodsStorage/E4repair/E4edit'))
   },
-  // -------------入库-----------------
   {
     id: 15,
     name: '借展管理-新增/编辑/审批/查看',

src/pages/Layout/index.tsx

@@ -119,10 +119,10 @@ function Layout() {
         isOkIdArr.push(9900)
       }
 
-      // 待完善 手动打开一些页面
-      ;[9800, 9801, 9802, 9803].forEach(v => {
-        isOkIdArr.push(v)
-      })
+      //  手动打开一些页面
+      // ;[9800, 9801, 9802, 9803].forEach(v => {
+      //   isOkIdArr.push(v)
+      // })
 
       const tempArr: RouterTypeRow[] = []
 

src/pages/Y_goodsDetails/Y1cathet/Y22com.tsx

@@ -1,23 +1,22 @@
 import { C1GoodType } from '@/pages/A3_ledger/C1ledger/type'
-import { D1siteListType } from '@/pages/D_storeManage/D1storage/type'
-import { D1_APIgetInfo } from '@/store/action/D1storage'
+import { TypeD2list } from '@/pages/D_storeManage/D2storSet/type'
+import { D2_APIgetInfo } from '@/store/action/D2storSet'
 import { statusStorageObj } from '@/utils/tableData'
 import React, { useCallback, useEffect, useState } from 'react'
 
 type Props = {
-  isLook?: boolean
   info: C1GoodType
 }
 
-function Y22com({ isLook, info }: Props) {
-  const [detail, setDetail] = useState({} as D1siteListType)
+function Y22com({ info }: Props) {
+  const [detail, setDetail] = useState({} as TypeD2list)
 
   const getInfoFu = useCallback(async () => {
-    if (info.siteId) {
-      const res = await D1_APIgetInfo(info.siteId)
+    if (info.storageId) {
+      const res = await D2_APIgetInfo(info.storageId)
       if (res.code === 0) setDetail(res.data || {})
     }
-  }, [info.siteId])
+  }, [info.storageId])
 
   useEffect(() => {
     getInfoFu()
@@ -33,18 +32,18 @@ function Y22com({ isLook, info }: Props) {
       ) : (
         <div className='Y22Info'>
           <div className='Y22row Y22row1'>
-            <div>库存信息</div>
-            <div>库存详情</div>
+            <div>仓库信息</div>
+            <div>仓库详情</div>
           </div>
 
           {info.id ? (
             <>
               <div className='Y22row'>
                 <div>仓库名称</div>
-                <div>{detail.storageName || '（空）'}</div>
+                <div>{detail.name || '（空）'}</div>
               </div>
               <div className='Y22row'>
-                <div>仓库编码</div>
+                <div>分库缩写</div>
                 <div>{detail.num || '（空）'}</div>
               </div>
               <div className='Y22row'>
@@ -52,6 +51,10 @@ function Y22com({ isLook, info }: Props) {
                 <div>{detail.managerUser || '（空）'}</div>
               </div>
               <div className='Y22row'>
+                <div>仓库说明</div>
+                <div>{detail.description || '（空）'}</div>
+              </div>
+              {/* <div className='Y22row'>
                 <div>区域名称</div>
                 <div>{detail.regionName || '（空）'}</div>
               </div>
@@ -66,7 +69,7 @@ function Y22com({ isLook, info }: Props) {
               <div className='Y22row'>
                 <div>层格</div>
                 <div>{detail.layer3 || '（空）'}</div>
-              </div>
+              </div> */}
             </>
           ) : (
             <div className='Y22rowNo'>暂无数据</div>

src/pages/Y_goodsDetails/Y1cathet/Y44com.tsx

@@ -4,32 +4,54 @@ import { Button, DatePicker, Input, Select } from 'antd'
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { TypeY44form } from './type'
 import dayjs from 'dayjs'
-import { B3_4inputKeyArr } from '@/pages/B_enterTibet/B1collect/data'
+import { B3_4inputKeyArr, D3InputKeyType } from '@/pages/B_enterTibet/B1collect/data'
+import { API_getInfoLogList } from '@/store/action/C1ledger'
+import tabLeftArr from '@/pages/Layout/data'
+import { RouterTypeRow } from '@/types'
+import { MessageFu } from '@/utils/message'
 const { RangePicker } = DatePicker
 
-type InputKeyType = 'num' | 'name' | 'deptName' | 'userName'
-
 const baseFormData: TypeY44form = {
   pageSize: 10,
   pageNum: 1,
   num: '',
   name: '',
   deptName: '',
-  userName: '',
+  creatorName: '',
   startTime: '',
   endTime: '',
   status: '',
-  // 待完善 type字段
-  type: ''
+  typeName: ''
 }
-// 待完善 没有接入后端
 
+type ListType = {
+  createTime: string
+  creatorName: string
+  deptName: string
+  goodsIds: string
+  name: string
+  num: string
+  orderId: number
+  status: number
+  typeName: string
+}
 type Props = {
   isLook?: boolean
   sId: number
 }
 
 function Y44com({ isLook, sId }: Props) {
+  // 路由信息过滤过来
+  const typePageArr = useMemo(() => {
+    const arr: RouterTypeRow[] = []
+    tabLeftArr.forEach(v1 => {
+      v1.son.forEach(v2 => {
+        if (v2.isLog) arr.push(v2)
+      })
+    })
+    return arr
+  }, [])
+
   const [formData, setFormData] = useState(baseFormData)
   const formDataRef = useRef(baseFormData)
 
@@ -37,6 +59,11 @@ function Y44com({ isLook, sId }: Props) {
     formDataRef.current = formData
   }, [formData])
 
+  const [tableObj, setTableObj] = useState<{ list: ListType[]; total: number }>({
+    list: [],
+    total: 0
+  })
+
   // 点击搜索的 时间戳
   const [timeKey, setTimeKey] = useState(0)
 
@@ -63,9 +90,16 @@ function Y44com({ isLook, sId }: Props) {
   )
 
   // 封装发送请求的函数
-  const getListFu = useCallback(() => {
-    console.log('发送请求', formDataRef.current)
-  }, [])
+  const getListFu = useCallback(async () => {
+    const obj = {
+      ...formDataRef.current,
+      goodsId: Number(sId)
+    }
+    const res = await API_getInfoLogList(obj)
+    if (res.code === 0) {
+      setTableObj({ list: res.data.records || [], total: res.data.total })
+    }
+  }, [sId])
 
   useEffect(() => {
     getListFu()
@@ -73,7 +107,7 @@ function Y44com({ isLook, sId }: Props) {
 
   // 输入框的改变
   const txtChangeFu = useCallback(
-    (txt: string, key: InputKeyType) => {
+    (txt: string, key: D3InputKeyType) => {
       setFormData({
         ...formData,
         [key]: txt
@@ -91,21 +125,25 @@ function Y44com({ isLook, sId }: Props) {
   }, [])
 
   // 页码变化
-  // const paginationChange = useCallback(
-  //   (pageNum: number, pageSize: number) => {
-  //     setFormData({ ...formData, pageNum, pageSize })
-  //     setTimeout(() => {
-  //       setTimeKey(Date.now())
-  //     }, 50)
-  //   },
-  //   [formData]
-  // )
+  const paginationChange = useCallback(
+    (pageNum: number, pageSize: number) => {
+      setFormData({ ...formData, pageNum, pageSize })
+      setTimeout(() => {
+        setTimeKey(Date.now())
+      }, 50)
+    },
+    [formData]
+  )
 
   // 点击查看 新窗口打开
-  const lookPage = useCallback((id: number) => {
-    // 根据业务类型打开不同的新页面 待完善
-    window.open('/#/entering_edit/4/1/1', '_blank')
-  }, [])
+  const lookPage = useCallback(
+    (name: string, id: number) => {
+      const obj = typePageArr.find(v => v.name === name)
+      if (obj) window.open(`/#${obj.path}_edit/4/${id}`, '_blank')
+      else MessageFu.warning('业务类型错误')
+    },
+    [typePageArr]
+  )
 
   const tableLastBtn = useMemo(() => {
     return [
@@ -113,7 +151,7 @@ function Y44com({ isLook, sId }: Props) {
         title: '操作',
         render: (item: any) => {
           return (
-            <Button size='small' type='text' onClick={() => lookPage(item.id)}>
+            <Button size='small' type='text' onClick={() => lookPage(item.typeName, item.orderId)}>
               查看
             </Button>
           )
@@ -157,13 +195,26 @@ function Y44com({ isLook, sId }: Props) {
               <div>
                 <span>业务类型：</span>
                 <Select
-                  placeholder='请选择'
+                  allowClear={true}
+                  placeholder='全部'
                   style={{ width: 200 }}
-                  value={formData.type}
-                  onChange={e => setFormData({ ...formData, type: e })}
-                  options={[{ value: '', label: '全部' }]}
+                  value={formData.typeName ? formData.typeName : null}
+                  onChange={e => setFormData({ ...formData, typeName: e })}
+                  options={typePageArr.map(v => ({ value: v.name, label: v.name }))}
                 />
               </div>
+
+              {/* <div>
+                <span>申请状态：</span>
+                <Select
+                  allowClear={true}
+                  placeholder='全部'
+                  style={{ width: 200 }}
+                  value={formData.status ? formData.status : null}
+                  onChange={e => setFormData({ ...formData, status: e })}
+                  options={selectObj['申请状态'].filter(v => v.label !== '待盘点')}
+                />
+              </div> */}
             </div>
             <div className='Y44toprr'>
               <Button type='primary' onClick={clickSearch}>
@@ -177,12 +228,16 @@ function Y44com({ isLook, sId }: Props) {
 
       {/* 表格 */}
       <MyTable
+        rowKey='orderId'
         classKey='Y44comTable'
-        yHeight={isLook ? 600 : 666}
-        list={[{ id: 1, xxxx: '藏品入馆' }]}
+        yHeight={isLook ? 530 : 666}
+        list={tableObj.list}
         columnsTemp={Y44tableC}
         lastBtn={tableLastBtn}
-        pagingInfo={false}
+        pageNum={formData.pageNum}
+        pageSize={formData.pageSize}
+        total={tableObj.total}
+        onChange={(pageNum, pageSize) => paginationChange(pageNum, pageSize)}
       />
     </div>
   )

src/pages/Y_goodsDetails/Y1cathet/type.d.ts

@@ -4,9 +4,9 @@ export type TypeY44form = {
   num: string
   name: string
   deptName: string
-  userName: string
+  creatorName: string
   startTime: string
   endTime: string
   status: string
-  type: string
+  typeName: string
 }

src/pages/Y_goodsDetails/Y2look/index.module.scss

@@ -172,12 +172,17 @@
           border-bottom: none;
           .Y22row {
             display: flex;
-            align-items: center;
+            // align-items: center;
             & > div {
               width: 200px;
               text-align: center;
               padding: 8px 4px;
               border-bottom: 1px solid #ccc;
+              &:nth-of-type(1) {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+              }
               &:nth-of-type(2) {
                 width: 600px;
               }
@@ -219,22 +224,29 @@
       }
 
       // ----------------藏品日志
-      .Y44top {
-        display: flex;
-        justify-content: space-between;
-        margin-bottom: 15px;
-        .Y44topll {
+      .Y44com {
+        width: 100%;
+        height: 100%;
+        .Y44top {
           display: flex;
-          & > div {
-            position: relative;
-            margin-right: 15px;
+          justify-content: space-between;
+          margin-bottom: 15px;
+          .Y44topll {
             display: flex;
-            align-items: center;
-            .ant-input {
-              width: 160px;
+            & > div {
+              position: relative;
+              margin-right: 15px;
+              display: flex;
+              align-items: center;
+              .ant-input {
+                width: 160px;
+              }
             }
           }
         }
+        .ant-select-selection-placeholder {
+          color: black;
+        }
       }
     }
   }

src/pages/Y_goodsDetails/Y2look/index.tsx

@@ -248,7 +248,7 @@ function Y2look() {
       {info.id ? (
         <div className='Y2info'>
           {tabAc === '藏品信息' ? <Y11com info={info} /> : null}
-          {tabAc === '库存信息' ? <Y22com info={info} isLook={true} /> : null}
+          {tabAc === '库存信息' ? <Y22com info={info} /> : null}
           {tabAc === '藏品附件' ? <Y33com sId={sId} isLook={true} /> : null}
           {tabAc === '藏品日志' ? <Y44com sId={sId} isLook={true} /> : null}
         </div>

src/store/action/C1ledger.ts

@@ -43,3 +43,10 @@ export const C1_APIgetList = (data: any, exportFlag?: boolean): any => {
     }
   }
 }
+
+/**
+ * 藏品-日志列表
+ */
+export const API_getInfoLogList = (data: any) => {
+  return http.post('cms/goods/log', data)
+}

src/types/api/layot.d.ts

@@ -9,6 +9,8 @@ export type RouterTypeRow = {
   name: string
   path: string
   pathLast?: string
+  // 日志模块需要的过滤
+  isLog?: boolean
   Com: React.LazyExoticComponent<React.MemoExoticComponent<() => JSX.Element>>
 }
 

src/utils/tableData.ts

@@ -267,7 +267,7 @@ export const D6tableC = [
   ['txt', '提用日期', 'date'],
   ['txtChange', '提退类型', 'sonTypeName', businessTypeObj],
   ['txt', '提退单编号', 'num'],
-  ['txt', '提用单位（部门）', 'sonUnit'],
+  ['txt', '提用/借入单位', 'sonUnit'],
   ['txt', '分库缩写', 'sonNum'],
   ['txt', '发起人', 'creatorName'],
   ['txt', '发起日期', 'createTime'],
@@ -378,15 +378,14 @@ export const Y33tableC = [
   ['txt', '上传人', 'creatorName']
 ]
 
-// 待完善
 export const Y44tableC = [
-  ['txt', '业务类型', 'xxxx'],
-  ['txt', '申请编号', 'description'],
-  ['txt', '业务名称', 'description'],
-  ['txt', '发起部门', 'description'],
-  ['txt', '发起人', 'description'],
-  ['txt', '发起日期', 'description'],
-  ['txt', '申请状态', 'description']
+  ['txt', '业务类型', 'typeName'],
+  ['txt', '申请编号', 'num'],
+  ['txt', '业务名称', 'name'],
+  ['txt', '发起部门', 'deptName'],
+  ['txt', '发起人', 'creatorName'],
+  ['txt', '发起日期', 'createTime'],
+  ['txtChange', '申请状态', 'status', statusObj]
 ]
 
 export const Z2tableC = [