From d10a41ef8c2a031bd83989d76a191e151db29fc1 Mon Sep 17 00:00:00 2001
From: jiang <BnsGit@123!>
Date: Tue, 27 Jan 2026 17:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E9=85=8D=E7=BD=AE=E7=8E=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/EquipmentLedger/details.vue         |   14 +-
 .../entryApply/components/AddEquip.vue        | 2450 ++++++++---------
 src/views/system/equipment/index.vue          |   41 +-
 3 files changed, 1247 insertions(+), 1258 deletions(-)

diff --git a/src/views/EquipmentLedger/details.vue b/src/views/EquipmentLedger/details.vue
index 95a6b7ba..704b7e34 100644
--- a/src/views/EquipmentLedger/details.vue
+++ b/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()
           })
diff --git a/src/views/stockManagement/entryApply/components/AddEquip.vue b/src/views/stockManagement/entryApply/components/AddEquip.vue
index eb3e6400..1fba9ff1 100644
--- a/src/views/stockManagement/entryApply/components/AddEquip.vue
+++ b/src/views/stockManagement/entryApply/components/AddEquip.vue
@@ -1,976 +1,984 @@
-  <template>
-    <!-- 弹窗内容区域 -->
-    <el-dialog
-      :title="pageTitle"
-      :visible.sync="dialogVisible"
-      width="90%"
-      :destroy-on-close="true"
-      :close-on-click-modal="false"
-      class="dialog-box"
-    >
-      <div class="dialog-content">
-        <div class="page-header">
-          <!-- <div> -->
-          <!-- <i
-            class="el-icon-arrow-left goBack-btn"
-            @click="goBack"
-            style="
-              border-color: transparent;
-              color: #00a288;
-              background: transparent;
-              padding-left: 0;
-              padding-right: 0;
-            "
-            >返回</i
-          >
-          <span class="page-title">{{ pageTitle }}</span> -->
-          <!-- </div> -->
-          <!--  <div class="dialog-footer" style="float: right"> -->
-          <!-- <el-button size="medium" @click="close">取消</el-button> -->
-          <!-- <el-button type="primary" size="medium" @click="handleSubmit">确认</el-button>
-        </div> -->
-        </div>
-
-        <el-form
-          label-width="120px"
-          ref="formRef"
-          style="padding: 12px; overflow-y: auto; height: calc(100vh - 180px); width: 100%"
-          :model="form"
-          :rules="equipRules"
+<template>
+  <!-- 弹窗内容区域 -->
+  <el-dialog
+    :title="pageTitle"
+    :visible.sync="dialogVisible"
+    width="90%"
+    :destroy-on-close="true"
+    :close-on-click-modal="false"
+    class="dialog-box"
+  >
+    <div class="dialog-content">
+      <div class="page-header">
+        <!-- <div> -->
+        <!-- <i
+          class="el-icon-arrow-left goBack-btn"
+          @click="goBack"
+          style="
+            border-color: transparent;
+            color: #00a288;
+            background: transparent;
+            padding-left: 0;
+            padding-right: 0;
+          "
+          >返回</i
         >
-          <div style="display: flex; padding-bottom: 5px">
-            <div style="width: 5px; background-color: #34E2C7; margin-right: 10px"></div>
-            基础信息
-          </div>
-          <el-row :gutter="24" style="padding-top: 10px">
-            <el-col :span="6">
-              <el-form-item label="专业" prop="major">
-                <el-select
-                  v-model="form.major"
-                  placeholder="请选择专业"
-                  @change="majorChange"
-                  :disabled="isEdit"
-                  style="width: 100%"
-                >
-                  <el-option v-for="item in majorList" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="工序" prop="process">
-                <el-cascader
-                  style="width: 100%"
-                  v-model="form.process"
-                  placeholder="请选择工序"
-                  clearable
-                  filterable
-                  :options="processList"
-                  :disabled="isEdit"
-                  @change="processChange"
-                ></el-cascader>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="装备类目" prop="category">
-                <el-cascader
-                  style="width: 100%"
-                  v-model="form.category"
-                  :options="categoryList"
-                  :disabled="isEdit"
-                  clearable
-                  filterable
-                  placeholder="请选择装备类目"
-                  @change="categoryChange"
-                ></el-cascader>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="装备名称" prop="name">
-                <el-input
-                  autocomplete="off"
-                  maxlength="30"
-                  placeholder="请输入装备名称"
-                  v-model="form.name"
-                  clearable
-                  :disabled="isEdit"
-                />
-                <!-- <div class="select-box">
-                  <div class="no-data">暂无数据</div>
-                </div> -->
-              </el-form-item>
-            </el-col>
+        <span class="page-title">{{ pageTitle }}</span> -->
+        <!-- </div> -->
+        <!--  <div class="dialog-footer" style="float: right"> -->
+        <!-- <el-button size="medium" @click="close">取消</el-button> -->
+        <!-- <el-button type="primary" size="medium" @click="handleSubmit">确认</el-button>
+      </div> -->
+      </div>
 
-            <el-col :span="6">
-              <el-form-item label="规格型号" prop="specificationModel">
-                <el-input
-                  autocomplete="off"
-                  maxlength="30"
-                  v-model="form.specificationModel"
-                  placeholder="请输入规格型号"
-                  clearable
+      <el-form
+        label-width="120px"
+        ref="formRef"
+        style="padding: 12px; overflow-y: auto; height: calc(100vh - 180px); width: 100%"
+        :model="form"
+        :rules="equipRules"
+      >
+        <div style="display: flex; padding-bottom: 5px">
+          <div style="width: 5px; background-color: #34E2C7; margin-right: 10px"></div>
+          基础信息
+        </div>
+        <el-row :gutter="24" style="padding-top: 10px">
+          <el-col :span="6">
+            <el-form-item label="专业" prop="major">
+              <el-select
+                v-model="form.major"
+                placeholder="请选择专业"
+                @change="majorChange"
+                :disabled="isEdit"
+                style="width: 100%"
+              >
+                <el-option v-for="item in majorList" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="工序" prop="process">
+              <el-cascader
+                style="width: 100%"
+                v-model="form.process"
+                placeholder="请选择工序"
+                clearable
+                filterable
+                :options="processList"
+                :disabled="isEdit"
+                @change="processChange"
+              ></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="装备类目" prop="category">
+              <el-cascader
+                style="width: 100%"
+                v-model="form.category"
+                :options="categoryList"
+                :disabled="isEdit"
+                clearable
+                filterable
+                placeholder="请选择装备类目"
+                @change="categoryChange"
+              ></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="装备名称" prop="name">
+              <el-input
+                autocomplete="off"
+                maxlength="30"
+                placeholder="请输入装备名称"
+                v-model="form.name"
+                clearable
+                :disabled="isEdit"
+              />
+              <!-- <div class="select-box">
+                <div class="no-data">暂无数据</div>
+              </div> -->
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="规格型号" prop="specificationModel">
+              <el-input
+                autocomplete="off"
+                maxlength="30"
+                v-model="form.specificationModel"
+                placeholder="请输入规格型号"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产原值(万元)" prop="originalValue">
+              <el-input
+                @input="handlePriceInput"
+                autocomplete="off"
+                maxlength="20"
+                v-model="form.originalValue"
+                placeholder="请输入资产原值(万元)"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturerId">
+              <div style="width: 100%; display: flex; align-items: center">
+                <i
+                  class="el-icon-circle-plus-outline"
+                  style="color: #13ce66; margin-right: 5px; cursor: pointer"
+                  @click="openAddress"
                 />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="资产原值(万元)" prop="originalValue">
-                <el-input
-                  @input="handlePriceInput"
-                  autocomplete="off"
-                  maxlength="20"
-                  v-model="form.originalValue"
-                  placeholder="请输入资产原值(万元)"
+                <el-select
+                  v-model="form.manufacturerId"
+                  placeholder="请选择生产厂家"
                   clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="生产厂家" prop="manufacturerId">
-                <div style="width: 100%; display: flex; align-items: center">
-                  <i
-                    class="el-icon-circle-plus-outline"
-                    style="color: #13ce66; margin-right: 5px; cursor: pointer"
-                    @click="openAddress"
-                  />
-                  <el-select
-                    v-model="form.manufacturerId"
-                    placeholder="请选择生产厂家"
-                    clearable
-                    filterable
-                    style="flex: 1; width: 100%"
-                  >
-                    <el-option v-for="item in manufacturerList" :key="item.id" :label="item.label" :value="item.id"/>
-                  </el-select>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂日期" prop="productionDate">
-                <el-date-picker
-                  v-model="form.productionDate"
-                  type="date"
-                  placeholder="请选择出厂日期"
-                  value-format="yyyy-MM-dd"
-                  style="width: 100%"
-                  :picker-options="{
+                  filterable
+                  style="flex: 1; width: 100%"
+                >
+                  <el-option v-for="item in manufacturerList" :key="item.id" :label="item.label" :value="item.id"/>
+                </el-select>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂日期" prop="productionDate">
+              <el-date-picker
+                v-model="form.productionDate"
+                type="date"
+                placeholder="请选择出厂日期"
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+                :picker-options="{
                     disabledDate(time) {
                       return time.getTime() > Date.now()
                     },
                   }"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
 
-            <el-col :span="6">
-              <el-form-item label="下次维保日期" prop="nextMaintenanceDate">
-                <el-date-picker
-                  v-model="form.nextMaintenanceDate"
-                  placeholder="请选择下次维保日期"
-                  value-format="yyyy-MM-dd"
-                  type="date"
-                  style="width: 100%"
-                  :picker-options="{
+          <el-col :span="6">
+            <el-form-item label="下次维保日期" prop="nextMaintenanceDate">
+              <el-date-picker
+                v-model="form.nextMaintenanceDate"
+                placeholder="请选择下次维保日期"
+                value-format="yyyy-MM-dd"
+                type="date"
+                style="width: 100%"
+                :picker-options="{
                     disabledDate(time) {
                       return time.getTime() < Date.now()
                     },
                   }"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="装备原始编码" prop="originalCode">
-                <el-input clearable maxlength="20" placeholder="请输入装备原始编码" v-model="form.originalCode"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="最大使用年限" prop="maxServiceLifeYears">
-                <el-input-number
-                  clearable
-                  maxlength="20"
-                  placeholder="请输入最大使用年限"
-                  v-model="form.maxServiceLifeYears"
-                  :min="1"
-                  :max="100"
-                  :precision="0"
-                  :controls="false"
-                  style="width: 100%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="装备原始编码" prop="originalCode">
+              <el-input clearable maxlength="20" placeholder="请输入装备原始编码" v-model="form.originalCode"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="最大使用年限" prop="maxServiceLifeYears">
+              <el-input-number
+                clearable
+                maxlength="20"
+                placeholder="请输入最大使用年限"
+                v-model="form.maxServiceLifeYears"
+                :min="1"
+                :max="100"
+                :precision="0"
+                :controls="false"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计数单位" prop="unit">
+              <!-- <el-input v-model="form.unit" placeholder="请输入计数单位" clearable maxlength="11" /> -->
+              <el-select v-model="form.unit" placeholder="请选择计数单位" clearable style="width: 100%">
+                <el-option
+                  v-for="dict in dict.type.dev_unit_type"
+                  :key="dict.label"
+                  :label="dict.label"
+                  :value="dict.label"
                 />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="计数单位" prop="unit">
-                <!-- <el-input v-model="form.unit" placeholder="请输入计数单位" clearable maxlength="11" /> -->
-                <el-select v-model="form.unit" placeholder="请选择计数单位" clearable style="width: 100%">
-                  <el-option
-                    v-for="dict in dict.type.dev_unit_type"
-                    :key="dict.label"
-                    :label="dict.label"
-                    :value="dict.label"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-            <el-col :span="6">
-              <el-form-item label="采购日期" prop="purchaseDate">
-                <el-date-picker
-                  v-model="form.purchaseDate"
-                  placeholder="请选择采购日期"
-                  value-format="yyyy-MM-dd"
-                  type="date"
-                  style="width: 100%"
-                  :picker-options="{
+          <el-col :span="6">
+            <el-form-item label="采购日期" prop="purchaseDate">
+              <el-date-picker
+                v-model="form.purchaseDate"
+                placeholder="请选择采购日期"
+                value-format="yyyy-MM-dd"
+                type="date"
+                style="width: 100%"
+                :picker-options="{
                     disabledDate(time) {
                       return time.getTime() > Date.now()
                     },
                   }"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="产权单位" prop="propertyUnitIds">
-                <el-cascader
-                  clearable
-                  v-model="form.propertyUnitIds"
-                  placeholder="请选择产权单位"
-                  :options="propertyUnitList"
-                  :props="{ label: 'label', value: 'id', children: 'children', checkStrictly: true }"
-                  style="width: 100%"
-                  @change="handleUnitChange"
-                />
-              </el-form-item>
-            </el-col>
-
-
-            <!-- 🔥 手动新增字段（插在产权单位后面） -->
-            <el-col
-              v-for="item in config"
-              :key="item.id"
-              :span="6"
-            >
-              <el-form-item
-                :label="item.propertyName"
-                :prop="item.propertyCode"
-                :required="item.mustHave == '1'"
               >
-                <!-- 输入框 -->
-                <el-input
-                  v-if="item.inputType == 'INPUT'"
-                  v-model="form[item.propertyCode]"
-                  clearable
-                  maxlength="100"
-                />
-
-                <!-- 数字框 -->
-                <el-input-number
-                  v-else-if="item.inputType == 'NUMBER'"
-                  v-model="form[item.propertyCode]"
-                  style="width: 100%"
-                  maxlength="100"
-                />
-
-                <!-- 日期 -->
-                <el-date-picker
-                  v-else-if="item.inputType == 'DATE'"
-                  v-model="form[item.propertyCode]"
-                  type="date"
-                  :editable="false"
-                  value-format="yyyy-MM-dd"
-                  style="width: 100%"
-                />
-
-                <!-- 下拉选择 -->
-                <el-select
-                  v-else-if="item.inputType == 'SELECT'"
-                  v-model="form[item.propertyCode]"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="opt in parseSelectOptions(item.value)"
-                    :key="opt.value"
-                    :label="opt.label"
-                    :value="opt.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-
-          </el-row>
-
-          <div style="display: flex; padding-bottom: 10px">
-            <div style="width: 5px; background-color: #34E2C7; margin-right: 10px"></div>
-            特征属性
-          </div>
-          <el-row :gutter="24" style="padding-top: 10px">
-            <!-- propertyVoList -->
-            <el-col :span="6" v-for="(item, index) in propertyVoList" :key="index">
-              <el-form-item v-if="item.inputType == 1" :label="item.propertyName">
-                <el-input autocomplete="off" maxlength="30" v-model="item.propertyValue" clearable :disabled="isEdit"/>
-              </el-form-item>
-              <!-- 单选 -->
-              <el-form-item v-if="item.inputType == 2" :label="item.propertyName">
-                <el-select
-                  v-model="item.propertyValue"
-                  placeholder="请选择"
-                  clearable
-                  :disabled="isEdit"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="(item, index) in handleData(item.value)"
-                    :key="index"
-                    :label="item.value"
-                    :value="item.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <!-- 多选 -->
-              <el-form-item v-if="item.inputType == 3" :label="item.propertyName">
-                <el-select
-                  v-model="item.propertyValue"
-                  multiple
-                  placeholder="请选择"
-                  clearable
-                  :disabled="isEdit"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="(item, index) in handleData(item.value)"
-                    :key="index"
-                    :label="item.value"
-                    :value="item.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :span="6">
-            <el-form-item label="专业特征" prop="specialtyFeature">
-              <el-input autocomplete="off" maxlength="30" v-model="form.specialtyFeature" clearable />
+              </el-date-picker>
             </el-form-item>
           </el-col>
+
           <el-col :span="6">
-            <el-form-item label="工序特征" prop="processFeature">
-              <el-input autocomplete="off" maxlength="30" v-model="form.processFeature" clearable />
+            <el-form-item label="产权单位" prop="propertyUnitIds">
+              <el-cascader
+                clearable
+                v-model="form.propertyUnitIds"
+                placeholder="请选择产权单位"
+                :options="propertyUnitList"
+                :props="{ label: 'label', value: 'id', children: 'children', checkStrictly: true }"
+                style="width: 100%"
+                @change="handleUnitChange"
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="类目特征" prop="categoryFeature">
-              <el-input autocomplete="off" maxlength="30" v-model="form.categoryFeature" clearable />
+
+
+          <!-- 🔥 手动新增字段（插在产权单位后面） -->
+          <el-col
+            v-for="item in config"
+            :key="item.id"
+            :span="6"
+          >
+            <el-form-item
+              :label="item.propertyName"
+              :prop="item.propertyCode"
+              :required="item.mustHave == '1'"
+            >
+              <!-- 输入框 -->
+              <el-input
+                v-if="item.inputType == 'INPUT'"
+                v-model="form[item.propertyCode]"
+                clearable
+                maxlength="100"
+              />
+
+              <!-- 数字框 -->
+              <el-input-number
+                v-else-if="item.inputType == 'NUMBER'"
+                v-model="form[item.propertyCode]"
+                style="width: 100%"
+                maxlength="100"
+              />
+
+              <!-- 日期 -->
+              <el-date-picker
+                v-else-if="item.inputType == 'DATE'"
+                v-model="form[item.propertyCode]"
+                type="date"
+                :editable="false"
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+              />
+
+              <!-- 下拉选择 -->
+              <el-select
+                v-else-if="item.inputType == 'SELECT'"
+                v-model="form[item.propertyCode]"
+                clearable
+                filterable
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="opt in parseSelectOptions(item.value)"
+                  :key="opt.value"
+                  :label="opt.label"
+                  :value="opt.value"
+                />
+              </el-select>
             </el-form-item>
-          </el-col> -->
-          </el-row>
+          </el-col>
 
-          <div style="display: flex; padding-bottom: 10px">
-            <div style="width: 5px; background-color: #34E2C7; margin-right: 10px"></div>
-            装备图片
-          </div>
-          <el-row :gutter="24" style="padding-top: 10px">
-            <el-col>
-              <el-form-item label="装备外观" prop="mainFileList">
-                <ImageUpload
-                  v-model="form.mainFileList"
-                  :value="form.mainFileList"
-                  :limit="6"
-                  @input="handleImageChange"
+        </el-row>
+
+        <div style="display: flex; padding-bottom: 10px">
+          <div style="width: 5px; background-color: #34E2C7; margin-right: 10px"></div>
+          特征属性
+        </div>
+        <el-row :gutter="24" style="padding-top: 10px">
+          <!-- propertyVoList -->
+          <el-col :span="6" v-for="(item, index) in propertyVoList" :key="index">
+            <el-form-item v-if="item.inputType == 1" :label="item.propertyName">
+              <el-input autocomplete="off" maxlength="30" v-model="item.propertyValue" clearable :disabled="isEdit"/>
+            </el-form-item>
+            <!-- 单选 -->
+            <el-form-item v-if="item.inputType == 2" :label="item.propertyName">
+              <el-select
+                v-model="item.propertyValue"
+                placeholder="请选择"
+                clearable
+                :disabled="isEdit"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="(item, index) in handleData(item.value)"
+                  :key="index"
+                  :label="item.value"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <!-- 多选 -->
+            <el-form-item v-if="item.inputType == 3" :label="item.propertyName">
+              <el-select
+                v-model="item.propertyValue"
+                multiple
+                placeholder="请选择"
+                clearable
+                :disabled="isEdit"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="(item, index) in handleData(item.value)"
+                  :key="index"
+                  :label="item.value"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
+          <el-form-item label="专业特征" prop="specialtyFeature">
+            <el-input autocomplete="off" maxlength="30" v-model="form.specialtyFeature" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="工序特征" prop="processFeature">
+            <el-input autocomplete="off" maxlength="30" v-model="form.processFeature" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类目特征" prop="categoryFeature">
+            <el-input autocomplete="off" maxlength="30" v-model="form.categoryFeature" clearable />
+          </el-form-item>
+        </el-col> -->
+        </el-row>
+
+        <div style="display: flex; padding-bottom: 10px">
+          <div style="width: 5px; background-color: #34E2C7; margin-right: 10px"></div>
+          装备图片
+        </div>
+        <el-row :gutter="24" style="padding-top: 10px">
+          <el-col>
+            <el-form-item label="装备外观" prop="mainFileList">
+              <ImageUpload
+                v-model="form.mainFileList"
+                :value="form.mainFileList"
+                :limit="6"
+                @input="handleImageChange"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div style="display: flex; padding-bottom: 10px">
+          <div style="width: 5px; background-color: #34E2C7; margin-right: 10px"></div>
+          相关证书
+        </div>
+        <el-row :gutter="24" style="padding-top: 10px">
+          <el-col>
+            <el-form-item label="合格证" prop="certificateList">
+              <FileUpload
+                v-model="form.certificateList"
+                :value="form.certificateList"
+                :limit="3"
+                :fileSize="10"
+                :fileType="['jpg', 'png', 'pdf']"
+                @input="handleCertificateChange"
+              />
+            </el-form-item>
+
+            <el-form-item label="检测证书" prop="inspectionList">
+              <FileUpload
+                v-model="form.inspectionList"
+                :value="form.inspectionList"
+                :limit="3"
+                :fileSize="10"
+                :fileType="['jpg', 'png', 'pdf']"
+                @input="handleInspectionChange"
+              />
+            </el-form-item>
+
+            <el-form-item label="采购发票" prop="purchaseInvoices">
+              <FileUpload
+                v-model="form.purchaseInvoices"
+                :value="form.purchaseInvoices"
+                :limit="3"
+                :fileSize="10"
+                :fileType="['jpg', 'png', 'pdf']"
+                @input="handlePurchaseInvoicesChange"
+              />
+            </el-form-item>
+
+            <el-form-item label="装备二维码" prop="">
+              <div class="qrcode-box" style="width: 150px;height: 150px">
+                <QrcodeGenerator
+                  ref="qr3"
+                  :value="dialogRow"
+                  errorCorrectionLevel="H"
+                  :size="150"
                 />
-              </el-form-item>
-            </el-col>
-          </el-row>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
 
-          <div style="display: flex; padding-bottom: 10px">
-            <div style="width: 5px; background-color: #34E2C7; margin-right: 10px"></div>
-            相关证书
-          </div>
-          <el-row :gutter="24" style="padding-top: 10px">
-            <el-col>
-              <el-form-item label="合格证" prop="certificateList">
-                <FileUpload
-                  v-model="form.certificateList"
-                  :value="form.certificateList"
-                  :limit="3"
-                  :fileSize="10"
-                  :fileType="['jpg', 'png', 'pdf']"
-                  @input="handleCertificateChange"
-                />
-              </el-form-item>
-
-              <el-form-item label="检测证书" prop="inspectionList">
-                <FileUpload
-                  v-model="form.inspectionList"
-                  :value="form.inspectionList"
-                  :limit="3"
-                  :fileSize="10"
-                  :fileType="['jpg', 'png', 'pdf']"
-                  @input="handleInspectionChange"
-                />
-              </el-form-item>
-
-              <el-form-item label="采购发票" prop="purchaseInvoices">
-                <FileUpload
-                  v-model="form.purchaseInvoices"
-                  :value="form.purchaseInvoices"
-                  :limit="3"
-                  :fileSize="10"
-                  :fileType="['jpg', 'png', 'pdf']"
-                  @input="handlePurchaseInvoicesChange"
-                />
-              </el-form-item>
-
-              <el-form-item label="装备二维码" prop="">
-                <div class="qrcode-box" style="width: 150px;height: 150px">
-                  <QrcodeGenerator
-                    ref="qr3"
-                    :value="dialogRow"
-                    errorCorrectionLevel="H"
-                    :size="150"
-                  />
-                </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+    <!-- 底部按钮区（固定） -->
+    <template slot="footer">
+      <div class="dialog-footer">
+        <el-button type="primary" size="medium" @click="handleSubmit">确认</el-button>
       </div>
-
-      <!-- 底部按钮区（固定） -->
-      <template slot="footer">
-        <div class="dialog-footer">
-          <el-button type="primary" size="medium" @click="handleSubmit">确认</el-button>
-        </div>
-      </template>
+    </template>
 
 
-      <!-- 地址 -->
-      <el-dialog title="新增" v-if="showHouse" :visible.sync="showHouse" width="55%" append-to-body>
-        <el-form ref="supFrom" :model="supFrom" :rules="rules" label-width="135px">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="统一社会信用代码" prop="supplierCode">
-                <el-input v-model="supFrom.supplierCode" placeholder="请输入统一社会信用代码" maxlength="64"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="厂家名称" prop="supplierName">
-                <el-input v-model="supFrom.supplierName" placeholder="请输入厂家名称" maxlength="128"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
+    <!-- 地址 -->
+    <el-dialog title="新增" v-if="showHouse" :visible.sync="showHouse" width="55%" append-to-body>
+      <el-form ref="supFrom" :model="supFrom" :rules="rules" label-width="135px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="统一社会信用代码" prop="supplierCode">
+              <el-input v-model="supFrom.supplierCode" placeholder="请输入统一社会信用代码" maxlength="64"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="厂家名称" prop="supplierName">
+              <el-input v-model="supFrom.supplierName" placeholder="请输入厂家名称" maxlength="128"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="联系人" prop="contactPerson">
-                <el-input v-model="supFrom.contactPerson" placeholder="请输入联系人" maxlength="64"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="联系电话" prop="contactPhone">
-                <el-input v-model="supFrom.contactPhone" placeholder="请输入联系电话" maxlength="11"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系人" prop="contactPerson">
+              <el-input v-model="supFrom.contactPerson" placeholder="请输入联系人" maxlength="64"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="contactPhone">
+              <el-input v-model="supFrom.contactPhone" placeholder="请输入联系电话" maxlength="11"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="厂家地址" prop="address">
-                <el-input v-model="supFrom.address" placeholder="请输入厂家地址" maxlength="255"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="资质/执照编号" prop="qualification">
-                <el-input v-model="supFrom.qualification" placeholder="请输入资质信息或执照编号" maxlength="255"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="状态" prop="status">
-                <el-select v-model="supFrom.status" placeholder="请选择状态" style="width: 100%">
-                  <el-option label="启用" :value="1"/>
-                  <el-option label="停用" :value="0"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="厂家地址" prop="address">
+              <el-input v-model="supFrom.address" placeholder="请输入厂家地址" maxlength="255"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="资质/执照编号" prop="qualification">
+              <el-input v-model="supFrom.qualification" placeholder="请输入资质信息或执照编号" maxlength="255"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="状态" prop="status">
+              <el-select v-model="supFrom.status" placeholder="请选择状态" style="width: 100%">
+                <el-option label="启用" :value="1"/>
+                <el-option label="停用" :value="0"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-            <el-col :span="12">
-              <el-form-item label="备注" prop="remark">
-                <el-input
-                  type="textarea"
-                  :rows="6"
-                  placeholder="请输入备注"
-                  v-model="supFrom.remark"
-                  maxlength="255"
-                  show-word-limit
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm" style="background: #2CBAB2;">确 定</el-button>
-          <el-button @click="showHouse = false">取 消</el-button>
-        </div>
-      </el-dialog>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                type="textarea"
+                :rows="6"
+                placeholder="请输入备注"
+                v-model="supFrom.remark"
+                maxlength="255"
+                show-word-limit
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" style="background: #2CBAB2;">确 定</el-button>
+        <el-button @click="showHouse = false">取 消</el-button>
+      </div>
     </el-dialog>
-  </template>
+  </el-dialog>
+</template>
 
-  <script>
-  import {
-    addInterDevice,
-    getEquipmentAddIdApi,
-    firstLevel,
-    secondAndThirdLevel,
-    fourthToSixthLevel,
-    getDeviceApi,
-    equipmentEditApiNew,
-    getEquipmentPropertyTypeApi,
-    getConfigApi
-  } from '@/api/EquipmentEntryApply'
-  import { getManufacturerSelectApi } from '@/api/EquipmentLedger/index.js'
-  import ImageUpload from '@/components/ImageUpload'
-  import FileUpload from '@/components/FileImageUpload'
-  import { handlePositiveNumberInput } from '@/utils/bonus.js'
-  import { addFacturer } from '@/api/ma/supplier'
-  import { deptTreeSelect } from '@/api/system/user'
+<script>
+import {
+  addInterDevice,
+  getEquipmentAddIdApi,
+  firstLevel,
+  secondAndThirdLevel,
+  fourthToSixthLevel,
+  getDeviceApi,
+  equipmentEditApiNew,
+  getEquipmentPropertyTypeApi,
+  getConfigApi
+} from '@/api/EquipmentEntryApply'
+import { getManufacturerSelectApi } from '@/api/EquipmentLedger/index.js'
+import ImageUpload from '@/components/ImageUpload'
+import FileUpload from '@/components/FileImageUpload'
+import { handlePositiveNumberInput } from '@/utils/bonus.js'
+import { addFacturer } from '@/api/ma/supplier'
+import { deptTreeSelect } from '@/api/system/user'
 
-  export default {
-    name: 'EquipmentEntryEditDialog', // 明确组件名称
-    emits: ['update:isVisible', 'submit', 'getOrderId'], // 声明事件
-    dicts: ['dev_unit_type'],
-    components: { ImageUpload, FileUpload },
-    data() {
-      return {
-        dialogVisible: false,
-        isSubmit: false,
-        query: {},
-        showHouse: false,
-        pageTitle: '新增装备',
-        isEdit: false,
-        maId: null,
-        // 下拉列表数据
-        majorList: [],
-        dialogRow: '',
-        processList: [],
-        categoryList: [],
-        manufacturerList: [],
-        supFrom: {},
-        rules: {
-          supplierCode: [{ required: true, message: '统一社会信用代码不能为空', trigger: 'blur' }],
-          supplierName: [{ required: true, message: '厂家名称不能为空', trigger: 'blur' }],
-          contactPhone: [
-            { required: false, message: '请输入联系电话', trigger: 'blur' },
-            { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
-          ],
-          status: [{ required: true, message: '请选择状态', trigger: 'change' }]
-        },
-        form: {
-          major: '', // 专业
-          process: [], // 工序
-          category: [], // 类目
-          name: '', // 装备名称
-          specificationModel: '', // 规格型号
-          originalValue: '', // 资产原值
-          productionDate: '', // 出厂日期
-          manufacturerId: '', // 生产厂家
-          originalCode: '', // 装备原始编码
-          nextMaintenanceDate: '', // 下次维保日期
-          maxServiceLifeYears: '', // 装备寿命
-          manageType: '0', // 管理模式
-          count: 1, // 装备数量
-          unit: '', // 计数单位
-          purchaseDate: '',
-          specialtyFeature: '', // 专业特征
-          processFeature: '', // 工序特征
-          categoryFeature: '', // 类目特征
-          // deviceTypeList: [], // 装备类型列表
-          mainFileList: '', // 展示图
-          certificateList: '', // 合格证
-          inspectionList: '', // 检测证书
-          purchaseInvoices: '', // 采购发票
-          propertyUnitIds: [], // 产权单位
-          propertyUnitId: null // 产权单位
-        },
-        propertyUnitList: [], // 产权单位列表
-        // 表单校验规则（所有字段均为必填）
-        equipRules: {
-          /* major: [{ required: true, message: '请选择专业', trigger: 'change' }],
-          process: [{ required: true, message: '请选择工序', trigger: 'change' }],
-          category: [{ required: true, message: '请选择装备类目', trigger: 'change' }],
-          name: [{ required: true, message: '请输入装备名称', trigger: 'blur' }],
-          specificationModel: [{ required: true, message: '请输入规格型号', trigger: 'blur' }],
-          originalValue: [{ required: true, message: '请输入资产原值', trigger: 'blur' }], */
-          // productionDate: [{ required: true, message: '请选择出厂日期', trigger: 'change' }],
-          /* manufacturerId: [{ required: true, message: '请输入生产厂家', trigger: 'blur' }], */
-          // originalCode: [{ required: true, message: '请输入装备原始编码', trigger: 'blur' }],
-          /* nextMaintenanceDate: [{ required: true, message: '请选择下次维保日期', trigger: 'change' }],
-          maxServiceLifeYears: [{ required: true, message: '请输入装备寿命', trigger: 'blur' }], */
-          // manageType: [{ required: true, message: '请选择管理方式', trigger: 'change' }],
-          /* count: [{ required: true, message: '请输入装备数量', trigger: 'blur' }],
-          unit: [{ required: true, message: '请输入计数单位', trigger: 'blur' }] */
-          // purchaseDate: [{ required: true, message: '请选择采购日期', trigger: 'change' }],
-          // certificateList: [{ required: true, message: '请上传合格证', trigger: 'change' }],
-          // inspectionList: [{ required: true, message: '请上传检测证书', trigger: 'change' }],
-          // mainFileList: [{ required: true, message: '请上传图片', trigger: 'change' }],
-        },
-        propertyVoList: [], // 特征属性集合
-        isSystem:[], // 系统属性
-        config:[], // 新增属性
-        systemFieldMap: {}
-      }
-    },
-    created() {
-      // this.firstLevel()
-      // this.getManufacturerSelectList()
-      // this.query = this.$route.query
-      // console.log('🚀 ~ this.query:', this.query)
-      // this.form.orderId = this.orderId = this.query.orderId || ''
-      // if (this.query && this.query.maId) {
-      //   this.pageTitle = '编辑装备'
-      //   this.getInfo()
-      // }
-    },
-    methods: {
-      /* getConfig(){
-        getConfigApi().then(res => {
-          this.config = res.data.config;
-          this.isSystem = res.data.isSystem;
+export default {
+  name: 'EquipmentEntryEditDialog', // 明确组件名称
+  emits: ['update:isVisible', 'submit', 'getOrderId'], // 声明事件
+  dicts: ['dev_unit_type'],
+  components: { ImageUpload, FileUpload },
+  data() {
+    return {
+      dialogVisible: false,
+      isSubmit: false,
+      query: {},
+      showHouse: false,
+      pageTitle: '新增装备',
+      isEdit: false,
+      maId: null,
+      // 下拉列表数据
+      majorList: [],
+      dialogRow: '',
+      processList: [],
+      categoryList: [],
+      manufacturerList: [],
+      supFrom: {},
+      rules: {
+        supplierCode: [{ required: true, message: '统一社会信用代码不能为空', trigger: 'blur' }],
+        supplierName: [{ required: true, message: '厂家名称不能为空', trigger: 'blur' }],
+        contactPhone: [
+          { required: false, message: '请输入联系电话', trigger: 'blur' },
+          { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+        ],
+        status: [{ required: true, message: '请选择状态', trigger: 'change' }]
+      },
+      form: {
+        major: '', // 专业
+        process: [], // 工序
+        category: [], // 类目
+        name: '', // 装备名称
+        specificationModel: '', // 规格型号
+        originalValue: '', // 资产原值
+        productionDate: '', // 出厂日期
+        manufacturerId: '', // 生产厂家
+        originalCode: '', // 装备原始编码
+        nextMaintenanceDate: '', // 下次维保日期
+        maxServiceLifeYears: '', // 装备寿命
+        manageType: '0', // 管理模式
+        count: 1, // 装备数量
+        unit: '', // 计数单位
+        purchaseDate: '',
+        specialtyFeature: '', // 专业特征
+        processFeature: '', // 工序特征
+        categoryFeature: '', // 类目特征
+        // deviceTypeList: [], // 装备类型列表
+        mainFileList: '', // 展示图
+        certificateList: '', // 合格证
+        inspectionList: '', // 检测证书
+        purchaseInvoices: '', // 采购发票
+        propertyUnitIds: [], // 产权单位
+        propertyUnitId: null // 产权单位
+      },
+      propertyUnitList: [], // 产权单位列表
+      // 表单校验规则（所有字段均为必填）
+      equipRules: {
+        /* major: [{ required: true, message: '请选择专业', trigger: 'change' }],
+        process: [{ required: true, message: '请选择工序', trigger: 'change' }],
+        category: [{ required: true, message: '请选择装备类目', trigger: 'change' }],
+        name: [{ required: true, message: '请输入装备名称', trigger: 'blur' }],
+        specificationModel: [{ required: true, message: '请输入规格型号', trigger: 'blur' }],
+        originalValue: [{ required: true, message: '请输入资产原值', trigger: 'blur' }], */
+        // productionDate: [{ required: true, message: '请选择出厂日期', trigger: 'change' }],
+        /* manufacturerId: [{ required: true, message: '请输入生产厂家', trigger: 'blur' }], */
+        // originalCode: [{ required: true, message: '请输入装备原始编码', trigger: 'blur' }],
+        /* nextMaintenanceDate: [{ required: true, message: '请选择下次维保日期', trigger: 'change' }],
+        maxServiceLifeYears: [{ required: true, message: '请输入装备寿命', trigger: 'blur' }], */
+        // manageType: [{ required: true, message: '请选择管理方式', trigger: 'change' }],
+        /* count: [{ required: true, message: '请输入装备数量', trigger: 'blur' }],
+        unit: [{ required: true, message: '请输入计数单位', trigger: 'blur' }] */
+        // purchaseDate: [{ required: true, message: '请选择采购日期', trigger: 'change' }],
+        // certificateList: [{ required: true, message: '请上传合格证', trigger: 'change' }],
+        // inspectionList: [{ required: true, message: '请上传检测证书', trigger: 'change' }],
+        // mainFileList: [{ required: true, message: '请上传图片', trigger: 'change' }],
+      },
+      propertyVoList: [], // 特征属性集合
+      isSystem: [], // 系统属性
+      config: [], // 新增属性
+      systemFieldMap: {}
+    }
+  },
+  created() {
+    // this.firstLevel()
+    // this.getManufacturerSelectList()
+    // this.query = this.$route.query
+    // console.log('🚀 ~ this.query:', this.query)
+    // this.form.orderId = this.orderId = this.query.orderId || ''
+    // if (this.query && this.query.maId) {
+    //   this.pageTitle = '编辑装备'
+    //   this.getInfo()
+    // }
+  },
+  methods: {
+    /* getConfig(){
+      getConfigApi().then(res => {
+        this.config = res.data.config;
+        this.isSystem = res.data.isSystem;
 
-          this.systemFieldMap = this.isSystem.reduce((map, item) => {
-            map[item.propertyCode] = item
-            return map
-          }, {})
-
-          this.config.forEach(item => {
-            if (this.form[item.propertyCode] == undefined) {
-              if (item.inputType == 'SELECT') {
-                this.$set(this.form, item.propertyCode, item.propertyValue || '')
-              } else {
-                this.$set(this.form, item.propertyCode, item.value || '')
-              }
-            }
-
-            if (item.mustHave == '1') {
-              this.rules[item.propertyCode] = [
-                { required: true, message: `请输入${item.propertyName}`, trigger: 'blur' }
-              ]
-            }
-          })
-
-          // 根据 isSystem 动态设置验证规则
-          this.buildDynamicRules()
-        })
-      }, */
-
-      resetDynamicFields() {
-        if (!this.config || this.config.length === 0) return
+        this.systemFieldMap = this.isSystem.reduce((map, item) => {
+          map[item.propertyCode] = item
+          return map
+        }, {})
 
         this.config.forEach(item => {
-          if (!item.propertyCode) return
-          // 根据类型决定默认值
-          switch (item.inputType) {
-            case 'INPUT':
-            case 'SELECT':
-            case 'DATE':
-              this.$set(this.form, item.propertyCode, '')
-              break
-            case 'NUMBER':
-              this.$set(this.form, item.propertyCode, null)
-              break
-            default:
-              this.$set(this.form, item.propertyCode, '')
+          if (this.form[item.propertyCode] == undefined) {
+            if (item.inputType == 'SELECT') {
+              this.$set(this.form, item.propertyCode, item.propertyValue || '')
+            } else {
+              this.$set(this.form, item.propertyCode, item.value || '')
+            }
           }
-        })
-      },
 
-      // 获取配置并初始化动态规则
-      getConfig() {
-        getConfigApi().then(res => {
-          this.config = res.data.config || []
-          this.isSystem = res.data.isSystem || []
-
-          // 构建系统属性映射
-          this.systemFieldMap = this.isSystem.reduce((map, item) => {
-            map[item.propertyCode] = item
-            return map
-          }, {})
-
-          // 初始化 form 字段 & rules
-          this.config.forEach(item => {
-            if (!item.propertyCode) return // 避免空字段
-
-            // 初始化 form 字段
-            if (this.form[item.propertyCode] === undefined) {
-              if (item.inputType === 'SELECT') {
-                this.$set(this.form, item.propertyCode, item.propertyValue || '')
-              } else {
-                this.$set(this.form, item.propertyCode, item.value || '')
-              }
-            }
-
-            // 必填规则
-            if (item.mustHave == '1') {
-              const trigger = ['SELECT', 'DATE', 'IMAGE', 'FILE', 'INPUT'].includes(item.inputType) ? 'change' : 'blur'
-              this.$set(this.equipRules, item.propertyCode, [
-                { required: true, message: `请输入${item.propertyName}`, trigger }
-              ])
-            }
-          })
-
-          // 根据 isSystem 动态设置规则
-          this.isSystem.forEach(item => {
-            if (!item.propertyCode) return
-            if (item.mustHave == '1') {
-              const trigger = ['SELECT', 'DATE', 'IMAGE', 'FILE', 'INPUT'].includes(item.inputType) ? 'change' : 'blur'
-              // 如果已经存在，不重复覆盖
-              if (!this.equipRules[item.propertyCode]) {
-                this.$set(this.equipRules, item.propertyCode, [
-                  { required: true, message: `请填写${item.propertyName}`, trigger }
-                ])
-              }
-            }
-          })
-        })
-      },
-
-
-      parseSelectOptions(value) {
-        if (!value) return []
-        // 1️⃣ 统一中文、英文逗号
-        const normalized = value.replace(/，/g, ',')
-        // 2️⃣ 拆分并去空
-        return normalized
-          .split(',')
-          .map(v => v.trim())
-          .filter(v => v)
-          .map(v => ({
-            label: v,
-            value: v
-          }))
-      },
-
-      buildDynamicRules() {
-        const rules = {}
-
-        this.isSystem.forEach(item => {
           if (item.mustHave == '1') {
-            let trigger = 'blur'
-
-            // 不同类型使用不同触发方式
-            if (['SELECT', 'DATE', 'IMAGE', 'FILE'].includes(item.inputType)) {
-              trigger = 'change'
-            }
-
-            rules[item.propertyCode] = [
-              {
-                required: true,
-                message: `请填写${item.propertyName}`,
-                trigger
-              }
+            this.rules[item.propertyCode] = [
+              { required: true, message: `请输入${item.propertyName}`, trigger: 'blur' }
             ]
           }
         })
-        this.equipRules = rules
-      },
 
-      async openDialog(id, type) {
-        this.resetDynamicFields()
-        this.getConfig()
-        await this.getDeptTreeSelect()
-        if (type === 'edit') {
-          this.pageTitle = '编辑装备'
-          this.isEdit = true
-          this.maId = id
-          this.getInfo()
-        } else {
-          this.pageTitle = '新增装备'
-          this.isEdit = false
-          this.form.orderId = id
+        // 根据 isSystem 动态设置验证规则
+        this.buildDynamicRules()
+      })
+    }, */
+
+    resetDynamicFields() {
+      if (!this.config || this.config.length === 0) return
+
+      this.config.forEach(item => {
+        if (!item.propertyCode) return
+        // 根据类型决定默认值
+        switch (item.inputType) {
+          case 'INPUT':
+          case 'SELECT':
+          case 'DATE':
+            this.$set(this.form, item.propertyCode, '')
+            break
+          case 'NUMBER':
+            this.$set(this.form, item.propertyCode, null)
+            break
+          default:
+            this.$set(this.form, item.propertyCode, '')
         }
-        this.dialogVisible = true
-        this.firstLevel()
-        this.getManufacturerSelectList()
+      })
+    },
 
-        setTimeout(() => {
-          this.$refs.formRef.clearValidate()
-        }, 500)
-      },
-      // 获取详情
-      async getInfo() {
-        try {
-          const res = await getDeviceApi(this.maId)
-          Object.assign(this.form, res.data)
-          if (res.data) {
-            let row = res.data
-            if(row.fieldVoList){
-              this.config = row.fieldVoList
+    // 获取配置并初始化动态规则
+    getConfig() {
+      getConfigApi().then(res => {
+        this.config = res.data.config || []
+        this.isSystem = res.data.isSystem || []
 
-              // 遍历 fieldVoList，把值回显到 form
-              this.config.forEach(item => {
-                if (!item.propertyCode) return; // 避免空字段
-                if (item.inputType == 'SELECT' && item.value) {
-                  // 下拉多选值可能是逗号分隔
-                  this.$set(this.form, item.propertyCode, item.propertyValue ? item.propertyValue.split(',') : []);
-                } else {
-                  this.$set(this.form, item.propertyCode, item.propertyValue ?? '');
-                }
-              });
+        // 构建系统属性映射
+        this.systemFieldMap = this.isSystem.reduce((map, item) => {
+          map[item.propertyCode] = item
+          return map
+        }, {})
+
+        // 初始化 form 字段 & rules
+        this.config.forEach(item => {
+          if (!item.propertyCode) return // 避免空字段
+
+          // 初始化 form 字段
+          if (this.form[item.propertyCode] === undefined) {
+            if (item.inputType === 'SELECT') {
+              this.$set(this.form, item.propertyCode, item.propertyValue || '')
+            } else {
+              this.$set(this.form, item.propertyCode, item.value || '')
             }
-
-            const propertyList = row.propertyVoList || []
-            const property = propertyList
-              // 过滤条件：item 存在 且 propertyValue 有值（避免空值干扰）
-              .filter(item => item && item.propertyValue)
-              // 拼接单个属性为 "名称:值" 格式
-              .map(item => `${item.propertyName}:${item.propertyValue}`)
-              // 用分隔符连接（推荐用中文逗号/竖线，可自定义）
-              .join(',')
-            //3.装备小类，，6.生产厂家，7.出厂日期，8.特征属性
-            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}}`
-
-            this.$nextTick(() => {
-              this.$refs.qr3?.refreshQrcode()
-            })
-          }
-          this.form.mainFileList = res.data.appearanceImages
-            ? res.data.appearanceImages.map((item) => item.fileUrl).join(',')
-            : ''
-          this.form.certificateList = res.data.certificates
-            ? res.data.certificates.map((item) => item.fileUrl).join(',')
-            : ''
-          this.form.inspectionList = res.data.inspectionReports
-            ? res.data.inspectionReports.map((item) => item.fileUrl).join(',')
-            : ''
-          this.form.purchaseInvoices = res.data.purchaseInvoices
-            ? res.data.purchaseInvoices.map((item) => item.fileUrl).join(',')
-            : ''
-          this.form.process = [String(res.data.mainProcessId), String(res.data.subProcessId)].filter(Boolean)
-          console.log('🚀 ~ getInfo ~ this.form.process:', this.form.process)
-          const ids = []
-          if (res.data?.parentId) {
-            ids.push(res.data.parentId)
-          }
-          if (res.data?.propertyUnitId) {
-            ids.push(res.data.propertyUnitId)
-          }
-          this.form.propertyUnitIds = [...ids.map(Number)]
-
-          if (res.data.branchId) {
-            this.form.category = [
-              String(res.data.mainCategoryId),
-              String(res.data.subCategoryId),
-              String(res.data.branchId)
-            ].filter(Boolean)
-          } else {
-            this.form.category = [String(res.data.mainCategoryId), String(res.data.subCategoryId)].filter(Boolean)
           }
 
-          this.propertyVoList = res.data.propertyVoList || []
-          console.log('🚀 ~ getInfo ~ this.propertyVoList:', this.propertyVoList)
-          if (this.propertyVoList.length > 0) {
-            this.propertyVoList.forEach((item) => {
-              if (item.propertyValue === '' || item.propertyValue === null || item.propertyValue === undefined) {
-                item.propertyValue = null
-              }
-              if (item.inputType == 3 && item.propertyValue) {
-                item.propertyValue = item.propertyValue.split(',')
+          // 必填规则
+          if (item.mustHave == '1') {
+            const trigger = ['SELECT', 'DATE', 'IMAGE', 'FILE', 'INPUT'].includes(item.inputType) ? 'change' : 'blur'
+            this.$set(this.equipRules, item.propertyCode, [
+              { required: true, message: `请输入${item.propertyName}`, trigger }
+            ])
+          }
+        })
+
+        // 根据 isSystem 动态设置规则
+        this.isSystem.forEach(item => {
+          if (!item.propertyCode) return
+          if (item.mustHave == '1') {
+            const trigger = ['SELECT', 'DATE', 'IMAGE', 'FILE', 'INPUT'].includes(item.inputType) ? 'change' : 'blur'
+            // 如果已经存在，不重复覆盖
+            if (!this.equipRules[item.propertyCode]) {
+              this.$set(this.equipRules, item.propertyCode, [
+                { required: true, message: `请填写${item.propertyName}`, trigger }
+              ])
+            }
+          }
+        })
+      })
+    },
+
+    parseSelectOptions(value) {
+      if (!value) return []
+      // 1️⃣ 统一中文、英文逗号
+      const normalized = value.replace(/，/g, ',')
+      // 2️⃣ 拆分并去空
+      return normalized
+        .split(',')
+        .map(v => v.trim())
+        .filter(v => v)
+        .map(v => ({
+          label: v,
+          value: v
+        }))
+    },
+
+    buildDynamicRules() {
+      const rules = {}
+
+      this.isSystem.forEach(item => {
+        if (item.mustHave == '1') {
+          let trigger = 'blur'
+
+          // 不同类型使用不同触发方式
+          if (['SELECT', 'DATE', 'IMAGE', 'FILE'].includes(item.inputType)) {
+            trigger = 'change'
+          }
+
+          rules[item.propertyCode] = [
+            {
+              required: true,
+              message: `请填写${item.propertyName}`,
+              trigger
+            }
+          ]
+        }
+      })
+      this.equipRules = rules
+    },
+
+    async openDialog(id, type) {
+      this.resetDynamicFields()
+      this.getConfig()
+      await this.getDeptTreeSelect()
+      if (type === 'edit') {
+        this.pageTitle = '编辑装备'
+        this.isEdit = false
+        this.maId = id
+        this.getInfo()
+      } else {
+        this.pageTitle = '新增装备'
+        this.isEdit = false
+        this.form.orderId = id
+      }
+      this.dialogVisible = true
+      this.firstLevel()
+      this.getManufacturerSelectList()
+
+      setTimeout(() => {
+        this.$refs.formRef.clearValidate()
+      }, 500)
+    },
+    // 获取详情
+    async getInfo() {
+      try {
+        const res = await getDeviceApi(this.maId)
+        Object.assign(this.form, res.data)
+        if (res.data) {
+          let row = res.data
+          if (row.fieldVoList) {
+            this.config = row.fieldVoList
+
+            // 遍历 fieldVoList，把值回显到 form
+            this.config.forEach(item => {
+              if (!item.propertyCode) return // 避免空字段
+              if (item.inputType == 'SELECT' && item.value) {
+                // 下拉多选值可能是逗号分隔
+                this.$set(this.form, item.propertyCode, item.propertyValue ? item.propertyValue.split(',') : [])
+              } else {
+                this.$set(this.form, item.propertyCode, item.propertyValue ?? '')
               }
             })
           }
-          const res2 = await secondAndThirdLevel({ firstLevelId: this.form.majorId })
-          this.processList = this.convertToSubTree(res2.data)
-          const res3 = await fourthToSixthLevel({ thirdLevelId: this.form.subProcessId })
-          this.categoryList = this.convertToSubTree(res3.data)
-        } catch (error) {
-          console.log('🚀 ~ getInfo ~ error:', error)
-        }
-      },
-      handleUnitChange(value) {
-        if (value.length === 0) {
-          this.form.propertyUnitId = undefined
-          return
-        }
-        this.form.propertyUnitId = value[value.length - 1]
-      },
-      // 获取产权单位
-      async getDeptTreeSelect() {
-        const res = await deptTreeSelect()
-        this.propertyUnitList = this.filterTree(res.data)
-      },
-      filterTree(nodes) {
-        return nodes
-          .map((node) => {
-            if (node.children) {
-              node.children = this.filterTree(node.children)
-            }
-            return node
+
+          const propertyList = row.propertyVoList || []
+          const property = propertyList
+            // 过滤条件：item 存在 且 propertyValue 有值（避免空值干扰）
+            .filter(item => item && item.propertyValue)
+            // 拼接单个属性为 "名称:值" 格式
+            .map(item => `${item.propertyName}:${item.propertyValue}`)
+            // 用分隔符连接（推荐用中文逗号/竖线，可自定义）
+            .join(',')
+          //3.装备小类，，6.生产厂家，7.出厂日期，8.特征属性
+          this.dialogRow =
+            `${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()
           })
-          .filter((node) => node.status !== '1')
-      },
-      // 获取厂家
-      getManufacturerSelectList() {
-        getManufacturerSelectApi().then((res) => {
-          console.log('🚀 ~ getManufacturerSelectList ~ res:', res)
+        }
+        this.form.mainFileList = res.data.appearanceImages
+          ? res.data.appearanceImages.map((item) => item.fileUrl).join(',')
+          : ''
+        this.form.certificateList = res.data.certificates
+          ? res.data.certificates.map((item) => item.fileUrl).join(',')
+          : ''
+        this.form.inspectionList = res.data.inspectionReports
+          ? res.data.inspectionReports.map((item) => item.fileUrl).join(',')
+          : ''
+        this.form.purchaseInvoices = res.data.purchaseInvoices
+          ? res.data.purchaseInvoices.map((item) => item.fileUrl).join(',')
+          : ''
+        this.form.process = [String(res.data.mainProcessId), String(res.data.subProcessId)].filter(Boolean)
+        console.log('🚀 ~ getInfo ~ this.form.process:', this.form.process)
+        const ids = []
+        if (res.data?.parentId) {
+          ids.push(res.data.parentId)
+        }
+        if (res.data?.propertyUnitId) {
+          ids.push(res.data.propertyUnitId)
+        }
+        this.form.propertyUnitIds = [...ids.map(Number)]
+
+        if (res.data.branchId) {
+          this.form.category = [
+            String(res.data.mainCategoryId),
+            String(res.data.subCategoryId),
+            String(res.data.branchId)
+          ].filter(Boolean)
+        } else {
+          this.form.category = [String(res.data.mainCategoryId), String(res.data.subCategoryId)].filter(Boolean)
+        }
+
+        this.propertyVoList = res.data.propertyVoList || []
+        console.log('🚀 ~ getInfo ~ this.propertyVoList:', this.propertyVoList)
+        if (this.propertyVoList.length > 0) {
+          this.propertyVoList.forEach((item) => {
+            if (item.propertyValue === '' || item.propertyValue === null || item.propertyValue === undefined) {
+              item.propertyValue = null
+            }
+            if (item.inputType == 3 && item.propertyValue) {
+              item.propertyValue = item.propertyValue.split(',')
+            }
+          })
+        }
+        const res2 = await secondAndThirdLevel({ firstLevelId: this.form.majorId })
+        this.processList = this.convertToSubTree(res2.data)
+        const res3 = await fourthToSixthLevel({ thirdLevelId: this.form.subProcessId })
+        this.categoryList = this.convertToSubTree(res3.data)
+      } catch (error) {
+        console.log('🚀 ~ getInfo ~ error:', error)
+      }
+    },
+    handleUnitChange(value) {
+      if (value.length === 0) {
+        this.form.propertyUnitId = undefined
+        return
+      }
+      this.form.propertyUnitId = value[value.length - 1]
+    },
+    // 获取产权单位
+    async getDeptTreeSelect() {
+      const res = await deptTreeSelect()
+      this.propertyUnitList = this.filterTree(res.data)
+    },
+    filterTree(nodes) {
+      return nodes
+        .map((node) => {
+          if (node.children) {
+            node.children = this.filterTree(node.children)
+          }
+          return node
+        })
+        .filter((node) => node.status !== '1')
+    },
+    // 获取厂家
+    getManufacturerSelectList() {
+      getManufacturerSelectApi().then((res) => {
+        console.log('🚀 ~ getManufacturerSelectList ~ res:', res)
+        if (res.code === 200) {
+          this.manufacturerList = res.data
+        }
+      })
+    },
+    /**
+     * 获取一级类型
+     */
+    firstLevel() {
+      firstLevel().then((res) => {
+        if (res.code === 200) {
+          this.majorList = res.data
+        }
+      })
+    },
+    majorChange(item) {
+      if (!item) {
+        this.processList = []
+        this.form.process = []
+      } else {
+        secondAndThirdLevel({ firstLevelId: item }).then((res) => {
           if (res.code === 200) {
-            this.manufacturerList = res.data
+            this.processList = this.convertToSubTree(res.data)
           }
         })
-      },
-      /**
-       * 获取一级类型
-       */
-      firstLevel() {
-        firstLevel().then((res) => {
+      }
+    },
+    processChange(item) {
+      console.log('🚀 ~ processChange ~ item:', item)
+      if (item.length === 0) {
+        this.categoryList = []
+        this.form.category = []
+      } else {
+        fourthToSixthLevel({ thirdLevelId: item[item.length - 1] }).then((res) => {
           if (res.code === 200) {
-            this.majorList = res.data
+            this.categoryList = this.convertToSubTree(res.data)
           }
         })
-      },
-      majorChange(item) {
-        if (!item) {
-          this.processList = []
-          this.form.process = []
-        } else {
-          secondAndThirdLevel({ firstLevelId: item }).then((res) => {
-            if (res.code === 200) {
-              this.processList = this.convertToSubTree(res.data)
-            }
-          })
+      }
+    },
+    categoryChange(item) {
+      console.log('🚀 ~ processChange ~ item:', item)
+      this.propertyVoList = []
+      this.getPropertyVoList(item[item.length - 1])
+    },
+    // 返回上一页
+    goBack() {
+      // this.$tab.closePage()
+      this.$router.push({
+        name: 'equipmentInput',
+        query: {
+          orderId: this.orderId,
+          isAddVisible: false,
+          isApprovalVisible: false
         }
-      },
-      processChange(item) {
-        console.log('🚀 ~ processChange ~ item:', item)
-        if (item.length === 0) {
-          this.categoryList = []
-          this.form.category = []
-        } else {
-          fourthToSixthLevel({ thirdLevelId: item[item.length - 1] }).then((res) => {
-            if (res.code === 200) {
-              this.categoryList = this.convertToSubTree(res.data)
-            }
-          })
-        }
-      },
-      categoryChange(item) {
-        console.log('🚀 ~ processChange ~ item:', item)
-        this.propertyVoList = []
-        this.getPropertyVoList(item[item.length - 1])
-      },
-      // 返回上一页
-      goBack() {
-        // this.$tab.closePage()
+      })
+    },
+    close() {
+      this.$tab.closePage({ path: '/equipment/equipment-input/add' }).then(() => {
         this.$router.push({
           name: 'equipmentInput',
           query: {
@@ -979,349 +987,335 @@
             isApprovalVisible: false
           }
         })
-      },
-      close() {
-        this.$tab.closePage({ path: '/equipment/equipment-input/add' }).then(() => {
-          this.$router.push({
-            name: 'equipmentInput',
-            query: {
-              orderId: this.orderId,
-              isAddVisible: false,
-              isApprovalVisible: false
+      })
+    },
+    deviceTypeChange(val) {
+      if (val === 0) {
+        this.form.count = 1
+      }
+    },
+    // 价格输入处理
+    handlePriceInput(v) {
+      this.form.originalValue = handlePositiveNumberInput(this.form.originalValue)
+      // this.form.originalValue = this.form.originalValue
+      // .replace(/[^\d.]/g, '')       // 删除所有非数字和点
+      // .replace(/\.{2,}/g, '.')      // 多个点 -> 单点
+      // .replace(/^(\d+)\.(.*)\./, '$1.$2'); // 只允许一个点
+    },
+    // 处理图片上传变化
+    handleImageChange(files) {
+      this.form.mainFileList = files
+      this.$refs.formRef.validateField('mainFileList')
+    },
+    // 处理合格证上传变化
+    handleCertificateChange(files) {
+      this.form.certificateList = files
+      this.$refs.formRef.validateField('certificateList')
+    },
+    // 处理检测证书上传变化
+    handleInspectionChange(files) {
+      this.form.inspectionList = files
+      this.$refs.formRef.validateField('inspectionList')
+    },
+    // 处理采购发票上传变化
+    handlePurchaseInvoicesChange(files) {
+      this.form.purchaseInvoices = files
+      this.$refs.formRef.validateField('purchaseInvoices')
+    },
+    /**
+     * 处理表单提交
+     */
+    async handleSubmit() {
+      console.log('🚀 ~ handleSubmit ~ this.form:', this.form, this.propertyVoList)
+      this.$refs['formRef'].validate(async(valid) => {
+        if (valid) {
+          if (this.isSubmit) return
+          this.isSubmit = true
+          const loading = this.$loading()
+          try {
+            var fieldVoList = []
+            // 遍历手动新增字段
+            if (this.config && this.config.length > 0) {
+              this.config.forEach(item => {
+                fieldVoList.push({
+                  ...item,
+                  propertyValue: this.form[item.propertyCode] ?? null // 表单里填写的值
+                })
+              })
             }
-          })
-        })
-      },
-      deviceTypeChange(val) {
-        if (val === 0) {
-          this.form.count = 1
-        }
-      },
-      // 价格输入处理
-      handlePriceInput(v) {
-        this.form.originalValue = handlePositiveNumberInput(this.form.originalValue)
-        // this.form.originalValue = this.form.originalValue
-        // .replace(/[^\d.]/g, '')       // 删除所有非数字和点
-        // .replace(/\.{2,}/g, '.')      // 多个点 -> 单点
-        // .replace(/^(\d+)\.(.*)\./, '$1.$2'); // 只允许一个点
-      },
-      // 处理图片上传变化
-      handleImageChange(files) {
-        this.form.mainFileList = files
-        this.$refs.formRef.validateField('mainFileList')
-      },
-      // 处理合格证上传变化
-      handleCertificateChange(files) {
-        this.form.certificateList = files
-        this.$refs.formRef.validateField('certificateList')
-      },
-      // 处理检测证书上传变化
-      handleInspectionChange(files) {
-        this.form.inspectionList = files
-        this.$refs.formRef.validateField('inspectionList')
-      },
-      // 处理采购发票上传变化
-      handlePurchaseInvoicesChange(files) {
-        this.form.purchaseInvoices = files
-        this.$refs.formRef.validateField('purchaseInvoices')
-      },
-      /**
-       * 处理表单提交
-       */
-      async handleSubmit() {
-        console.log('🚀 ~ handleSubmit ~ this.form:', this.form, this.propertyVoList)
-        this.$refs['formRef'].validate(async(valid) => {
-          if (valid) {
-            if (this.isSubmit) return
-            this.isSubmit = true
-            const loading = this.$loading()
-            try {
-              var fieldVoList = [];
-              // 遍历手动新增字段
-              if (this.config && this.config.length > 0) {
-                this.config.forEach(item => {
-                  fieldVoList.push({
-                    ...item,
-                    propertyValue: this.form[item.propertyCode] ?? null // 表单里填写的值
-                  })
-                })
-              }
 
-
-
-
-              if (!this.form.orderId && !this.isEdit) {
-                const result = await getEquipmentAddIdApi()
-                this.orderId = result.data.id
-                this.form.orderId = this.orderId
-                this.$emit('replaceRoute', this.orderId)
-              }
-              // 获取数组最后一个元素（最末级分类ID）
-              // this.form.typeId = this.form.deviceTypeList[this.form.deviceTypeList.length - 1]
-              // 获取类目的最后一个值
-              this.form.typeId = this.form.category[this.form.category.length - 1]
-              let appearanceImages = [] // 装备图片
-              let certificates = [] // 合格证
-              let inspectionReports = [] // 验收报告
-              let purchaseInvoices = [] // 采购发票
-              if (this.form.mainFileList) {
-                const arr = this.form.mainFileList.split(',')
-                console.log('🚀 ~ 提交 ~ arr:', arr)
-                appearanceImages = arr.map((item) => {
-                  const parts = item.split('/')
-                  return {
-                    fileName: parts[parts.length - 1],
-                    fileUrl: item
-                  }
-                })
-                console.log('🚀 ~ handleSubmit ~ appearanceImages:', appearanceImages)
-              }
-              if (this.form.certificateList) {
-                const arr = this.form.certificateList.split(',')
-                certificates = arr.map((item) => {
-                  const parts = item.split('/')
-                  return {
-                    fileName: parts[parts.length - 1],
-                    fileUrl: item
-                  }
-                })
-                console.log('🚀 ~ handleSubmit ~ certificates:', certificates)
-              } else {
-                // 提示
-                // this.$message.error('请上传合格证')
-                // return
-              }
-              if (this.form.inspectionList) {
-                const arr = this.form.inspectionList.split(',')
-                inspectionReports = arr.map((item) => {
-                  const parts = item.split('/')
-                  return {
-                    fileName: parts[parts.length - 1],
-                    fileUrl: item
-                  }
-                })
-                console.log('🚀 ~ handleSubmit ~ inspectionReports:', inspectionReports)
-              } else {
-                // 提示
-                // this.$message.error('请上传检测证书')
-                // return
-              }
-              if (this.form.purchaseInvoices) {
-                const arr = this.form.purchaseInvoices.split(',')
-                purchaseInvoices = arr.map((item) => {
-                  const parts = item.split('/')
-                  return {
-                    fileName: parts[parts.length - 1],
-                    fileUrl: item
-                  }
-                })
-                console.log('🚀 ~ handleSubmit ~ purchaseInvoices:', purchaseInvoices)
-              }
-              // 判断特征项是否填写 propertyVoList 每个propertyValue 都要有值
-              if (this.propertyVoList && this.propertyVoList.length > 0) {
-                const unfilledIndex = this.propertyVoList.findIndex(
-                  (item) => (!item.propertyValue || item.propertyValue === '') && item.mustHave != '0'
-                )
-                if (unfilledIndex !== -1) {
-                  this.$message.warning(`第 ${unfilledIndex + 1} 个特征项为必填项，请填写完整`)
-                  return
-                }
-              }
-              this.propertyVoList.forEach((item) => {
-                console.log('item.item.propertyValue', item.propertyValue)
-                if (item.inputType == 3 && Array.isArray(item.propertyValue)) {
-                  item.propertyValue = item.propertyValue.join(',')
+            if (!this.form.orderId && !this.isEdit) {
+              const result = await getEquipmentAddIdApi()
+              this.orderId = result.data.id
+              this.form.orderId = this.orderId
+              this.$emit('replaceRoute', this.orderId)
+            }
+            // 获取数组最后一个元素（最末级分类ID）
+            // this.form.typeId = this.form.deviceTypeList[this.form.deviceTypeList.length - 1]
+            // 获取类目的最后一个值
+            this.form.typeId = this.form.category[this.form.category.length - 1]
+            let appearanceImages = [] // 装备图片
+            let certificates = [] // 合格证
+            let inspectionReports = [] // 验收报告
+            let purchaseInvoices = [] // 采购发票
+            if (this.form.mainFileList) {
+              const arr = this.form.mainFileList.split(',')
+              console.log('🚀 ~ 提交 ~ arr:', arr)
+              appearanceImages = arr.map((item) => {
+                const parts = item.split('/')
+                return {
+                  fileName: parts[parts.length - 1],
+                  fileUrl: item
                 }
               })
-
-              let res = null
-              const params = {
-                ...this.form,
-                appearanceImages,
-                certificates,
-                inspectionReports,
-                purchaseInvoices,
-                propertyVoList: this.propertyVoList,
-                fieldVoList:fieldVoList
-              }
-              if (this.maId) {
-                params.maId = this.maId
-                res = await equipmentEditApiNew(params)
-              } else {
-                res = await addInterDevice(params)
-              }
-              this.dialogVisible = false
-              this.$emit('getList')
-              if (!this.isEdit) {
-                this.$emit('handleSubmit')
-              }
-            } catch (error) {
-              console.log('🚀 ~ handleSubmit ~ error:', error)
-            } finally {
-              this.isSubmit = false
-              loading.close()
+              console.log('🚀 ~ handleSubmit ~ appearanceImages:', appearanceImages)
             }
-          }
-        })
-      },
-      /**
-       * 转换类型数据为树形结构（适用于级联选择器）
-       */
-      convertToSubTree(list) {
-        const map = {}
-        const tree = []
-
-        // 构建节点映射
-        list.forEach((item) => {
-          map[item.value] = {
-            value: item.value.toString(),
-            label: item.label
-          }
-        })
-
-        // 构建树形关系
-        list.forEach((item) => {
-          const current = map[item.value]
-          const parent = map[item.parentId]
-
-          if (parent) {
-            if (!parent.children) {
-              parent.children = []
+            if (this.form.certificateList) {
+              const arr = this.form.certificateList.split(',')
+              certificates = arr.map((item) => {
+                const parts = item.split('/')
+                return {
+                  fileName: parts[parts.length - 1],
+                  fileUrl: item
+                }
+              })
+              console.log('🚀 ~ handleSubmit ~ certificates:', certificates)
+            } else {
+              // 提示
+              // this.$message.error('请上传合格证')
+              // return
             }
-            parent.children.push(current)
-          } else {
-            tree.push(current)
-          }
-        })
-
-        return tree
-      },
-      // 获取特征值
-      async getPropertyVoList(typeId) {
-        try {
-          const res = await getEquipmentPropertyTypeApi(typeId)
-          console.log('特征值-->:', res)
-          this.propertyVoList = res.data || []
-        } catch (error) {
-          console.log('获取特征值失败:', error)
-        }
-      },
-      // 处理数据
-      handleData(data) {
-        // console.log('处理数据:', data)
-        if (!data) return []
-        return data.split(',').map((item) => {
-          return {
-            label: item,
-            value: item
-          }
-        })
-      },
-      openAddress() {
-        this.showHouse = true
-      },
-      submitForm() {
-        this.$refs['supFrom'].validate(async(valid) => {
-          if (valid) {
-            addFacturer(this.supFrom).then((response) => {
-              this.$modal.msgSuccess('新增成功')
-              this.showHouse = false
-              this.getManufacturerSelectList()
+            if (this.form.inspectionList) {
+              const arr = this.form.inspectionList.split(',')
+              inspectionReports = arr.map((item) => {
+                const parts = item.split('/')
+                return {
+                  fileName: parts[parts.length - 1],
+                  fileUrl: item
+                }
+              })
+              console.log('🚀 ~ handleSubmit ~ inspectionReports:', inspectionReports)
+            } else {
+              // 提示
+              // this.$message.error('请上传检测证书')
+              // return
+            }
+            if (this.form.purchaseInvoices) {
+              const arr = this.form.purchaseInvoices.split(',')
+              purchaseInvoices = arr.map((item) => {
+                const parts = item.split('/')
+                return {
+                  fileName: parts[parts.length - 1],
+                  fileUrl: item
+                }
+              })
+              console.log('🚀 ~ handleSubmit ~ purchaseInvoices:', purchaseInvoices)
+            }
+            // 判断特征项是否填写 propertyVoList 每个propertyValue 都要有值
+            if (this.propertyVoList && this.propertyVoList.length > 0) {
+              const unfilledIndex = this.propertyVoList.findIndex(
+                (item) => (!item.propertyValue || item.propertyValue === '') && item.mustHave != '0'
+              )
+              if (unfilledIndex !== -1) {
+                this.$message.warning(`第 ${unfilledIndex + 1} 个特征项为必填项，请填写完整`)
+                return
+              }
+            }
+            this.propertyVoList.forEach((item) => {
+              console.log('item.item.propertyValue', item.propertyValue)
+              if (item.inputType == 3 && Array.isArray(item.propertyValue)) {
+                item.propertyValue = item.propertyValue.join(',')
+              }
             })
+
+            let res = null
+            const params = {
+              ...this.form,
+              appearanceImages,
+              certificates,
+              inspectionReports,
+              purchaseInvoices,
+              propertyVoList: this.propertyVoList,
+              fieldVoList: fieldVoList
+            }
+            if (this.maId) {
+              params.maId = this.maId
+              res = await equipmentEditApiNew(params)
+            } else {
+              res = await addInterDevice(params)
+            }
+            this.dialogVisible = false
+            this.$emit('getList')
+            if (!this.isEdit) {
+              this.$emit('handleSubmit')
+            }
+          } catch (error) {
+            console.log('🚀 ~ handleSubmit ~ error:', error)
+          } finally {
+            this.isSubmit = false
+            loading.close()
           }
-        })
+        }
+      })
+    },
+    /**
+     * 转换类型数据为树形结构（适用于级联选择器）
+     */
+    convertToSubTree(list) {
+      const map = {}
+      const tree = []
+
+      // 构建节点映射
+      list.forEach((item) => {
+        map[item.value] = {
+          value: item.value.toString(),
+          label: item.label
+        }
+      })
+
+      // 构建树形关系
+      list.forEach((item) => {
+        const current = map[item.value]
+        const parent = map[item.parentId]
+
+        if (parent) {
+          if (!parent.children) {
+            parent.children = []
+          }
+          parent.children.push(current)
+        } else {
+          tree.push(current)
+        }
+      })
+
+      return tree
+    },
+    // 获取特征值
+    async getPropertyVoList(typeId) {
+      try {
+        const res = await getEquipmentPropertyTypeApi(typeId)
+        console.log('特征值-->:', res)
+        this.propertyVoList = res.data || []
+      } catch (error) {
+        console.log('获取特征值失败:', error)
       }
+    },
+    // 处理数据
+    handleData(data) {
+      // console.log('处理数据:', data)
+      if (!data) return []
+      return data.split(',').map((item) => {
+        return {
+          label: item,
+          value: item
+        }
+      })
+    },
+    openAddress() {
+      this.showHouse = true
+    },
+    submitForm() {
+      this.$refs['supFrom'].validate(async(valid) => {
+        if (valid) {
+          addFacturer(this.supFrom).then((response) => {
+            this.$modal.msgSuccess('新增成功')
+            this.showHouse = false
+            this.getManufacturerSelectList()
+          })
+        }
+      })
     }
   }
-  </script>
+}
+</script>
 
-  <style lang="scss" scoped>
-  .dialog-content {
-    padding: 20px;
-  }
+<style lang="scss" scoped>
+.dialog-content {
+  padding: 20px;
+}
 
-  .page-header {
-    display: flex;
-    align-items: center;
-    margin-bottom: 20px;
-    padding-bottom: 15px;
+.page-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+  padding-bottom: 15px;
+  font-size: 18px;
+  border-bottom: 1px solid #e6e6e6;
+  justify-content: space-between;
+
+  .page-title {
     font-size: 18px;
-    border-bottom: 1px solid #e6e6e6;
-    justify-content: space-between;
-
-    .page-title {
-      font-size: 18px;
-      font-weight: 600;
-      margin-left: 15px;
-      color: #303133;
-    }
+    font-weight: 600;
+    margin-left: 15px;
+    color: #303133;
   }
+}
 
-  .dialog-content {
-    padding: 10px 0;
-    min-height: 200px; // 确保有足够高度
-  }
+.dialog-content {
+  padding: 10px 0;
+  min-height: 200px; // 确保有足够高度
+}
 
-  .goBack-btn:hover {
-    cursor: pointer;
-    color: #33b5a0;
-  }
+.goBack-btn:hover {
+  cursor: pointer;
+  color: #33b5a0;
+}
 
-  .dialog-footer {
-    display: flex;
-    justify-content: flex-end;
-    gap: 10px; // 按钮间距
-  }
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px; // 按钮间距
+}
 
-  ::v-deep .el-input-number.is-without-controls .el-input__inner {
-    text-align: left;
-  }
+::v-deep .el-input-number.is-without-controls .el-input__inner {
+  text-align: left;
+}
 
-  .select-box {
-    width: 100%;
-    height: 260px;
-    border: 1px solid #dcdcdc;
-    margin-top: 5px;
-    padding: 5px;
+.select-box {
+  width: 100%;
+  height: 260px;
+  border: 1px solid #dcdcdc;
+  margin-top: 5px;
+  padding: 5px;
+  position: absolute;
+  background-color: #fff;
+  z-index: 999;
+  overflow-y: auto;
+  box-sizing: border-box;
+  border-radius: 4px;
+
+  .no-data {
+    // 居中显示
     position: absolute;
-    background-color: #fff;
-    z-index: 999;
-    overflow-y: auto;
-    box-sizing: border-box;
-    border-radius: 4px;
-
-    .no-data {
-      // 居中显示
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      -webkit-transform: translate(-50%, -50%);
-      transform: translate(-50%, -50%);
-      text-align: center;
-      color: #c0c4cc;
-    }
+    top: 50%;
+    left: 50%;
+    -webkit-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
+    text-align: center;
+    color: #c0c4cc;
   }
+}
 
-  /* 紧凑表单行距 */
-  ::v-deep .el-form-item {
-    margin-bottom: 16px;
-  }
+/* 紧凑表单行距 */
+::v-deep .el-form-item {
+  margin-bottom: 16px;
+}
 
-  ::v-deep.el-tag.el-tag--info {
-    background-color: #F5F5F5;
-    border-color: #B3B3B3;
-    color: #B3B3B3;
-  }
+::v-deep.el-tag.el-tag--info {
+  background-color: #F5F5F5;
+  border-color: #B3B3B3;
+  color: #B3B3B3;
+}
 
-  ::v-deep.el-tag.el-tag--warn {
-    background-color: rgba(255, 171, 41, 0.1);;
-    border: #FFAB29;
-    color: #FFAB29;
-  }
+::v-deep.el-tag.el-tag--warn {
+  background-color: rgba(255, 171, 41, 0.1);;
+  border: #FFAB29;
+  color: #FFAB29;
+}
 
-  ::v-deep.el-tag.el-tag--success {
-    background-color: rgba(52, 226, 199, 0.1);
-    border-color: #34E2C7;
-    color: #34E2C7;
-  }
-  </style>
+::v-deep.el-tag.el-tag--success {
+  background-color: rgba(52, 226, 199, 0.1);
+  border-color: #34E2C7;
+  color: #34E2C7;
+}
+</style>
diff --git a/src/views/system/equipment/index.vue b/src/views/system/equipment/index.vue
index b7181e6d..34372f5b 100644
--- a/src/views/system/equipment/index.vue
+++ b/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()