解决冲突

src/views/mes/deviceledger/detail/index.vue

@@ -394,6 +394,7 @@
             <el-table v-loading="tableLoading" :data="detailData?.componentList" :stripe="true" :show-overflow-tooltip="true">
               <el-table-column :label="t('EquipmentManagement.EquipmentLedger.componentCode')" align="center" prop="code" min-width="140" sortable />
               <el-table-column :label="t('EquipmentManagement.EquipmentLedger.componentName')" align="center" prop="name" min-width="140" sortable />
+              <el-table-column :label="t('EquipmentManagement.EquipmentKeyItems.count')" align="center" prop="count" min-width="180" />
               <el-table-column :label="t('EquipmentManagement.EquipmentLedger.componentDesc')" align="center" prop="description" min-width="180" />
               <el-table-column :label="t('EquipmentManagement.EquipmentLedger.remark')" align="center" prop="remark" min-width="180" />
               <el-table-column :label="t('EquipmentManagement.EquipmentLedger.createTime')" align="center" prop="createTime" :formatter="dateFormatter" width="180" sortable />
@@ -903,7 +904,7 @@ const handleExportCriticalComponent = async () => {
   try {
     await message.exportConfirm()
     criticalExportLoading.value = true
-    const data = await CriticalComponentApi.exportDeviceComponent({ id: deviceId.value })
+    const data = await DeviceLedgerApi.exportDeviceComponent({ deviceId: deviceId.value })
     download.excel(data, '关键件.xls')
   } catch {
   } finally {