丢

src/components/MyTable/index.tsx

@@ -46,19 +46,6 @@ export interface MyTableMethods {
   form: FormInstance<any>
 }
 
-export const getDesensitizeTxt = (txt: string, frontLen = 3, endLen = 4) => {
-  if (!txt) return txt
-  const totalVisible = frontLen + endLen
-  if (txt.length <= totalVisible) {
-    return txt
-  }
-  const frontStr = txt.substring(0, frontLen)
-  const endStr = endLen > 0 ? txt.substring(txt.length - endLen) : ''
-  const maskStr = '*'.repeat(txt.length - frontLen - endLen)
-
-  return frontStr + maskStr + endStr
-}
-
 const MyTable = forwardRef<MyTableMethods, MyTableProps>(
   (
     {
@@ -151,7 +138,7 @@ const MyTable = forwardRef<MyTableMethods, MyTableProps>(
 
         const obj = {
           index: (_: any, __: any, index: number) => index + 1 + (pageNum - 1) * pageSize,
-          txt2: (item: any) => item[v[2]] || isNull,
+          txt2: (item: any) => (item[v[2]] === 0 ? 0 : item[v[2]] || isNull),
           txt: (item: any) =>
             v[3] && !item[v[2]] ? (
               <div dangerouslySetInnerHTML={{ __html: v[3] }}></div>
@@ -159,6 +146,8 @@ const MyTable = forwardRef<MyTableMethods, MyTableProps>(
               item[v[2]]
             ) : v[3] ? (
               v[3]
+            ) : item[v[2]] === 0 ? (
+              0
             ) : (
               isNull
             ),

src/pages/A1check/A2manage/A2info/index.tsx

@@ -66,8 +66,10 @@ function A2info({ sId, closeFu }: Props) {
 
           <div className='A2Itit'>
             <div className='A2Itit1'>
-              {/*  // 待完善 */}
-              盘点藏品 <span>账物相符 190 | 账物不符 10 | 待登记 0</span>
+              盘点藏品{' '}
+              <span>
+                账物相符 {info.pcsConform} | 账物不符 {info.pcsUnConform} | 待登记 {info.pcsHold}
+              </span>
             </div>
             <div className='A2Itit2'>
               <AAbtn txt={1} onClick={() => MessageFu.warning('功能开发中')} tit='新增' />
@@ -87,7 +89,7 @@ function A2info({ sId, closeFu }: Props) {
               </>
             }
             waiWidth={190}
-            sonWidth='10.7%'
+            sonWidth='12%'
             getListAPI={A2_APIgetListSon}
             tableInfo={tableInfoSon}
             columnsTemp={A2columns('详情')}

src/pages/A1check/A2manage/A2tab1/index.tsx

@@ -55,10 +55,10 @@ function A2tab1({ setLookIdFu }: Props, ref: any) {
         columnsTemp={[
           ['txt2', '盘点名称', 'name', 150],
           ['txt2', '盘点说明', 'remark', 400],
-          ['txt', '登记馆藏文物总数', '待完善'],
-          ['txt', '账物相符总数', '待完善'],
-          ['txt', '账物不符总数', '待完善'],
-          ['txt', '账物待议总数', '待完善'],
+          ['txt', '登记馆藏文物总数', 'pcsRegister'],
+          ['txt', '账物相符总数', 'pcsConform'],
+          ['txt', '账物不符总数', 'pcsUnConform'],
+          ['txt', '账物待议总数', 'pcsHold'],
           ['txt', '经办人', 'handler'],
           ['txt', '负责人', 'owner'],
           ['txt', '创建时间', 'createTime'],

src/pages/A1check/A2manage/data.ts

@@ -29,12 +29,7 @@ export const A2topArr = [
     type: 'Select',
     options: resDictStr('类别')
   },
-  {
-    key: '待完善1',
-    placeholder: '相符情况',
-    type: 'Select',
-    options: resDictStr('相符情况')
-  },
+
   {
     key: 'unInfo',
     placeholder: '不符情形',

src/pages/A1check/A2manage/index.tsx

@@ -75,7 +75,7 @@ function A2manage() {
             </>
           }
           waiWidth={190}
-          sonWidth='10.7%'
+          sonWidth='12%'
           getListAPI={A2_APIgetList2}
           tableInfo={tableInfo}
           columnsTemp={A2columns('列表')}

src/pages/A1check/A3result/data.ts

@@ -36,7 +36,7 @@ export const A3topArr = [
     options: resDictStr('盘点状态')
   },
   {
-    key: '待完善1',
+    key: 'conform',
     placeholder: '相符情况',
     type: 'Select',
     options: resDictStr('相符情况')

src/pages/A1check/A3result/index.tsx

@@ -45,12 +45,13 @@ function A3result() {
           ['txt', '类别', 'type'],
           ['txt', '盘点状态', 'status'],
           ['txt', '藏品总登记账具体数量（件）', 'pcsRegister'],
+          ['txt', '相符情况', 'conform'],
           ['txt', '账物相符（件）', 'pcsConform'],
           ['txt', '账物不符（件）', 'pcsUnConform'],
           ['txt', '不符情形', 'unInfo'],
           ['txt', '不符原因', 'reasonInfo'],
           ['txt', '备注', 'remark'],
-          ['txt', '最新盘点名称', '待完善'],
+          ['txt', '最新盘点名称', 'checkName'],
           ['txt', '盘点时间', 'updateTime'],
           ['txt', '经办人', 'checkHandler'],
           ['txt', '负责人', 'checkOwner']

src/pages/ZgoodsInfo/GI_log/index.tsx

@@ -1,20 +1,43 @@
-import React, { useState } from 'react'
+import React, { useCallback, useEffect, useState } from 'react'
 import styles from './index.module.scss'
 import MyTable from '@/components/MyTable'
 import { Button } from 'antd'
 import A2info from '@/pages/A1check/A2manage/A2info'
+import { useParams } from 'react-router-dom'
+import { MessageFu } from '@/utils/message'
+import { API_getGoodsInfoLog } from '@/store/action/A1check/A1ledger'
+import { GoodsType } from '@/pages/AAnew/data'
 function GI_log() {
+  const { numName, num } = useParams<any>()
+
+  const [list, setList] = useState<GoodsType[]>([])
+
+  const getInfoFu = useCallback(async () => {
+    if (numName === 'null' || num === 'null') {
+      MessageFu.error('参数错误')
+      return
+    }
+    const obj = { numName, num }
+    const res = await API_getGoodsInfoLog(obj)
+    if (res.code === 0) {
+      setList(res.data)
+    }
+  }, [num, numName])
+
+  useEffect(() => {
+    getInfoFu()
+  }, [getInfoFu])
+
   // 按盘点批次-点击查看
   const [lookId, setLookId] = useState(0)
 
   return (
     <div className={styles.GI_log}>
-      {/* 待完善 */}
       <MyTable
         classKey='GI_log'
         scrollX={150}
         yHeight={630}
-        list={[]}
+        list={list}
         pagingInfo={false}
         columnsTemp={[
           ['txt2', '盘点名称', 'name', 150],
@@ -37,7 +60,6 @@ function GI_log() {
             width: 100,
             render: (item: any) => {
               return (
-                // 待完善
                 <Button size='small' type='text' onClick={() => setLookId(item.id)}>
                   查看
                 </Button>

src/pages/ZgoodsInfo/data.ts

@@ -1,35 +1,10 @@
 import { tablePingFu } from '../A1check/A1ledger/data'
 import { GoodsType } from '../AAnew/data'
-const obj = {
-  checkHandler: '张三',
-  checkName: '库内盘点20260324',
-  checkOwner: '李四',
-  checkRemark: '这是一个模拟数据',
-  conform: '',
-  createTime: '2026-03-25 14:14:00',
-  creatorId: 1,
-  creatorName: '',
-  deptId: 8,
-  effect: '生效中',
-  id: 213,
-  level: '未定级',
-  name: '中华民国青花花鸟双耳瓷瓶',
-  num: 'B1C4800',
-  numName: '藏品总登记号',
-  pcsConform: 0,
-  pcsRegister: 1,
-  pcsUnConform: 1,
-  reasonInfo: '记录错误',
-  remark: '',
-  status: '已盘点',
-  type: '瓷器',
-  unInfo: '数量不符',
-  updateTime: '2026-03-25 14:14:00'
-}
+
 // 待完善
 export const GIrowArr1: any[] = [
   { key: 'createTime', name: '创建日期' },
-  { key: '待完善创建人', name: '创建人' },
+  { key: 'creatorName', name: '创建人' },
   { key: 'numName', name: '编号类型' },
   { key: 'num', name: '藏品编号' },
   { key: 'name', name: '名称' },

src/pages/ZgoodsInfo/index.tsx

@@ -45,8 +45,7 @@ function ZgoodsInfo() {
             <div>
               <h3>{info.name}</h3>
               <Tag className='AA1Itop1'>{info.status}</Tag>
-              {/* 待完善 */}
-              <Tag className='AA1Itop1'>账物相符</Tag>
+              <Tag className='AA1Itop1'>{info.conform}</Tag>
             </div>
             <div>
               <AAbtn txt={3} onClick={() => MessageFu.warning('功能开发中')} />

src/store/action/A1check/A1ledger.ts

@@ -33,3 +33,10 @@ export const A1_APIreset = () => {
 export const API_getGoodsInfo = (data: any) => {
   return http.post('cms/checkMatch/findByNum', data)
 }
+
+/**
+ * 查看藏品详情 - 相关盘点单
+ */
+export const API_getGoodsInfoLog = (data: any) => {
+  return http.post('cms/checkMatch/related', data)
+}