装备配置率配置

src/views/EquipmentLedger/details.vue

@@ -366,14 +366,12 @@ export default {
           //3.装备小类，，6.生产厂家，7.出厂日期，8.特征属性
 // 单行写法（用\n）
           this.dialogRow =
-            `装备名称:${row.name}\r\n` +
-            `装备编码:${row.code}\r\n` +
-            `规格型号:${row.specificationModel}\r\n` +
-            `产权单位:${row.propertyUnit}\r\n` +
-            `装备小类:${row.subCategory}\r\n` +
-            `生产厂家:${row.manufacturer}\r\n` +
-            `出厂日期:${row.productionDate}\r\n` +
-            `特征属性:{${property}}`
+            `${row.name}\r\n` +
+            `${row.code}\r\n` +
+            `${row.specificationModel}\r\n` +
+            `${row.propertyUnit}\r\n` +
+            `${row.manufacturer}\r\n` +
+            `${row.productionDate}\r\n`
           this.$nextTick(() => {
             this.$refs.qr3?.refreshQrcode()
           })

src/views/system/equipment/index.vue

@@ -380,33 +380,29 @@
           <el-form :inline="true" :model="searchForm.own" class="demo-form-inline">
             <el-form-item label="装备名称">
               <el-input
-                v-model="searchForm.own.equipmentName"
+                v-model="searchForm.own.name"
                 placeholder="请输入装备名称"
                 clearable
-                size="small"
               />
             </el-form-item>
             <el-form-item label="装备类型">
-              <el-select
-                v-model="searchForm.own.equipmentType"
-                placeholder="请选择装备类型"
-                clearable
-                size="small"
+              <el-select v-model="searchForm.own.type" placeholder="请选择分类"
+                         style="width: 100%;"
+                         clearable filterable @change="handleCategoryChange"
               >
                 <el-option
-                  v-for="item in equipmentTypeOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  v-for="item in categoryList"
+                  :key="item.uniqueKey"
+                  :label="`${item.equipmentName}(${item.devType})`"
+                  :value="item.equipmentName"
                 />
               </el-select>
             </el-form-item>
             <el-form-item label="规格型号">
               <el-input
-                v-model="searchForm.own.specModel"
+                v-model="searchForm.own.specificationModel"
                 placeholder="请输入规格型号"
                 clearable
-                size="small"
               />
             </el-form-item>
             <el-form-item>
@@ -904,9 +900,9 @@ export default {
       // 新增：筛选表单数据
       searchForm: {
         own: {
-          equipmentName: '',
-          equipmentType: '',
-          specModel: ''
+          name: '',
+          type: '',
+          specificationModel: ''
         },
         sharing: {
           equipmentName: '',
@@ -1387,15 +1383,16 @@ export default {
     async handleInstanceTableOwn() {
       // 重置筛选条件和选中状态
       this.searchForm.own = {
-        equipmentName: '',
-        equipmentType: '',
-        specModel: ''
+        name: '',
+        type: '',
+        specificationModel: ''
       }
       this.selectedOwnRows = []
       // 初始化分页
       this.tableData.own.pageNum = 1
       // 加载数据并打开弹窗
       await this.loadOwnEquipmentData()
+      await this.getCategoryList()
       this.ownOpen = true
     },
     async loadOwnEquipmentData() {
@@ -1427,9 +1424,9 @@ export default {
     },
     resetOwnSearch() {
       this.searchForm.own = {
-        equipmentName: '',
-        equipmentType: '',
-        specModel: ''
+        name: '',
+        type: '',
+        specificationModel: ''
       }
       this.tableData.own.pageNum = 1
       this.loadOwnEquipmentData()