fix: --

src/pages/A_workbench/A1dataSta/components/Tab2/index.tsx

@@ -83,7 +83,11 @@ export const A1Tab2: FC = () => {
             jc1: '-',
             jc2: '-',
             jc3: '-',
-            jcTotal: '-'
+            jcTotal: '-',
+            reduceBaChu: '-',
+            reduceOther: '-',
+            pcsIn: '-',
+            reduceOut: '-'
           })
         }
       })
@@ -105,6 +109,10 @@ export const A1Tab2: FC = () => {
           '',
           '',
           '其他增加',
+          '调入',
+          '调出',
+          '拨出',
+          '其他减少',
           '提陈',
           '在陈',
           '退陈',
@@ -117,17 +125,25 @@ export const A1Tab2: FC = () => {
         worksheet.addRow([
           '',
           `${curYear}年${QUARTER_MAP[quarter]}库存数`,
-          `${curYear}年${QUARTER_MAP[quarter]}增加数`
+          `${curYear}年${QUARTER_MAP[quarter]}增加数`,
+          '',
+          '',
+          '',
+          '',
+          '',
+          '',
+          `${curYear}年${QUARTER_MAP[quarter]}减少数`
         ])
         worksheet.addRow(line2)
         worksheet.addRow(['', '', '征购', '捐赠', '移交', '上交', '调拨'])
         worksheet.mergeCells('A1:A3')
         worksheet.getCell('A1').value = '项目/类目/类别'
-        worksheet.mergeCells('C1:H1')
-        worksheet.mergeCells('I1:L1')
-        worksheet.getCell('I1').value = '陈列'
+        worksheet.mergeCells('C1:I1')
+        worksheet.mergeCells('J1:L1')
+        worksheet.getCell('M1').value = '陈列'
         worksheet.mergeCells('M1:P1')
-        worksheet.getCell('M1').value = '借出'
+        worksheet.getCell('Q1').value = '借出'
+        worksheet.mergeCells('Q1:T1')
         worksheet.mergeCells('B2:B3')
         worksheet.mergeCells('C2:G2')
         worksheet.mergeCells('H2:H3')
@@ -147,6 +163,10 @@ export const A1Tab2: FC = () => {
             i.pcsSj,
             i.pcsDb,
             i.pcsOther,
+            '',
+            '',
+            i.reduceBaChu,
+            i.reduceOther,
             i.cl1,
             i.cl2,
             i.cl3,
@@ -161,7 +181,7 @@ export const A1Tab2: FC = () => {
           worksheet.getColumn(index + 1).width = width
         })
       },
-      [3 + list.length, 16]
+      [3 + list.length, 20]
     )
   }
 
@@ -259,30 +279,32 @@ export const A1Tab2: FC = () => {
               {
                 title: '其他增加',
                 dataIndex: 'pcsOther'
+              },
+              {
+                title: '调入',
+                dataIndex: 'pcsIn',
+                render: () => '-'
+              }
+            ]
+          },
+          {
+            title: `${curYear}年${QUARTER_MAP[quarter]}减少数`,
+            children: [
+              {
+                title: '调出',
+                dataIndex: 'reduceOut',
+                render: () => '-'
+              },
+              {
+                title: '拨出',
+                dataIndex: 'reduceBaChu'
+              },
+              {
+                title: '其他减少',
+                dataIndex: 'reduceOther'
               }
-              // {
-              //   title: '调入',
-              //   dataIndex: 'g'
-              // }
             ]
           },
-          // {
-          //   title: `${curYear}年${QUARTER_MAP[quarter]}减少数`,
-          //   children: [
-          //     {
-          //       title: '调出',
-          //       dataIndex: 'a'
-          //     },
-          //     {
-          //       title: '拨出',
-          //       dataIndex: 'b'
-          //     },
-          //     {
-          //       title: '其他减少',
-          //       dataIndex: 'c'
-          //     }
-          //   ]
-          // },
           // {
           //   title: `${curYear}年${QUARTER_MAP[quarter]}库存数`,
           //   children: [

src/pages/Y_goodsDetails/Y2look/index.tsx

@@ -66,11 +66,11 @@ function Y2look() {
   }
   const handleExport2 = async () => {
     const res = await API_getGoodsLedger(sId)
+    const jd = res.data.filter((i: any) => i.type === 'JD') ?? []
     exportWordHandler(EXPORT_WORD_ENUM.COLLECTION_CARD, {
       ...info,
-      records: res.data
-        .filter((i: any) => i.type === 'JD')
-        .map((i: any) => ({ ...i, ...JSON.parse(i.snap) }))
+      authUnit: jd.map((i: any) => i.authUnit),
+      records: jd.map((i: any) => ({ ...i, ...JSON.parse(i.snap) }))
     })
   }