From 662e1beef11825aa376b9b23598f501b4221a9fa Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Thu, 2 Apr 2026 17:17:47 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E4=BB=B6=E5=92=8C=E5=A4=87=E4=BB=B6=E6=94=B9=E6=88=90=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/deviceledger/DeviceLedgerForm.vue     | 386 +++++++++++++++---
 1 file changed, 325 insertions(+), 61 deletions(-)

diff --git a/src/views/mes/deviceledger/DeviceLedgerForm.vue b/src/views/mes/deviceledger/DeviceLedgerForm.vue
index 44a46134..92cf5ea4 100644
--- a/src/views/mes/deviceledger/DeviceLedgerForm.vue
+++ b/src/views/mes/deviceledger/DeviceLedgerForm.vue
@@ -101,30 +101,30 @@
         <!-- <el-col :span="12">
           <el-form-item label="供应商" prop="supplier">
             <el-input v-model="formData.supplier" placeholder="请输入供应商" /> -->
-            <!--
-            <el-select v-model="formData.supplier" placeholder="请选择供应商" clearable filterable class="!w-full">
-              <el-option v-for="item in supplierOptions" :key="item" :label="item" :value="item" />
-            </el-select>
-            -->
-          <!-- </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="所属车间" prop="workshop">
-            <el-input v-model="formData.workshop" placeholder="请输入所属车间" /> -->
-            <!--
-            <el-tree-select
-              v-model="formData.workshop"
-              :data="deptTree"
-              :props="treeSelectProps"
-              check-strictly
-              default-expand-all
-              value-key="id"
-              placeholder="请选择所属车间"
-              class="!w-full"
-            />
-            -->
-          <!-- </el-form-item>
-        </el-col> -->
+        <!--
+        <el-select v-model="formData.supplier" placeholder="请选择供应商" clearable filterable class="!w-full">
+          <el-option v-for="item in supplierOptions" :key="item" :label="item" :value="item" />
+        </el-select>
+        -->
+        <!-- </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="所属车间" prop="workshop">
+          <el-input v-model="formData.workshop" placeholder="请输入所属车间" /> -->
+        <!--
+        <el-tree-select
+          v-model="formData.workshop"
+          :data="deptTree"
+          :props="treeSelectProps"
+          check-strictly
+          default-expand-all
+          value-key="id"
+          placeholder="请选择所属车间"
+          class="!w-full"
+        />
+        -->
+        <!-- </el-form-item>
+      </el-col> -->
 
         <el-col :span="24">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.productionDate')" prop="productionDate" required>
@@ -147,20 +147,20 @@
         <!-- <el-col :span="24">
           <el-form-item label="所属系统组织" prop="systemOrg">
             <el-input v-model="formData.systemOrg" placeholder="请输入所属系统组织" /> -->
-            <!--
-            <el-tree-select
-              v-model="formData.systemOrg"
-              :data="deptTree"
-              :props="treeSelectProps"
-              check-strictly
-              default-expand-all
-              value-key="id"
-              placeholder="请选择部门"
-              class="!w-full"
-            />
-            -->
-          <!-- </el-form-item>
-        </el-col> -->
+        <!--
+        <el-tree-select
+          v-model="formData.systemOrg"
+          :data="deptTree"
+          :props="treeSelectProps"
+          check-strictly
+          default-expand-all
+          value-key="id"
+          placeholder="请选择部门"
+          class="!w-full"
+        />
+        -->
+        <!-- </el-form-item>
+      </el-col> -->
 
         <el-col :span="24">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceManagerName')" prop="deviceManagerIds">
@@ -256,18 +256,77 @@
   <el-dialog
     v-model="criticalComponentDialogVisible"
     title="选择关键件"
-    width="860px"
+    width="1200px"
     class="device-ledger-transfer-dialog"
     append-to-body
   >
-    <div class="device-ledger-transfer">
-      <el-transfer
-        v-model="criticalComponentDraft"
-        :data="criticalComponentTransferData"
-        filterable
-        :filter-placeholder="t('EquipmentManagement.EquipmentLedger.placeholderComponentIds')"
-      />
-    </div>
+    <!--    <div class="device-ledger-transfer">
+          <el-transfer
+            v-model="criticalComponentDraft"
+            :data="criticalComponentTransferData"
+            filterable
+            :filter-placeholder="t('EquipmentManagement.EquipmentLedger.placeholderComponentIds')"
+          />
+        </div>-->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" min-label-width="68px" style="margin-bottom: 10px">
+      <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.code')" prop="code">
+        <el-input
+          v-model="queryParams.code" :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderCode')"
+          clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.name')" prop="name">
+        <el-input
+          v-model="queryParams.name" :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderName')"
+          clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.description')" prop="description">
+        <el-input
+          v-model="queryParams.description"
+          :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderDescription')" clearable
+          @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" />
+          {{ t('common.query') }}
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" />
+          {{ t('common.reset') }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <ContentWrap>
+      <el-table
+        ref="multipleTableRef"
+        v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
+        @selection-change="handleSelectionChange" row-key="id">
+        <el-table-column type="selection" width="55"  :reserve-selection="true" />
+        <el-table-column
+          :label="t('EquipmentManagement.EquipmentKeyItems.code')" align="center" prop="code"
+          min-width="140"  sortable />
+        <el-table-column
+          :label="t('EquipmentManagement.EquipmentKeyItems.name')" align="center" prop="name"
+          min-width="140"  sortable />
+        <el-table-column
+          :label="t('EquipmentManagement.EquipmentKeyItems.description')" align="center" prop="description"
+          min-width="180" />
+        <el-table-column
+          :label="t('EquipmentManagement.EquipmentKeyItems.count')" align="center" prop="count"
+          min-width="180" />
+        <el-table-column
+          :label="t('EquipmentManagement.EquipmentKeyItems.remark')" align="center" prop="remark"
+          min-width="180" />
+        <el-table-column
+          :label="t('EquipmentManagement.EquipmentKeyItems.createTime')" align="center" prop="createTime"
+          :formatter="dateFormatter" width="180"  sortable />
+      </el-table>
+
+      <Pagination
+        :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+        @pagination="getList" />
+
+    </ContentWrap>
     <template #footer>
       <el-button @click="criticalComponentDialogVisible = false">{{ t('common.cancel') }}</el-button>
       <el-button type="primary" @click="confirmCriticalComponentDialog">{{ t('common.ok') }}</el-button>
@@ -281,14 +340,64 @@
     class="device-ledger-transfer-dialog"
     append-to-body
   >
-    <div class="device-ledger-transfer">
+<!--    <div class="device-ledger-transfer">
       <el-transfer
         v-model="beijianDraft"
         :data="beijianTransferData"
         filterable
         :filter-placeholder="t('EquipmentManagement.EquipmentLedger.placeholderBeijianIds')"
       />
-    </div>
+    </div>-->
+    <!-- 列表 -->
+        <el-form class="-mb-15px" :model="bjQueryParams" ref="bjQueryFormRef" :inline="true" min-label-width="68px" style="margin-bottom: 10px">
+          <el-form-item :label="t('SparePartsManagement.SpareInfo.code')" prop="barCode">
+            <el-input
+              v-model="bjQueryParams.barCode" :placeholder="t('SparePartsManagement.SpareInfo.placeholderCode')"
+              clearable @keyup.enter="handleQuery" class="!w-240px" />
+          </el-form-item>
+          <el-form-item :label="t('SparePartsManagement.SpareInfo.name')" prop="name">
+            <el-input
+              v-model="bjQueryParams.name" :placeholder="t('SparePartsManagement.SpareInfo.placeholderName')"
+              clearable @keyup.enter="bjHandleQuery" class="!w-240px" />
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="bjHandleQuery">
+              <Icon icon="ep:search" class="mr-5px" />
+              {{ t('common.query') }}
+            </el-button>
+            <el-button @click="bjResetQuery">
+              <Icon icon="ep:refresh" class="mr-5px" />
+              {{ t('common.reset') }}
+            </el-button>
+          </el-form-item>
+        </el-form>
+        <ContentWrap>
+          <el-table ref="bjMultipleTableRef" v-loading="loading" :data="bjList" :stripe="true" @selection-change="bjHandleSelectionChange" :show-overflow-tooltip="true" row-key="id">
+            <el-table-column type="selection" width="55"  :reserve-selection="true" />
+            <el-table-column :label="t('SparePartsManagement.SpareInfo.code')" align="center" prop="barCode" width="240px"   sortable />
+            <el-table-column :label="t('SparePartsManagement.SpareInfo.name')" align="left" prop="name"  width="220px" sortable />
+            <el-table-column :label="t('SparePartsManagement.SpareInfo.unit')" align="center" prop="unitName"  sortable />
+            <el-table-column :label="t('SparePartsManagement.SpareInfo.status')" align="center" prop="status" sortable>
+              <template #default="scope">
+                <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+              </template>
+            </el-table-column>
+            <el-table-column
+              :label="t('SparePartsManagement.SpareInfo.createTime')"
+              align="center"
+              prop="createTime"
+              :formatter="dateFormatter"
+              width="180px"
+              sortable />
+          </el-table>
+          <!-- 分页 -->
+          <Pagination
+            :total="bjTotal"
+            v-model:page="bjQueryParams.pageNo"
+            v-model:limit="bjQueryParams.pageSize"
+            @pagination="bjGetList"
+          />
+        </ContentWrap>
     <template #footer>
       <el-button @click="beijianDialogVisible = false">{{ t('common.cancel') }}</el-button>
       <el-button type="primary" @click="confirmBeijianDialog">{{ t('common.ok') }}</el-button>
@@ -298,27 +407,41 @@
 </template>
 <script setup lang="ts">
 import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger'
-import { CriticalComponentApi } from '@/api/mes/criticalComponent'
+import {CriticalComponentApi, CriticalComponentVO} from '@/api/mes/criticalComponent'
 import { DeviceTypeApi, DeviceTypeTreeVO } from '@/api/mes/devicetype'
 import { getSimpleUserList, UserVO } from '@/api/system/user'
 import { formatDate } from '@/utils/formatTime'
 import type { FormRules } from 'element-plus'
-import { ProductApi } from '@/api/erp/product/product'
+import {ProductApi, ProductVO} from '@/api/erp/product/product'
 import { DeviceApi,DeviceVO } from '@/api/iot/device'
 import QrcodeActionCard from '@/components/QrcodeActionCard/index.vue'
-
+import { dateFormatter } from '@/utils/formatTime'
+import {ref} from "vue";
+import {ElTable} from "element-plus";
+import { DICT_TYPE } from '@/utils/dict'
 /** 设备类型 表单 */
 defineOptions({ name: 'DeviceLedgerForm' })
-
+const queryFormRef = ref()
+const bjQueryFormRef = ref()
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-
+const loading = ref(true)
+const total = ref(0)
+const bjTotal = ref(0)
+const selectedIds = ref<number[]>([])
+const bjSelectedIds = ref<number[]>([])
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const deviceList = ref<DeviceVO[]>([]) // 列表
-
+const list = ref<CriticalComponentVO[]>([])
+const bjList = ref<ProductVO[]>([])
+const selectedRows = ref<any[]>([])  // 存储所有选中的行
+const bjSelectedRows = ref<any[]>([])  // 存储所有选中的行
+// 表格引用
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const bjMultipleTableRef = ref<InstanceType<typeof ElTable>>()
 const parseIdsValue = (value: any): number[] => {
   if (!value) return []
   if (Array.isArray(value)) return value.map((v) => Number(v)).filter((v) => !Number.isNaN(v))
@@ -510,15 +633,17 @@ const openBeijianDialog = () => {
 }
 
 const confirmCriticalComponentDialog = () => {
-  const validMap = new Set(criticalComponentOptions.value.map((item) => item.value))
-  const selected = Array.from(new Set(criticalComponentDraft.value.map((v) => Number(v)).filter((v) => validMap.has(v))))
-  formData.value.componentIds = selected
+  let ids = selectedRows.value.map(item => item.id);
+  //const validMap = new Set(criticalComponentOptions.value.map((item) => item.value))
+  //const selected = Array.from(new Set(criticalComponentDraft.value.map((v) => Number(v)).filter((v) => validMap.has(v))))
+  formData.value.componentIds = ids
   criticalComponentDialogVisible.value = false
 }
 const confirmBeijianDialog = () => {
-  const validMap = new Set(beijianOptions.value.map((item) => item.value))
-  const selected = Array.from(new Set(beijianDraft.value.map((v) => Number(v)).filter((v) => validMap.has(v))))
-  formData.value.beijianIds = selected
+  let ids = bjSelectedRows.value.map(item => item.id);
+ /* const validMap = new Set(beijianOptions.value.map((item) => item.value))
+  const selected = Array.from(new Set(beijianDraft.value.map((v) => Number(v)).filter((v) => validMap.has(v))))*/
+  formData.value.beijianIds = ids
   beijianDialogVisible.value = false
 }
 
@@ -606,8 +731,147 @@ const open = async (type: string, id?: number, defaultDeviceTypeId?: number) =>
   } else {
     deviceList.value = await DeviceApi.getDeviceList2ByNoUsed(formData.value.dvId)
   }
+  getList()
+
+  bjGetList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  code: undefined as string | undefined,
+  name: undefined as string | undefined,
+  description: undefined as string | undefined,
+  remark: undefined as string | undefined,
+  createTime: [] as string[]
+})
+
+const bjQueryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  categoryId: undefined
+})
+
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 配件搜索按钮操作 */
+const bjHandleQuery = () => {
+  bjQueryParams.pageNo = 1
+  bjGetList()
+}
+
+/** 配件重置按钮操作 */
+const bjResetQuery = () => {
+  bjQueryFormRef.value.resetFields()
+  bjHandleQuery()
+}
+
+const handleSelectionChange = (rows: CriticalComponentVO[]) => {
+  selectedIds.value = rows.map((r) => r.id).filter((id): id is number => typeof id === 'number')
+  // 获取当前页所有行的 id
+  const currentPageIds = rows.map(item => item.id)
+
+  // 从已选中的数组中移除当前页的数据
+  selectedRows.value = selectedRows.value.filter(
+    item => !currentPageIds.includes(item.id)
+  )
+  // 添加当前页新选中的数据
+  selectedRows.value.push(...rows)
+}
+
+const bjHandleSelectionChange = (rows: CriticalComponentVO[]) => {
+  bjSelectedIds.value = rows.map((r) => r.id).filter((id): id is number => typeof id === 'number')
+  // 获取当前页所有行的 id
+  const currentPageIds = rows.map(item => item.id)
+
+  // 从已选中的数组中移除当前页的数据
+  bjSelectedRows.value = bjSelectedRows.value.filter(
+    item => !currentPageIds.includes(item.id)
+  )
+  // 添加当前页新选中的数据
+  bjSelectedRows.value.push(...rows)
+}
+
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await CriticalComponentApi.getCriticalComponentPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+    // 数据加载后，重新设置选中状态
+    nextTick(() => {
+      toggleSelection()
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 配件查询列表 */
+const bjGetList = async () => {
+  loading.value = true
+  try {
+    bjQueryParams.categoryId = 5
+    const data = await ProductApi.getProductPage(bjQueryParams)
+    bjList.value = data.list
+    bjTotal.value = data.total
+    // 数据加载后，重新设置选中状态
+    nextTick(() => {
+      bjToggleSelection()
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+
+
+// 切换选中状态
+const toggleSelection = () => {
+  if (!multipleTableRef.value || !selectedRows.value.length) return
+
+  // 遍历当前页的数据
+  list.value.forEach(row => {
+    // 检查这一行是否在已选中数组中
+    const isSelected = selectedRows.value.some(item => item.id === row.id)
+
+    if (isSelected) {
+      // 如果应该选中，就选中
+      multipleTableRef.value!.toggleRowSelection(row, true)
+    } else {
+      // 否则取消选中
+      multipleTableRef.value!.toggleRowSelection(row, false)
+    }
+  })
+}
+
+// 切换选中状态
+const bjToggleSelection = () => {
+  if (!bjMultipleTableRef.value || !bjSelectedRows.value.length) return
+
+  // 遍历当前页的数据
+  bjList.value.forEach(row => {
+    // 检查这一行是否在已选中数组中
+    const isSelected = bjSelectedRows.value.some(item => item.id === row.id)
+
+    if (isSelected) {
+      // 如果应该选中，就选中
+      bjMultipleTableRef.value!.toggleRowSelection(row, true)
+    } else {
+      // 否则取消选中
+      bjMultipleTableRef.value!.toggleRowSelection(row, false)
+    }
+  })
+}
 
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调

From 7b26f5c34affa7f5a65b30b6f37c325e78e761cb Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Tue, 7 Apr 2026 16:01:59 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en.ts                             |   1 +
 src/locales/zh-CN.ts                          |  11 +-
 .../erp/component/product/ProductForm.vue     |   5 +
 src/views/erp/component/product/index.vue     |   1 +
 src/views/iot/device/index.vue                |   2 +-
 .../CriticalComponentForm.vue                 |   8 ++
 src/views/mes/criticalComponent/index.vue     |   3 +
 .../mes/deviceledger/DeviceLedgerForm.vue     | 130 ++++++++++--------
 src/views/mes/deviceledger/index.vue          |   4 +-
 9 files changed, 99 insertions(+), 66 deletions(-)

diff --git a/src/locales/en.ts b/src/locales/en.ts
index 2a82872d..6e50e660 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1192,6 +1192,7 @@ export default {
     },
     // Equipment Ledger
     EquipmentLedger: {
+      images:'Images',
       deviceCode: 'Code',
       qrcode: 'QR Code/Barcode',
       deviceName: 'Name',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 622deb0f..87853fe5 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1184,6 +1184,7 @@ export default {
     },
     // 设备台账
     EquipmentLedger: {
+      images:'图片',
       deviceCode: '编码',
       qrcode: '二维码/条形码',
       deviceName: '名称',
@@ -1191,8 +1192,8 @@ export default {
       statusEnabled: '启用',
       statusDisabled: '不启用',
       deviceType: '类型',
-      deviceSpec: '规格',
-      deviceModel: '型号',
+      deviceSpec: '规格型号',
+     /* deviceModel: '型号',*/
       isSchedueld: '是否排产',
       ratedCapacity: '额定产能',
       yes: '是',
@@ -1215,7 +1216,7 @@ export default {
       placeholderDeviceStatus: '请选择状态',
       placeholderDeviceType: '请选择类型',
       placeholderDeviceModel: '请输入型号',
-      placeholderDeviceSpec: '请输入规格',
+      placeholderDeviceSpec: '请输入规格型号',
       placeholderRatedCapacity: '请输入额定产能',
       placeholderProductionDate: '请选择生产日期',
       placeholderFactoryEntryDate: '请选择入厂日期',
@@ -1273,6 +1274,7 @@ export default {
       code: '编码',
       qrcode: '二维码/条形码',
       name: '名称',
+      deviceSpec:'规格型号',
       batchDelete: '批量删除',
       description: '描述',
       remark: '备注',
@@ -1282,6 +1284,7 @@ export default {
       delete: '删除',
       placeholderCode: '请输入编码',
       placeholderName: '请输入名称',
+      placeholderDeviceSpec: '请输入规格型号',
       placeholderDescription: '请输入描述',
       placeholderRemark: '请输入备注',
       placeholderCount: '请输入数量',
@@ -1548,6 +1551,7 @@ export default {
     SpareInfo: {
       name: '备件名称',
       code: '备件编码',
+      deviceSpec:'规格型号',
       qrcode: '二维码/条形码',
       standard: '规格',
       expiryDay: '保质期天数',
@@ -1561,6 +1565,7 @@ export default {
       exportFilename: '备件信息.xls',
       placeholderName: '请输入名称',
       placeholderCode: '请输入编码',
+      placeholderDeviceSpec: '请输入规格型号',
       placeholderUnit: '请选择单位',
       placeholderSafetyNumber: '请输入预警库存数量',
       placeholderRemark: '请输入备注',
diff --git a/src/views/erp/component/product/ProductForm.vue b/src/views/erp/component/product/ProductForm.vue
index 8125056b..fa0e7cc8 100644
--- a/src/views/erp/component/product/ProductForm.vue
+++ b/src/views/erp/component/product/ProductForm.vue
@@ -36,6 +36,11 @@
             <el-input v-model="formData.name" :placeholder="t('SparePartsManagement.SpareInfo.placeholderName')" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('SparePartsManagement.SpareInfo.deviceSpec')" prop="deviceSpec">
+            <el-input v-model="formData.deviceSpec" :placeholder="t('SparePartsManagement.SpareInfo.placeholderDeviceSpec')" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item :label="t('SparePartsManagement.SpareInfo.unit')" prop="unitId">
             <el-select v-model="formData.unitId" clearable :placeholder="t('SparePartsManagement.SpareInfo.placeholderUnit')" class="w-1/1">
diff --git a/src/views/erp/component/product/index.vue b/src/views/erp/component/product/index.vue
index 24c6ee75..53637cd2 100644
--- a/src/views/erp/component/product/index.vue
+++ b/src/views/erp/component/product/index.vue
@@ -58,6 +58,7 @@
       <el-table-column :label="t('SparePartsManagement.SpareInfo.code')" align="center" prop="barCode" width="240px"   sortable />
       <el-table-column :label="t('SparePartsManagement.SpareInfo.name')" align="left" prop="name"  width="220px" sortable />
       <el-table-column v-if="checkPermi(['erp:component:standard'])" :label="t('SparePartsManagement.SpareInfo.standard')" align="center" prop="standard" />
+      <el-table-column :label="t('SparePartsManagement.SpareInfo.deviceSpec')" align="center" prop="deviceSpec"  sortable />
       <el-table-column :label="t('SparePartsManagement.SpareInfo.category')" align="center" prop="categoryName"  sortable />
       <el-table-column :label="t('SparePartsManagement.SpareInfo.unit')" align="center" prop="unitName"  sortable />
       <el-table-column :label="t('SparePartsManagement.SpareInfo.safetyNumber')" align="center" prop="safetyNumber" />
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 2aad141e..fc57a430 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -1567,7 +1567,7 @@ const handleShowDeviceAlarmHistory = async () => {
   background-color: #fff;
   border-radius: 4px;
   padding: 16px;
-  max-height: calc(100vh - 546px);
+ /* max-height: calc(100vh - 546px);*/
   overflow-y: auto;
 
   .empty-grid {  // 注意：这里缩进要与上面一致
diff --git a/src/views/mes/criticalComponent/CriticalComponentForm.vue b/src/views/mes/criticalComponent/CriticalComponentForm.vue
index 2d1e3202..ea457acb 100644
--- a/src/views/mes/criticalComponent/CriticalComponentForm.vue
+++ b/src/views/mes/criticalComponent/CriticalComponentForm.vue
@@ -29,6 +29,13 @@
           clearable
         />
       </el-form-item>
+      <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.deviceSpec')" prop="deviceSpec">
+        <el-input
+          v-model="formData.deviceSpec"
+          :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderDeviceSpec')"
+          clearable
+        />
+      </el-form-item>
       <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.description')" prop="description">
         <el-input
           v-model="formData.description"
@@ -171,6 +178,7 @@ const open = async (type: 'create' | 'update', id?: number) => {
         code: detail?.code,
         isCode: detail?.isCode ?? false,
         name: detail?.name,
+        deviceSpec:detail?.deviceSpec,
         description: detail?.description,
         count: detail?.count,
         remark: detail?.remark,
diff --git a/src/views/mes/criticalComponent/index.vue b/src/views/mes/criticalComponent/index.vue
index f82b4dda..4464392c 100644
--- a/src/views/mes/criticalComponent/index.vue
+++ b/src/views/mes/criticalComponent/index.vue
@@ -74,6 +74,9 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
 :label="t('EquipmentManagement.EquipmentKeyItems.name')" align="center" prop="name"
         min-width="140"  sortable />
       <el-table-column
+        :label="t('EquipmentManagement.EquipmentKeyItems.deviceSpec')" align="center" prop="deviceSpec"
+        min-width="140"  sortable />
+      <el-table-column
 :label="t('EquipmentManagement.EquipmentKeyItems.description')" align="center" prop="description"
         min-width="180" />
               <el-table-column
diff --git a/src/views/mes/deviceledger/DeviceLedgerForm.vue b/src/views/mes/deviceledger/DeviceLedgerForm.vue
index 92cf5ea4..8e956b6f 100644
--- a/src/views/mes/deviceledger/DeviceLedgerForm.vue
+++ b/src/views/mes/deviceledger/DeviceLedgerForm.vue
@@ -13,11 +13,15 @@
             <el-input v-model="formData.id" placeholder="系统自动生成" disabled />
           </el-form-item>
         </el-col> -->
-
-        <el-col :span="12">
+        <el-col :span="8" >
+          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.images')" prop="images">
+            <UploadImg style="height: 100px" v-model="formData.images" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceCode')" prop="deviceCode">
-            <el-row :gutter="10" style="width: 100%">
-              <el-col :xs="24" :sm="18" :md="16" :lg="14" :xl="12">
+            <el-row :gutter="20" style="width: 100%">
+              <el-col :xs="18" :sm="18" :md="16" :lg="14" :xl="10">
                 <el-input
                   v-model="formData.deviceCode"
                   :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceCode')"
@@ -33,70 +37,65 @@
                   />
                 </div>
               </el-col>
+
             </el-row>
           </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceName')" prop="deviceName" required>
-            <el-input v-model="formData.deviceName" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceName')" />
-          </el-form-item>
-        </el-col>
 
-        <el-col :span="24">
-          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceType')" prop="deviceType" required>
-            <el-tree-select
-              v-model="formData.deviceType"
-              :data="deviceTypeTree"
-              :props="treeSelectProps"
-              check-strictly
-              default-expand-all
-              value-key="id"
-              :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceType')"
-              class="!w-full"
-            />
-          </el-form-item>
-        </el-col>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceName')" prop="deviceName" required>
+                <el-input v-model="formData.deviceName" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceName')" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceType')" prop="deviceType" required>
+                <el-tree-select
+                  v-model="formData.deviceType"
+                  :data="deviceTypeTree"
+                  :props="treeSelectProps"
+                  check-strictly
+                  default-expand-all
+                  value-key="id"
+                  :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceType')"
+                  class="!w-full"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceSpec')" prop="deviceSpec">
+                <el-input v-model="formData.deviceSpec" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceSpec')" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="t('EquipmentManagement.EquipmentLedger.ratedCapacity')" prop="ratedCapacity">
+                <el-input-number
+                  v-model="formData.ratedCapacity"
+                  :min="0"
+                  :precision="0"
+                  controls-position="right"
+                  class="!w-full"
+                  :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderRatedCapacity')"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
 
+        </el-col>
         <!-- <el-col :span="12">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceBrand')" prop="deviceBrand">
             <el-input v-model="formData.deviceBrand" placeholder="请输入品牌" />
           </el-form-item>
         </el-col> -->
-        <el-col :span="24">
+<!--        <el-col :span="24">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceModel')" prop="deviceModel">
             <el-input v-model="formData.deviceModel" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceModel')" />
           </el-form-item>
-        </el-col>
+        </el-col>-->
 
-        <el-col :span="24">
-          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceSpec')" prop="deviceSpec">
-            <el-input v-model="formData.deviceSpec" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceSpec')" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.isSchedueld')" prop="isSchedueld">
-            <el-switch
-              v-model="formData.isSchedueld"
-              :active-value="1"
-              :inactive-value="0"
-              :active-text="t('EquipmentManagement.EquipmentLedger.yes')"
-              :inactive-text="t('EquipmentManagement.EquipmentLedger.no')"
-              inline-prompt
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.ratedCapacity')" prop="ratedCapacity">
-            <el-input-number
-              v-model="formData.ratedCapacity"
-              :min="0"
-              :precision="0"
-              controls-position="right"
-              class="!w-full"
-              :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderRatedCapacity')"
-            />
-          </el-form-item>
-        </el-col>
 
         <!-- <el-col :span="12">
           <el-form-item label="供应商" prop="supplier">
@@ -125,20 +124,31 @@
         -->
         <!-- </el-form-item>
       </el-col> -->
-
-        <el-col :span="24">
+        <el-col :span="8">
+          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.isSchedueld')" prop="isSchedueld">
+            <el-switch
+              v-model="formData.isSchedueld"
+              :active-value="1"
+              :inactive-value="0"
+              :active-text="t('EquipmentManagement.EquipmentLedger.yes')"
+              :inactive-text="t('EquipmentManagement.EquipmentLedger.no')"
+              inline-prompt
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.productionDate')" prop="productionDate" required>
             <el-date-picker v-model="formData.productionDate" type="date" value-format="YYYY-MM-DD" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderProductionDate')" class="!w-full" />
           </el-form-item>
         </el-col>
 
-        <el-col :span="24">
+        <el-col :span="8">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.factoryEntryDate')" prop="factoryEntryDate" required>
             <el-date-picker v-model="formData.factoryEntryDate" type="date" value-format="YYYY-MM-DD" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderFactoryEntryDate')" class="!w-full" />
           </el-form-item>
         </el-col>
 
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceLocation')" prop="deviceLocation">
             <el-input v-model="formData.deviceLocation" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceLocation')" />
           </el-form-item>
@@ -162,7 +172,7 @@
         <!-- </el-form-item>
       </el-col> -->
 
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceManagerName')" prop="deviceManagerIds">
             <el-select
               v-model="formData.deviceManagerIds"
diff --git a/src/views/mes/deviceledger/index.vue b/src/views/mes/deviceledger/index.vue
index d7cb023e..a49541c8 100644
--- a/src/views/mes/deviceledger/index.vue
+++ b/src/views/mes/deviceledger/index.vue
@@ -123,8 +123,8 @@
                              align="center" prop="ratedCapacity" min-width="120px"/>
             <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceSpec')"
                              align="center" prop="deviceSpec"/>
-            <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceModel')"
-                             align="center" prop="deviceModel"/>
+<!--            <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceModel')"
+                             align="center" prop="deviceModel"/>-->
             <!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceBrand')" align="center" prop="deviceBrand" /> -->
             <el-table-column
               :label="t('EquipmentManagement.EquipmentLedger.productionDate')" align="center"

From dd64b05572df82315a47ba3cd25d5d180847321f Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Wed, 8 Apr 2026 11:16:59 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/criticalComponent/index.ts        |  1 +
 src/api/mes/deviceledger/index.ts             |  1 +
 src/locales/en.ts                             |  3 +-
 src/locales/zh-CN.ts                          |  7 +--
 .../CriticalComponentForm.vue                 | 21 ++++++++-
 src/views/mes/deviceledger/index.vue          | 46 ++++++++++++++++++-
 6 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/src/api/mes/criticalComponent/index.ts b/src/api/mes/criticalComponent/index.ts
index 859192d8..e249417e 100644
--- a/src/api/mes/criticalComponent/index.ts
+++ b/src/api/mes/criticalComponent/index.ts
@@ -10,6 +10,7 @@ export interface CriticalComponentVO {
   remark?: string
   qrcodeUrl?: string
   createTime?: string
+  images?: string
 }
 
 export const CriticalComponentApi = {
diff --git a/src/api/mes/deviceledger/index.ts b/src/api/mes/deviceledger/index.ts
index 3ffcc733..6370fcf4 100644
--- a/src/api/mes/deviceledger/index.ts
+++ b/src/api/mes/deviceledger/index.ts
@@ -42,6 +42,7 @@ export interface DeviceLedgerVO {
   createTime?: string | number | Date
   updateTime?: string | number | Date
   sort: number // 排序
+  images?: string // 图片
 }
 
 // 设备类型 API
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 6e50e660..3429f5c7 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1295,7 +1295,8 @@ export default {
       qrcodeLoadError: 'Failed to load QR code',
       qrcodeEmpty: 'No QR code',
       validatorCodeRequired: 'Code can not be empty',
-      validatorNameRequired: 'Name can not be empty'
+      validatorNameRequired: 'Name can not be empty',
+      images:'images'
     },
     // Maintenance Project (Project Maintenance)
     DvSubject: {
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 87853fe5..6553f0d7 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -771,7 +771,7 @@ export default {
     save: '保存',
     detail: '详情',
     export: '导出',
-    import: '导入',
+    import: '',
     approve: '审批',
     unapprove: '反审批',
     generate: '生成',
@@ -972,7 +972,7 @@ export default {
       actions: '操作',
       password: '用户密码',
       role: '角色',
-      import: '用户导入',
+      import: '用户',
       importDragText: '将文件拖到此处，或',
       importClickText: '点击上传',
       importUpdateSupport: '是否更新已经存在的用户数据',
@@ -1291,7 +1291,8 @@ export default {
       qrcodeLoadError: '二维码加载失败',
       qrcodeEmpty: '暂无二维码',
       validatorCodeRequired: '编码不能为空',
-      validatorNameRequired: '名称不能为空'
+      validatorNameRequired: '名称不能为空',
+      images:'图片'
     },
     // 项目维护
     DvSubject: {
diff --git a/src/views/mes/criticalComponent/CriticalComponentForm.vue b/src/views/mes/criticalComponent/CriticalComponentForm.vue
index ea457acb..16d24fc8 100644
--- a/src/views/mes/criticalComponent/CriticalComponentForm.vue
+++ b/src/views/mes/criticalComponent/CriticalComponentForm.vue
@@ -52,6 +52,13 @@
           type="number"
         />
       </el-form-item>
+      <el-row :gutter="16">
+        <!-- <el-col :span="24">
+          <el-form-item label="资产编号" prop="id">
+            <el-input v-model="formData.id" placeholder="系统自动生成" disabled />
+          </el-form-item>
+        </el-col> -->
+        <el-col :span="12" >
       <el-form-item v-if="formType === 'update'" :label="t('EquipmentManagement.EquipmentKeyItems.qrcode')" prop="qrcodeUrl">
         <QrcodeActionCard
           :image-url="formData.qrcodeUrl"
@@ -68,6 +75,13 @@
           @refresh-success="handleQrcodeRefreshSuccess"
         />
       </el-form-item>
+          </el-col>
+        <el-col :span="12" >
+          <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.images')" prop="images">
+            <UploadImg style="height: 100px" v-model="formData.images" />
+          </el-form-item>
+        </el-col>
+        </el-row>
       <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.remark')" prop="remark">
         <el-input
           v-model="formData.remark"
@@ -87,6 +101,7 @@
 <script setup lang="ts">
 import { CriticalComponentApi, CriticalComponentVO } from '@/api/mes/criticalComponent'
 import QrcodeActionCard from '@/components/QrcodeActionCard/index.vue'
+import UploadImg from "@/components/UploadFile/src/UploadImg.vue";
 
 defineOptions({ name: 'CriticalComponentForm' })
 
@@ -107,7 +122,8 @@ const formData = ref<Partial<CriticalComponentVO>>({
   description: undefined,
   count: undefined,
   remark: undefined,
-  qrcodeUrl: undefined
+  qrcodeUrl: undefined,
+  images: undefined
 })
 
 const validateCode = (_rule, value, callback) => {
@@ -182,7 +198,8 @@ const open = async (type: 'create' | 'update', id?: number) => {
         description: detail?.description,
         count: detail?.count,
         remark: detail?.remark,
-        qrcodeUrl: detail?.qrcodeUrl
+        qrcodeUrl: detail?.qrcodeUrl,
+        images: detail?.images
       }
     } finally {
       formLoading.value = false
diff --git a/src/views/mes/deviceledger/index.vue b/src/views/mes/deviceledger/index.vue
index a49541c8..e1eed447 100644
--- a/src/views/mes/deviceledger/index.vue
+++ b/src/views/mes/deviceledger/index.vue
@@ -317,7 +317,7 @@
 
 
         </el-descriptions>
-            <div v-if="detailData?.qrcodeUrl" class="device-ledger-detail-qrcode">
+<!--            <div v-if="detailData?.qrcodeUrl" class="device-ledger-detail-qrcode">
               <QrcodeActionCard
                 :image-url="detailData.qrcodeUrl"
                 :print-id="detailData.id || detailData.deviceCode"
@@ -329,7 +329,29 @@
                 :error-text="t('EquipmentManagement.EquipmentLedger.qrcodeLoadError')"
                 :show-refresh="false"
               />
-            </div>
+              <UploadImg style="height: 100px" :v-model="detailData?.images" disabled="false" />
+            </div>-->
+
+        <div class="container">
+          <div v-if="detailData?.qrcodeUrl" >
+            <QrcodeActionCard
+              :image-url="detailData.qrcodeUrl"
+              :print-id="detailData.id || detailData.deviceCode"
+              :print-title="`${detailData.deviceName || '设备'}码打印预览`"
+              :print-paper-width="80"
+              :print-paper-height="80"
+              :print-max-width="220"
+              :empty-text="t('EquipmentManagement.EquipmentLedger.qrcodeLoadError')"
+              :error-text="t('EquipmentManagement.EquipmentLedger.qrcodeLoadError')"
+              :show-refresh="false"
+            />
+          </div>
+          <div v-if="detailData?.images">
+<!--            <UploadImg style="height: 100px" v-model="detailData?.images" :disabled="false" />-->
+            <img :src="detailData?.images" class="upload-image" />
+          </div>
+        </div>
+
         <el-tabs v-model="detailActiveTab" class="mt-12px">
           <el-tab-pane :label="t('EquipmentManagement.EquipmentLedger.checkHistory')" name="check">
             <div style="margin-bottom: 16px;">
@@ -1484,6 +1506,26 @@ onMounted(async () => {
 </script>
 
 <style lang="scss" scoped>
+
+.container {
+  margin-top: 10px;
+  display: flex;           /* 关键：开启弹性布局 */
+  gap: 20px;              /* 可选：两个div之间的间距 */
+}
+.left-div, .right-div {
+  //flex: 1;                /* 关键：让两个div等宽 */
+  /* 或者设置固定宽度，如 width: 300px; */
+
+  border: 1px solid #ccc;
+}
+
+.upload-image {
+  width: 150px;
+  height: 150px;
+  object-fit: contain;
+  border: 1px solid #ccc;
+}
+
 .device-ledger-layout {
   display: flex;
   gap: 12px;

From f356485d74f8f95fdabe6c26c6decaaabbf4e9ec Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Fri, 10 Apr 2026 15:15:05 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=8F=8A=E5=BC=B9=E5=87=BA=E6=A1=86Form?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/erp/product/unit/index.ts             |   5 +
 src/locales/en.ts                             |  13 +-
 src/locales/zh-CN.ts                          |  20 +-
 .../product/unit/ProductUnitImportForm.vue    | 144 ++++++++++
 src/views/erp/product/unit/index.vue          |  17 ++
 .../mes/deviceledger/DeviceLedgerForm.vue     | 147 ++++++++++-
 .../planMaintenance/PlanMaintenanceForm.vue   | 249 +++++++++++++++++-
 7 files changed, 578 insertions(+), 17 deletions(-)
 create mode 100644 src/views/erp/product/unit/ProductUnitImportForm.vue

diff --git a/src/api/erp/product/unit/index.ts b/src/api/erp/product/unit/index.ts
index 58cc54ec..5354dbd1 100644
--- a/src/api/erp/product/unit/index.ts
+++ b/src/api/erp/product/unit/index.ts
@@ -56,4 +56,9 @@ export const ProductUnitApi = {
    getProductUnitListByFlag: async () => {
       return await request.get({ url: `/erp/product-unit/flag-list`})
    },
+
+  // 下载用户导入模板
+  importUserTemplate: async () => {
+    return await request.download({ url: '/erp/product-unit/get-import-template' })
+  }
 }
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 3429f5c7..0ef43cf8 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -2117,6 +2117,7 @@ export default {
       resetButtonText: 'Reset',
       addButtonText: 'Add',
       exportButtonText: 'Export',
+      importButtonText: 'Import',
       tableNameColumn: 'Unit Name',
       tablePrimaryFlagColumn: 'Is Primary Unit',
       tableChangeRateColumn: 'Conversion Rate to Primary Unit',
@@ -2137,7 +2138,17 @@ export default {
       dialogSubmitButton: 'Confirm',
       validatorNameRequired: 'Unit name can not be empty',
       validatorStatusRequired: 'Unit status can not be empty',
-      validatorPrimaryFlagRequired: 'Primary unit flag can not be empty'
+      validatorPrimaryFlagRequired: 'Primary unit flag can not be empty',
+      import:'Import unit',
+      importDragText: 'Drag file here, or',
+      importClickText: 'click to upload',
+      importUpdateSupport: 'Update existing user data if present',
+      importFormatLimit: 'Only xls, xlsx format files are allowed.',
+      importDownloadTemplate: 'Download template',
+      importFileRequired: 'Please upload file',
+      importSuccessTip: 'Upload success: {createCount}; Update success: {updateCount}; Update failed: {failureCount};',
+      importFailed: 'Upload failed, please upload again!',
+      importFileLimit: 'Only one file can be uploaded!',
     },
     CalHoliday: {
       setWorkingDays: 'set working days',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 6553f0d7..579ed05f 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -771,7 +771,7 @@ export default {
     save: '保存',
     detail: '详情',
     export: '导出',
-    import: '',
+    import: '导入',
     approve: '审批',
     unapprove: '反审批',
     generate: '生成',
@@ -1298,8 +1298,8 @@ export default {
     DvSubject: {
       code: '编码',
       name: '名称',
-      inspectionMethod: '检验方式',
-      valueType: '值类型',
+      inspectionMethod: '作业方式',
+      valueType: '结果类型',
       judgmentCriteria: '判定基准',
       upperVal: '上限值',
       lowerVal: '下限值',
@@ -2963,7 +2963,19 @@ export default {
       dialogSubmitButton: '确 定',
       validatorNameRequired: '单位名称不能为空',
       validatorStatusRequired: '单位状态不能为空',
-      validatorPrimaryFlagRequired: '是否主单位不能为空'
+      validatorPrimaryFlagRequired: '是否主单位不能为空',
+      importButtonText:'导入',
+      import:'导入单位',
+      importDragText: '将文件拖到此处，或',
+      importClickText: '点击上传',
+      importUpdateSupport: '是否更新已经存在的用户数据',
+      importFormatLimit: '仅允许导入 xls、xlsx 格式文件。',
+      importDownloadTemplate: '下载模板',
+      importFileRequired: '请上传文件',
+      importSuccessTip:
+        '上传成功数量：{createCount}；更新成功数量：{updateCount}；更新失败数量：{failureCount}；',
+      importFailed: '上传失败，请您重新上传！',
+      importFileLimit: '最多只能上传一个文件！',
     },
     //假日管理
     CalHoliday: {
diff --git a/src/views/erp/product/unit/ProductUnitImportForm.vue b/src/views/erp/product/unit/ProductUnitImportForm.vue
new file mode 100644
index 00000000..55d3e426
--- /dev/null
+++ b/src/views/erp/product/unit/ProductUnitImportForm.vue
@@ -0,0 +1,144 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="t('FactoryModeling.ProductUnit.import')" width="400">
+    <el-upload
+      ref="uploadRef"
+      v-model:file-list="fileList"
+      :action="importUrl + '?updateSupport=' + updateSupport"
+      :auto-upload="false"
+      :disabled="formLoading"
+      :headers="uploadHeaders"
+      :limit="1"
+      :on-error="submitFormError"
+      :on-exceed="handleExceed"
+      :on-success="submitFormSuccess"
+      accept=".xlsx, .xls"
+      drag
+    >
+      <Icon icon="ep:upload" />
+      <div class="el-upload__text">
+        {{ t('FactoryModeling.ProductUnit.importDragText') }}<em>{{ t('FactoryModeling.ProductUnit.importClickText') }}</em>
+      </div>
+      <template #tip>
+        <div class="el-upload__tip text-center">
+<!--          <div class="el-upload__tip">
+            <el-checkbox v-model="updateSupport" />
+            {{ t('FactoryModeling.ProductUnit.importUpdateSupport') }}
+          </div>-->
+          <span>{{ t('FactoryModeling.ProductUnit.importFormatLimit') }}</span>
+          <el-link
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            type="primary"
+            @click="importTemplate"
+          >
+            {{ t('FactoryModeling.ProductUnit.importDownloadTemplate') }}
+          </el-link>
+        </div>
+      </template>
+    </el-upload>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">{{ t('common.ok') }}</el-button>
+      <el-button @click="dialogVisible = false">{{ t('common.cancel') }}</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as UserApi from '@/api/system/user'
+import { getAccessToken, getTenantId } from '@/utils/auth'
+import download from '@/utils/download'
+import {ProductUnitApi} from "@/api/erp/product/unit";
+
+defineOptions({ name: 'ProductUnitImportForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const uploadRef = ref()
+const importUrl =
+  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/erp/product-unit/import'
+const uploadHeaders = ref() // 上传 Header 头
+const fileList = ref([]) // 文件列表
+const updateSupport = ref(0) // 是否更新已经存在的用户数据
+
+/** 打开弹窗 */
+const open = () => {
+  dialogVisible.value = true
+  updateSupport.value = 0
+  fileList.value = []
+  resetForm()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  if (fileList.value.length == 0) {
+    message.error(t('FactoryModeling.ProductUnit.importFileRequired'))
+    return
+  }
+  // 提交请求
+  uploadHeaders.value = {
+    Authorization: 'Bearer ' + getAccessToken(),
+    'tenantId': getTenantId()
+  }
+  formLoading.value = true
+  uploadRef.value!.submit()
+}
+
+/** 文件上传成功 */
+const emits = defineEmits(['success'])
+const submitFormSuccess = (response: any) => {
+  if (response.code !== 0) {
+    message.error(response.msg)
+    formLoading.value = false
+    return
+  }
+/*  // 拼接提示语
+  const data = response.data
+  let text = t('FactoryModeling.ProductUnit.importSuccessTip', {
+    createCount: data.createUsernames.length,
+    updateCount: data.updateUsernames.length,
+    failureCount: Object.keys(data.failureUsernames).length
+  })
+  for (let username of data.createUsernames) {
+    text += '< ' + username + ' >'
+  }
+  for (const username of data.updateUsernames) {
+    text += '< ' + username + ' >'
+  }
+  for (const username in data.failureUsernames) {
+    text += '< ' + username + ': ' + data.failureUsernames[username] + ' >'
+  }*/
+  message.alert(response.data)
+  formLoading.value = false
+  dialogVisible.value = false
+  // 发送操作成功的事件
+  emits('success')
+}
+
+/** 上传错误提示 */
+const submitFormError = (): void => {
+  message.error(t('FactoryModeling.ProductUnit.importFailed'))
+  formLoading.value = false
+}
+
+/** 重置表单 */
+const resetForm = async (): Promise<void> => {
+  // 重置上传状态和文件
+  formLoading.value = false
+  await nextTick()
+  uploadRef.value?.clearFiles()
+}
+
+/** 文件数超出提示 */
+const handleExceed = (): void => {
+  message.error(t('FactoryModeling.ProductUnit.importFileLimit'))
+}
+
+/** 下载模板操作 */
+const importTemplate = async () => {
+  const res = await ProductUnitApi.importUserTemplate()
+  download.excel(res, '单位导入模版.xls')
+}
+</script>
diff --git a/src/views/erp/product/unit/index.vue b/src/views/erp/product/unit/index.vue
index d4080f5b..62fdc3b5 100644
--- a/src/views/erp/product/unit/index.vue
+++ b/src/views/erp/product/unit/index.vue
@@ -50,6 +50,14 @@
           <Icon icon="ep:plus" class="mr-5px" />
           {{ t('FactoryModeling.ProductUnit.addButtonText') }}
         </el-button>
+        <el-button
+          type="warning"
+          plain
+          @click="handleImport"
+          v-hasPermi="['system:user:import']"
+        >
+          <Icon icon="ep:upload" /> {{ t('FactoryModeling.ProductUnit.importButtonText') }}
+        </el-button>
         <el-button
           type="success"
           plain
@@ -129,6 +137,9 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <ProductUnitForm ref="formRef" @success="getList" />
+
+  <!-- 单位导入对话框 -->
+  <ProductUnitImportForm ref="importFormRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
@@ -199,6 +210,12 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
 /** 导出按钮操作 */
 const handleExport = async () => {
   try {
diff --git a/src/views/mes/deviceledger/DeviceLedgerForm.vue b/src/views/mes/deviceledger/DeviceLedgerForm.vue
index 8e956b6f..8d7f6672 100644
--- a/src/views/mes/deviceledger/DeviceLedgerForm.vue
+++ b/src/views/mes/deviceledger/DeviceLedgerForm.vue
@@ -310,7 +310,7 @@
       <el-table
         ref="multipleTableRef"
         v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
-        @selection-change="handleSelectionChange" row-key="id">
+        @selection-change="handleSelectionChange" @select="handleSelect"  @select-all="handleSelectAll" row-key="id">
         <el-table-column type="selection" width="55"  :reserve-selection="true" />
         <el-table-column
           :label="t('EquipmentManagement.EquipmentKeyItems.code')" align="center" prop="code"
@@ -382,7 +382,8 @@
           </el-form-item>
         </el-form>
         <ContentWrap>
-          <el-table ref="bjMultipleTableRef" v-loading="loading" :data="bjList" :stripe="true" @selection-change="bjHandleSelectionChange" :show-overflow-tooltip="true" row-key="id">
+          <el-table ref="bjMultipleTableRef" v-loading="loading" :data="bjList" :stripe="true" @selection-change="bjHandleSelectionChange"
+                    @select="bjHandleSelect"  @select-all="bjHandleSelectAll"  :show-overflow-tooltip="true" row-key="id">
             <el-table-column type="selection" width="55"  :reserve-selection="true" />
             <el-table-column :label="t('SparePartsManagement.SpareInfo.code')" align="center" prop="barCode" width="240px"   sortable />
             <el-table-column :label="t('SparePartsManagement.SpareInfo.name')" align="left" prop="name"  width="220px" sortable />
@@ -636,25 +637,32 @@ const clearBeijian = () => {
 const openCriticalComponentDialog = () => {
   criticalComponentDraft.value = [...(formData.value.componentIds ?? [])]
   criticalComponentDialogVisible.value = true
+  ids.value =formData.value.componentIds
+  setDefaultSelections()
 }
 const openBeijianDialog = () => {
   beijianDraft.value = [...(formData.value.beijianIds ?? [])]
   beijianDialogVisible.value = true
+  bjIds.value =formData.value.beijianIds
+  setBJDefaultSelections()
 }
-
+const ids = ref([])
 const confirmCriticalComponentDialog = () => {
-  let ids = selectedRows.value.map(item => item.id);
+  //let ids = selectedRows.value.map(item => item.id);
   //const validMap = new Set(criticalComponentOptions.value.map((item) => item.value))
   //const selected = Array.from(new Set(criticalComponentDraft.value.map((v) => Number(v)).filter((v) => validMap.has(v))))
-  formData.value.componentIds = ids
+  formData.value.componentIds = ids.value
   criticalComponentDialogVisible.value = false
+  //multipleTableRef.value.clearSelection()
 }
+const bjIds = ref([])
 const confirmBeijianDialog = () => {
-  let ids = bjSelectedRows.value.map(item => item.id);
+ // let ids = bjSelectedRows.value.map(item => item.id);
  /* const validMap = new Set(beijianOptions.value.map((item) => item.value))
   const selected = Array.from(new Set(beijianDraft.value.map((v) => Number(v)).filter((v) => validMap.has(v))))*/
-  formData.value.beijianIds = ids
+  formData.value.beijianIds = bjIds.value
   beijianDialogVisible.value = false
+  //multipleTableRef.value.clearSelection()
 }
 
 const handleCodeAutoChange = (value: boolean) => {
@@ -798,6 +806,33 @@ const handleSelectionChange = (rows: CriticalComponentVO[]) => {
   selectedRows.value.push(...rows)
 }
 
+// 存储当前已选中的行
+const currentSelectedRows = ref([])
+
+// select 事件：row 是当前操作的行，selected 是操作后的状态
+const handleSelect = (selection, row) => {
+  // 判断是选中还是取消选中
+  const isSelected = selection.includes(row)
+  if (isSelected) {
+    // console.log(`✅ 行被选中: ID=${row.id}, Name=${row.name}`)
+    ids.value.push(row.id)
+  } else {
+
+    ids.value= ids.value.filter(
+      item => item !== row.id
+    )
+    // console.log(`❌ 行被取消选中: ID=${row.id}, Name=${row.name}`)
+  }
+  // 更新当前选中状态
+  currentSelectedRows.value = selection
+}
+
+
+const handleSelectAll = (selection) => {
+  ids.value = selection?.map((row) => row.id).filter((id) => id !== undefined) ?? []
+}
+
+
 const bjHandleSelectionChange = (rows: CriticalComponentVO[]) => {
   bjSelectedIds.value = rows.map((r) => r.id).filter((id): id is number => typeof id === 'number')
   // 获取当前页所有行的 id
@@ -811,6 +846,31 @@ const bjHandleSelectionChange = (rows: CriticalComponentVO[]) => {
   bjSelectedRows.value.push(...rows)
 }
 
+// 存储当前已选中的行
+const bjCurrentSelectedRows = ref([])
+
+// select 事件：row 是当前操作的行，selected 是操作后的状态
+const bjHandleSelect = (selection, row) => {
+  // 判断是选中还是取消选中
+  const isSelected = selection.includes(row)
+  if (isSelected) {
+    // console.log(`✅ 行被选中: ID=${row.id}, Name=${row.name}`)
+    bjIds.value.push(row.id)
+  } else {
+    bjIds.value= bjIds.value.filter(
+      item => item !== row.id
+    )
+    // console.log(`❌ 行被取消选中: ID=${row.id}, Name=${row.name}`)
+  }
+  // 更新当前选中状态
+  bjCurrentSelectedRows.value = selection
+}
+
+
+const bjHandleSelectAll = (selection) => {
+  bjIds.value = selection?.map((row) => row.id).filter((id) => id !== undefined) ?? []
+}
+
 const getList = async () => {
   loading.value = true
   try {
@@ -921,6 +981,79 @@ const submitForm = async () => {
   }
 }
 
+// 方法1：直接监听 data
+watch(list, (newData, oldData) => {
+  // 可以在这里执行相关操作
+  if (newData.length > 0) {
+    // 数据加载完成后的操作
+    setDefaultSelections()
+  }
+}, { deep: true })
+
+
+//const defaultSelectedIds = [144, 143,141]
+
+// 设置默认选中的行
+const setDefaultSelections = () => {
+  // 等待DOM更新完成
+  nextTick(() => {
+    if (!multipleTableRef.value) return
+    multipleTableRef.value.clearSelection()
+    const rawSubjectIds = toRaw(formData.value.componentIds)
+    if(rawSubjectIds.length != 0){
+      let row={
+        id: undefined
+      }
+      multipleTableRef.value.toggleRowSelection(row, true)
+    }
+    // 遍历数据，找到需要选中的行
+    list.value.forEach(row => {
+      let id = row.id;
+      if (rawSubjectIds.includes(row.id)) {
+        multipleTableRef.value.toggleRowSelection(row, true)
+      }
+    })
+  })
+}
+
+// 方法1：直接监听 data
+watch(bjList, (newData, oldData) => {
+  // 可以在这里执行相关操作
+  if (newData.length > 0) {
+    // 数据加载完成后的操作
+    setBJDefaultSelections()
+  }
+}, { deep: true })
+
+
+//const defaultSelectedIds = [144, 143,141]
+
+// 设置默认选中的行
+const setBJDefaultSelections = () => {
+  // 等待DOM更新完成
+  nextTick(() => {
+    if (!bjMultipleTableRef.value) return
+    bjMultipleTableRef.value.clearSelection()
+    const rawSubjectIds = toRaw(formData.value.beijianIds)
+    if(rawSubjectIds.length != 0){
+      let row={
+        id: undefined
+      }
+      bjMultipleTableRef.value.toggleRowSelection(row, true)
+    }
+    // 遍历数据，找到需要选中的行
+    bjList.value.forEach(row => {
+      let id = row.id;
+      if (rawSubjectIds.includes(row.id)) {
+        bjMultipleTableRef.value.toggleRowSelection(row, true)
+      }
+    })
+  })
+}
+
+
+
+
 /** 重置表单 */
 const resetForm = () => {
   formData.value = initFormData()
diff --git a/src/views/mes/planMaintenance/PlanMaintenanceForm.vue b/src/views/mes/planMaintenance/PlanMaintenanceForm.vue
index 278d2548..fe3de242 100644
--- a/src/views/mes/planMaintenance/PlanMaintenanceForm.vue
+++ b/src/views/mes/planMaintenance/PlanMaintenanceForm.vue
@@ -28,7 +28,7 @@
       </el-form-item>
 
       <el-form-item :label="t('EquipmentManagement.PlanMaintenance.subjectName')" prop="subjectIds">
-        <el-select
+<!--        <el-select
           v-model="formData.subjectIds"
           multiple
           filterable
@@ -37,7 +37,17 @@
           class="!w-full"
         >
           <el-option v-for="item in subjectOptions" :key="item.id" :label="item.subjectName" :value="item.id" />
-        </el-select>
+        </el-select>-->
+        <el-input
+          :model-value="subjectNameDisplay"
+          readonly
+          clearable
+          class="device-ledger-selection-input"
+          :placeholder="t('EquipmentManagement.PlanMaintenance.placeholderSubjectSelect')"
+          @clear="clearSubjectComponent"
+          @click="openSubjectComponentDialog"
+        />
+
       </el-form-item>
     </el-form>
 
@@ -46,12 +56,64 @@
       <el-button @click="dialogVisible = false">{{ t('common.cancel') }}</el-button>
     </template>
   </Dialog>
+<!--点检名称-->
+  <el-dialog
+    v-model="subjectComponentDialogVisible"
+    title="选择点检项"
+    width="1200px"
+    class="device-ledger-transfer-dialog"
+    append-to-body
+  >
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" min-label-width="68px" style="margin-bottom: 10px">
+      <el-form-item :label="t('EquipmentManagement.DvSubject.code')" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode" :placeholder="t('EquipmentManagement.DvSubject.placeholderCode')"
+          clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item :label="t('EquipmentManagement.DvSubject.name')" prop="subjectName">
+        <el-input
+          v-model="queryParams.subjectName" :placeholder="t('EquipmentManagement.DvSubject.placeholderName')"
+          clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" />
+          {{ t('common.query') }}
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" />
+          {{ t('common.reset') }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <ContentWrap>
+      <el-table
+        ref="multipleTableRef"
+        v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
+        @selection-change="handleSelectionChange" @select="handleSelect"  @select-all="handleSelectAll"   row-key="id">
+        <el-table-column type="selection" width="55"  :reserve-selection="true" />
+        <el-table-column :label="t('EquipmentManagement.DvSubject.code')" align="center" prop="subjectCode"  sortable />
+        <el-table-column :label="t('EquipmentManagement.DvSubject.name')" align="center" prop="subjectName"  sortable />
+        <el-table-column :label="t('EquipmentManagement.DvSubject.judgmentCriteria')" align="center" width="480px" prop="judgmentCriteria" />
+      </el-table>
+      <Pagination
+        :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+        @pagination="getList" />
+
+    </ContentWrap>
+    <template #footer>
+      <el-button @click="subjectComponentDialogVisible = false">{{ t('common.cancel') }}</el-button>
+      <el-button type="primary" @click="confirmSubjectComponentDialog">{{ t('common.ok') }}</el-button>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
 import type { FormRules } from 'element-plus'
 import { DvSubjectApi, DvSubjectVO } from '@/api/mes/dvsubject'
 import { PlanMaintenanceApi, PlanMaintenanceVO } from '@/api/mes/planmaintenance'
+import {ref} from "vue";
+import {ElTable} from "element-plus";
 
 defineOptions({ name: 'PlanMaintenanceForm' })
 
@@ -62,13 +124,44 @@ const dialogVisible = ref(false)
 const dialogTitle = ref('')
 const formLoading = ref(false)
 const formType = ref<'create' | 'update'>('create')
+const queryFormRef = ref() // 搜索的表单
+const subjectComponentDialogVisible = ref(false)
+const loading = ref(true) // 列表的加载中
+const list = ref<DvSubjectVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const tableRef = ref()
+const selectedIds = ref<number[]>([])
+const selectedRows = ref<any[]>([])  // 存储所有选中的行
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  subjectCode: undefined as string | undefined,
+  subjectName: undefined as string | undefined,
+})
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const beijianOptions = ref<{ label: string; value: number }[]>([])
+
+const formatSelectedSummary = (ids: number[], options: { label: string; value: number }[]) => {
+  const optionMap = new Map<number, string>(options.map((item) => [item.value, item.label]))
+  const labels = ids.map((id) => optionMap.get(id)).filter((v): v is string => Boolean(v))
+  if (!labels.length) return ''
+  if (labels.length <= 3) return labels.join('、')
+  return `${labels.slice(0, 3).join('、')}…等${labels.length}条`
+}
+
+const subjectNameDisplay = computed(() =>
+  formatSelectedSummary(formData.value.subjectIds ?? [], beijianOptions.value)
+)
 
 const subjectOptions = ref<DvSubjectVO[]>([])
 const ensureSubjectOptionsLoaded = async () => {
-  if (subjectOptions.value.length) return
   const res = await DvSubjectApi.getDvSubjectList()
-  console.log(res)
-  subjectOptions.value = (res ?? []) as DvSubjectVO[]
+  beijianOptions.value = (res ?? []).map((item: any) => {
+    const code = item.subjectCode ? String(item.subjectCode) : ''
+    const name = item.subjectName ? String(item.subjectName) : ''
+    const label = code && name ? `${code}-${name}` : name || code || String(item.id)
+    return { label, value: Number(item.id) }
+  })
 }
 
 const parseIds = (value: any): Array<number | string> => {
@@ -128,6 +221,7 @@ const open = async (type: 'create' | 'update', row?: Partial<PlanMaintenanceVO>)
       subjectIds: parseIds((row as any).subjectIds ?? (row as any).subjectIdS)
     }
   }
+  getList()
 }
 
 defineExpose({ open })
@@ -162,4 +256,149 @@ const resetForm = () => {
   formData.value = initFormData()
   formRef.value?.resetFields()
 }
+
+const clearSubjectComponent = () => {
+  formData.value.subjectIds = []
+}
+const ids = ref([])
+const openSubjectComponentDialog = () => {
+  if (formType.value === 'create') {
+    selectedIds.value = []
+    selectedRows.value =[]
+    //formData.value.subjectIds = []
+   // multipleTableRef.value.clearSelection()
+  }else{
+    selectedIds.value = []
+    selectedRows.value =[]
+    //formData.value.subjectIds = []
+   // multipleTableRef.value.clearSelection()
+  }
+  // criticalComponentDraft.value = [...(formData.value.componentIds ?? [])]
+  subjectComponentDialogVisible.value = true
+  ids.value =formData.value.subjectIds
+  setDefaultSelections()
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+const handleSelectionChange = (rows: any[]) => {
+  selectedIds.value = rows?.map((row) => row.id).filter((id) => id !== undefined) ?? []
+  // 获取当前页所有行的 id
+  const currentPageIds = rows.map(item => item.id)
+
+  // 从已选中的数组中移除当前页的数据
+  selectedRows.value = selectedRows.value.filter(
+    item => item.id !== undefined
+  )
+  selectedRows.value = selectedRows.value.filter(
+    item => !currentPageIds.includes(item.id)
+  )
+  // 添加当前页新选中的数据
+  selectedRows.value.push(...rows)
+}
+
+// 存储当前已选中的行
+const currentSelectedRows = ref([])
+
+// select 事件：row 是当前操作的行，selected 是操作后的状态
+const handleSelect = (selection, row) => {
+  // 判断是选中还是取消选中
+  const isSelected = selection.includes(row)
+  if (isSelected) {
+   // console.log(`✅ 行被选中: ID=${row.id}, Name=${row.name}`)
+    ids.value.push(row.id)
+  } else {
+
+    ids.value= ids.value.filter(
+      item => item !== row.id
+    )
+   // console.log(`❌ 行被取消选中: ID=${row.id}, Name=${row.name}`)
+  }
+  // 更新当前选中状态
+  currentSelectedRows.value = selection
+}
+
+
+const handleSelectAll = (selection) => {
+  ids.value = selection?.map((row) => row.id).filter((id) => id !== undefined) ?? []
+}
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await DvSubjectApi.getDvSubjectPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const confirmSubjectComponentDialog = () => {
+  //let ids = selectedRows.value.map(item => item.id);
+  //const validMap = new Set(criticalComponentOptions.value.map((item) => item.value))
+  //const selected = Array.from(new Set(criticalComponentDraft.value.map((v) => Number(v)).filter((v) => validMap.has(v))))
+  formData.value.subjectIds = ids.value
+  subjectComponentDialogVisible.value = false
+  multipleTableRef.value.clearSelection()
+}
+const cancelHandle = () => {
+  multipleTableRef.value.clearSelection()
+
+}
+
+// 方法1：直接监听 data
+watch(list, (newData, oldData) => {
+  // 可以在这里执行相关操作
+  if (newData.length > 0) {
+    // 数据加载完成后的操作
+    setDefaultSelections()
+  }
+}, { deep: true })
+
+
+//const defaultSelectedIds = [144, 143,141]
+
+// 设置默认选中的行
+const setDefaultSelections = () => {
+  // 等待DOM更新完成
+  nextTick(() => {
+    if (!multipleTableRef.value) return
+    multipleTableRef.value.clearSelection()
+    const rawSubjectIds = toRaw(formData.value.subjectIds)
+    if(rawSubjectIds.length != 0){
+      let row={
+        id: undefined
+      }
+      multipleTableRef.value.toggleRowSelection(row, true)
+    }
+    // 遍历数据，找到需要选中的行
+    list.value.forEach(row => {
+      let id = row.id;
+      if (rawSubjectIds.includes(row.id)) {
+        multipleTableRef.value.toggleRowSelection(row, true)
+      }
+    })
+  })
+}
+
+
 </script>
+<style lang="scss" scoped>
+
+:deep(.device-ledger-transfer-dialog){
+  height: 200px;
+}
+
+</style>

From 53267baa929fef261e62c37f25e47cccc5d0b89b Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Fri, 10 Apr 2026 15:22:22 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/criticalComponent/CriticalComponentForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/mes/criticalComponent/CriticalComponentForm.vue b/src/views/mes/criticalComponent/CriticalComponentForm.vue
index 16d24fc8..5b1dc87c 100644
--- a/src/views/mes/criticalComponent/CriticalComponentForm.vue
+++ b/src/views/mes/criticalComponent/CriticalComponentForm.vue
@@ -59,7 +59,7 @@
           </el-form-item>
         </el-col> -->
         <el-col :span="12" >
-      <el-form-item v-if="formType === 'update'" :label="t('EquipmentManagement.EquipmentKeyItems.qrcode')" prop="qrcodeUrl">
+      <el-form-item  :label="t('EquipmentManagement.EquipmentKeyItems.qrcode')" prop="qrcodeUrl">
         <QrcodeActionCard
           :image-url="formData.qrcodeUrl"
           :print-id="formData.id"