代码提交-3-13

src/components/drugFiling/index.vue

@@ -165,7 +165,16 @@ function loadArchives() {
 
     // 合并 archiveList 和 drugFilings
     mergedData.value = formattedRows.flatMap(row => [
-      { ...row, filingId: null },
+      {
+        ...row,
+        filingId: null,
+        packCount: row.packCount ?? 0,
+        inventoryUnit: row.inventoryUnit,
+        splitUnit: row.splitUnit,
+        minNumber: row.minNumber,
+        unitQuantity: row.minNumber ?? row.unitQuantity,
+        isSplit: row.isSplit
+      },
       ...row.drugFilings.map(filing => ({
         medicineName: row.medicineName,
         manufacturer: row.manufacturer,
@@ -174,11 +183,18 @@ function loadArchives() {
         batch: filing.batch,
         expiryDate: filing.expiryDate,
         boxCount: filing.boxCount,
+        packCount: filing.packCount,
         retailPrice: filing.retailPrice,
+        minPrice: filing.minPrice,
+        minNumber: filing.minNumber ?? row.minNumber,
+        unitQuantity: filing.minNumber ?? row.minNumber,
+        inventoryUnit: filing.inventoryUnit ?? row.inventoryUnit,
+        splitUnit: filing.splitUnit ?? row.splitUnit,
         filingId: filing.id,
         archiveId: row.id,
         storeroomId: filing.storeroomId,
-        storeroomName: filing.storeroomName
+        storeroomName: filing.storeroomName,
+        isSplit: row.isSplit
       }))
     ]);
 
@@ -251,4 +267,4 @@ function handlePagination(pagination) {
   justify-content: space-between;
   align-items: center;
 }
-</style>
+</style>