feat: .

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

@@ -31,6 +31,8 @@ type RangeQueryType = {
   name?: string
   age?: string
   level?: string
+  status?: string
+  conform?: string
   type?: string
   texture?: string
   unInfo?: string
@@ -179,6 +181,25 @@ const rangeModalTopArr = [
     type: 'Select',
     options: resDictStr('文物级别')
   }
+  ,
+  {
+    key: 'status',
+    placeholder: '盘点状态',
+    type: 'Select',
+    options: [
+      { label: '未盘点', value: '0' },
+      { label: '已盘点', value: '1' }
+    ]
+  },
+  {
+    key: 'conform',
+    placeholder: '相符状态',
+    type: 'Select',
+    options: [
+      { label: '不相符', value: '0' },
+      { label: '相符', value: '1' }
+    ]
+  }
 ]
 
 const countSelectOptions = Array.from({ length: 11 }).map((_, index) => ({
@@ -310,7 +331,21 @@ const normalizeGoodsRow = (item: GoodsRowType, index: number) => {
 
 const normalizeRangeGoodsRow = (item: GoodsRowType, index: number) => {
   const { id, ...rest } = normalizeGoodsRow(item, index)
-  return rest
+  return {
+    ...rest,
+    status:
+      rest.status === 1 || `${rest.status}` === '1'
+        ? '已盘点'
+        : rest.status === 0 || `${rest.status}` === '0'
+        ? '未盘点'
+        : rest.status,
+    conform:
+      item.conform === 1 || `${item.conform}` === '1'
+        ? '相符'
+        : item.conform === 0 || `${item.conform}` === '0'
+        ? '不相符'
+        : item.conform
+  }
 }
 
 const getDetailGoodsRecords = (info: any) => {
@@ -1752,7 +1787,9 @@ function A2add({ closeFu, saveSuccessFu, detailId, mode = 'add' }: Props) {
               ['txt', '类别', 'type'],
               ['tablePing', '质地'],
               ['txt', '数量', 'pcsRegister'],
-              ['txt', '级别', 'level']
+              ['txt', '级别', 'level'],
+              ['txt', '盘点状态', 'status'],
+              ['txt', '相符状态', 'conform']
             ]}
             lastBtn={[
               {

src/pages/A1check/A3result/index.tsx

@@ -21,6 +21,7 @@ const columnsBaseTemp = [
   ['txt', '级别', 'level'],
   ['txt', '类别', 'type'],
   ['txt', '盘点状态', 'status'],
+  ['txt', '藏品总登记账登记的馆藏文物总数（件/套）', 'ledgerPcsRegister'],
   ['txt', '藏品总登记账具体数量（件）', 'pcsRegister'],
   ['txt', '相符状态', 'conform'],
   ['txt', '账物相符（件）', 'pcsConform'],
@@ -100,6 +101,14 @@ const resolveConformText = (value: any) => {
   return value
 }
 
+const pickValue = (item: any, keys: string[], defaultValue: any = '') => {
+  for (const key of keys) {
+    const value = item?.[key]
+    if (value === 0 || value) return value
+  }
+  return defaultValue
+}
+
 const renderNameWithNoLedger = (name: any, noLedger: any) => {
   const showWarning = noLedger === 1 || `${noLedger}` === '1'
   const displayName = name === 0 || name ? name : '（空）'
@@ -230,6 +239,7 @@ function A3result() {
           item.firmVersionId || item.checkFirmVersionId || item.versionId || item.waiId || 0,
         nameDisplay: renderNameWithNoLedger(item.name, item.noLedger),
         status: resolveStatusText(item.status),
+        ledgerPcsRegister: pickValue(item, ['ledgerPcsRegister'], ' '),
         conform: resolveConformText(item.conform),
         checkName:
           item.checkName &&
@@ -245,7 +255,7 @@ function A3result() {
               {item.checkName}
             </span>
           ) : (
-            '\u00A0'
+            ' '
           )
       }))
     }),
@@ -280,7 +290,7 @@ function A3result() {
       <div className='pageTitle'>馆内盘点结果</div>
 
       <TopSearch
-        yHeight={650}
+        yHeight={600}
         ref={topDomRef}
         leftArr={A3topArr}
         rightBtn={rightBtn}

src/pages/A1check/A4collect/data.ts

@@ -1,4 +1,4 @@
-export const A4topArr = [
+export const A4topArr = [
   {
     key: 'cityBase',
     placeholder: '请选择 省、自治区、直辖市',
@@ -15,7 +15,8 @@ export const A4columnsTemp = [
   ['index', '序号', 90],
   ['txt', '省、自治区、直辖市', 'province', 160],
   ['txt', '收藏单位', 'collectionUnit', 180],
-  ['txt', '藏品总登记账登记的馆藏文物总数（件/套）', 'totalCount'],
+  ['txt', '藏品总登记账登记的馆藏文物总数（套）', 'ledgerPcsRegister'],
+  ['txt', '藏品总登记账登记的馆藏文物总数（件）', 'pcsRegister'],
   ['txt', '账物相符馆藏文件总数（件）', 'conformCount'],
   ['txt', '账物不符差异总数（件）', 'diffCount'],
   ['txt', '记录错误', 'recordError'],
@@ -31,7 +32,8 @@ export const A4widthSet = {
   index: 90,
   province: 160,
   collectionUnit: 180,
-  totalCount: 220,
+  ledgerPcsRegister: 220,
+  pcsRegister: 220,
   conformCount: 180,
   diffCount: 180,
   recordError: 120,

src/pages/A1check/A4collect/index.tsx

@@ -27,6 +27,8 @@ type CollectRowType = {
   id: string | number
   province: string
   collectionUnit: string
+  ledgerPcsRegister: number | string
+  pcsRegister: number | string
   totalCount: number | string
   conformCount: number | string
   diffCount: number | string
@@ -184,6 +186,8 @@ const normalizeRow = (item: any, index: number): CollectRowType => ({
     'unitName',
     'deptName'
   ]),
+  ledgerPcsRegister: pickValue(item, ['ledgerPcsRegister'], 0),
+  pcsRegister: pickValue(item, ['pcsRegister'], 0),
   totalCount: pickValue(
     item,
     ['totalCount', 'registerCount', 'goodsTotalCount', 'pcsRegister', 'relicTotalCount'],
@@ -404,7 +408,7 @@ function A4collect() {
             nameDisplay: renderNameWithNoLedger(item.name, item.noLedger),
             status: resolveStatusText(item.status),
             conform: resolveConformText(item.conform),
-            checkName: item.checkName || '\u00A0'
+            checkName: item.checkName || ' '
           })
         )