装备配置率配置

src/views/EquipmentLedger/details.vue

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

src/views/stockManagement/entryApply/components/AddEquip.vue

@@ -737,7 +737,6 @@
       })
     },
 
-
     parseSelectOptions(value) {
       if (!value) return []
       // 1️⃣ 统一中文、英文逗号
@@ -783,7 +782,7 @@
       await this.getDeptTreeSelect()
       if (type === 'edit') {
         this.pageTitle = '编辑装备'
-          this.isEdit = true
+        this.isEdit = false
         this.maId = id
         this.getInfo()
       } else {
@@ -811,14 +810,14 @@
 
             // 遍历 fieldVoList，把值回显到 form
             this.config.forEach(item => {
-                if (!item.propertyCode) return; // 避免空字段
+              if (!item.propertyCode) return // 避免空字段
               if (item.inputType == 'SELECT' && item.value) {
                 // 下拉多选值可能是逗号分隔
-                  this.$set(this.form, item.propertyCode, item.propertyValue ? item.propertyValue.split(',') : []);
+                this.$set(this.form, item.propertyCode, item.propertyValue ? item.propertyValue.split(',') : [])
               } else {
-                  this.$set(this.form, item.propertyCode, item.propertyValue ?? '');
+                this.$set(this.form, item.propertyCode, item.propertyValue ?? '')
               }
-              });
+            })
           }
 
           const propertyList = row.propertyVoList || []
@@ -831,14 +830,12 @@
             .join(',')
           //3.装备小类，，6.生产厂家，7.出厂日期，8.特征属性
           this.dialogRow =
-              `装备名称:${row.name}\r\n` +
+            `${row.name}\r\n` +
-              `装备编码:${row.code}\r\n` +
+            `${row.code}\r\n` +
-              `规格型号:${row.specificationModel}\r\n` +
+            `${row.specificationModel}\r\n` +
-              `产权单位:${row.propertyUnit}\r\n` +
+            `${row.propertyUnit}\r\n` +
-              `装备小类:${row.subCategory}\r\n` +
+            `${row.manufacturer}\r\n` +
-              `生产厂家:${row.manufacturer}\r\n` +
+            `${row.productionDate}\r\n`
-              `出厂日期:${row.productionDate}\r\n` +
-              `特征属性:{${property}}`
 
           this.$nextTick(() => {
             this.$refs.qr3?.refreshQrcode()
@@ -1036,7 +1033,7 @@
           this.isSubmit = true
           const loading = this.$loading()
           try {
-              var fieldVoList = [];
+            var fieldVoList = []
             // 遍历手动新增字段
             if (this.config && this.config.length > 0) {
               this.config.forEach(item => {
@@ -1047,9 +1044,6 @@
               })
             }
 
-
-
-
             if (!this.form.orderId && !this.isEdit) {
               const result = await getEquipmentAddIdApi()
               this.orderId = result.data.id

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
+              <el-select v-model="searchForm.own.type" placeholder="请选择分类"
-                v-model="searchForm.own.equipmentType"
+                         style="width: 100%;"
-                placeholder="请选择装备类型"
+                         clearable filterable @change="handleCategoryChange"
-                clearable
-                size="small"
               >
                 <el-option
-                  v-for="item in equipmentTypeOptions"
+                  v-for="item in categoryList"
-                  :key="item.value"
+                  :key="item.uniqueKey"
-                  :label="item.label"
+                  :label="`${item.equipmentName}(${item.devType})`"
-                  :value="item.value"
+                  :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: '',
+          name: '',
-          equipmentType: '',
+          type: '',
-          specModel: ''
+          specificationModel: ''
         },
         sharing: {
           equipmentName: '',
@@ -1387,15 +1383,16 @@ export default {
     async handleInstanceTableOwn() {
       // 重置筛选条件和选中状态
       this.searchForm.own = {
-        equipmentName: '',
+        name: '',
-        equipmentType: '',
+        type: '',
-        specModel: ''
+        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: '',
+        name: '',
-        equipmentType: '',
+        type: '',
-        specModel: ''
+        specificationModel: ''
       }
       this.tableData.own.pageNum = 1
       this.loadOwnEquipmentData()