diff --git a/src/api/EquipmentEntryApply/index.js b/src/api/EquipmentEntryApply/index.js
index 06920e34..5d0fdc55 100644
--- a/src/api/EquipmentEntryApply/index.js
+++ b/src/api/EquipmentEntryApply/index.js
@@ -202,3 +202,29 @@ export const qualityDeleteByIdApi = (data = {}) => {
   })
 }
 
+export const firstLevel = (data = {}) => {
+  return request({
+    url: '/material-mall/order/firstLevel',
+    method: 'GET',
+    params: data
+  })
+}
+
+export const secondAndThirdLevel = (data = {}) => {
+  return request({
+    url: '/material-mall/order/secondAndThirdLevel',
+    method: 'GET',
+    params: data
+  })
+}
+
+export const fourthToSixthLevel = (data = {}) => {
+  return request({
+    url: '/material-mall/order/fourthToSixthLevel',
+    method: 'GET',
+    params: data
+  })
+}
+
+
+
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index e13b2b83..ee543fc4 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="upload-file">
-    <z
+    <el-upload
       multiple
       :action="uploadFileUrl"
       :before-upload="handleBeforeUpload"
@@ -19,11 +19,11 @@
       <!-- 上传提示 -->
       <div class="el-upload__tip" slot="tip" v-if="showTip">
         请上传
-        <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
-        <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+        <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b></template>
+        <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join('、') }}</b></template>
         的文件
       </div>
-    </z>
+    </el-upload>
 
     <!-- 文件列表 -->
     <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
@@ -40,27 +40,27 @@
 </template>
 
 <script>
-import { getToken } from "@/utils/auth";
+import { getToken } from '@/utils/auth'
 
 export default {
-  name: "FileUpload",
+  name: 'FileUpload',
   props: {
     // 值
     value: [String, Object, Array],
     // 数量限制
     limit: {
       type: Number,
-      default: 5,
+      default: 5
     },
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 5,
+      default: 5
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "txt", "pdf"],
+      default: () => ['doc', 'xls', 'ppt', 'txt', 'pdf']
     },
     // 是否显示提示
     isShowTip: {
@@ -72,31 +72,31 @@ export default {
     return {
       number: 0,
       uploadList: [],
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传文件服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + '/file/upload', // 上传文件服务器地址
       headers: {
-        Authorization: "Bearer " + getToken()
+        Authorization: 'Bearer ' + getToken()
       },
-      fileList: [],
-    };
+      fileList: []
+    }
   },
   watch: {
     value: {
       handler(val) {
         if (val) {
-          let temp = 1;
+          let temp = 1
           // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
+          const list = Array.isArray(val) ? val : this.value.split(',')
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
-            if (typeof item === "string") {
-              item = { name: item, url: item };
+            if (typeof item === 'string') {
+              item = { name: item, url: item }
             }
-            item.uid = item.uid || new Date().getTime() + temp++;
-            return item;
-          });
+            item.uid = item.uid || new Date().getTime() + temp++
+            return item
+          })
         } else {
-          this.fileList = [];
-          return [];
+          this.fileList = []
+          return []
         }
       },
       deep: true,
@@ -106,109 +106,112 @@ export default {
   computed: {
     // 是否显示提示
     showTip() {
-      return this.isShowTip && (this.fileType || this.fileSize);
-    },
+      return this.isShowTip && (this.fileType || this.fileSize)
+    }
   },
   methods: {
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
       // 校检文件类型
       if (this.fileType) {
-        const fileName = file.name.split('.');
-        const fileExt = fileName[fileName.length - 1];
-        const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
+        const fileName = file.name.split('.')
+        const fileExt = fileName[fileName.length - 1]
+        const isTypeOk = this.fileType.indexOf(fileExt) >= 0
         if (!isTypeOk) {
-          this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
-          return false;
+          this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join('/')}格式文件!`)
+          return false
         }
       }
       // 校检文件大小
       if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        const isLt = file.size / 1024 / 1024 < this.fileSize
         if (!isLt) {
-          this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
-          return false;
+          this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`)
+          return false
         }
       }
-      this.$modal.loading("正在上传文件，请稍候...");
-      this.number++;
-      return true;
+      this.$modal.loading('正在上传文件，请稍候...')
+      this.number++
+      return true
     },
     // 文件个数超出
     handleExceed() {
-      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
+      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`)
     },
     // 上传失败
     handleUploadError(err) {
-      this.$modal.msgError("上传文件失败，请重试");
+      this.$modal.msgError('上传文件失败，请重试')
       this.$modal.closeLoading()
     },
     // 上传成功回调
     handleUploadSuccess(res, file) {
       if (res.code === 200) {
-        this.uploadList.push({ name: res.data.url, url: res.data.url });
-        this.uploadedSuccessfully();
+        this.uploadList.push({ name: res.data.url, url: res.data.url })
+        this.uploadedSuccessfully()
       } else {
-        this.number--;
-        this.$modal.closeLoading();
-        this.$modal.msgError(res.msg);
-        this.$refs.fileUpload.handleRemove(file);
-        this.uploadedSuccessfully();
+        this.number--
+        this.$modal.closeLoading()
+        this.$modal.msgError(res.msg)
+        this.$refs.fileUpload.handleRemove(file)
+        this.uploadedSuccessfully()
       }
     },
     // 删除文件
     handleDelete(index) {
-      this.fileList.splice(index, 1);
-      this.$emit("input", this.listToString(this.fileList));
+      this.fileList.splice(index, 1)
+      this.$emit('input', this.listToString(this.fileList))
     },
     // 上传结束处理
     uploadedSuccessfully() {
       if (this.number > 0 && this.uploadList.length === this.number) {
-        this.fileList = this.fileList.concat(this.uploadList);
-        this.uploadList = [];
-        this.number = 0;
-        this.$emit("input", this.listToString(this.fileList));
-        this.$modal.closeLoading();
+        this.fileList = this.fileList.concat(this.uploadList)
+        this.uploadList = []
+        this.number = 0
+        this.$emit('input', this.listToString(this.fileList))
+        this.$modal.closeLoading()
       }
     },
     // 获取文件名称
     getFileName(name) {
       // 如果是url那么取最后的名字 如果不是直接返回
-      if (name.lastIndexOf("/") > -1) {
-        return name.slice(name.lastIndexOf("/") + 1);
+      if (name.lastIndexOf('/') > -1) {
+        return name.slice(name.lastIndexOf('/') + 1)
       } else {
-        return name;
+        return name
       }
     },
     // 对象转成指定字符串分隔
     listToString(list, separator) {
-      let strs = "";
-      separator = separator || ",";
+      let strs = ''
+      separator = separator || ','
       for (let i in list) {
-        strs += list[i].url + separator;
+        strs += list[i].url + separator
       }
-      return strs != '' ? strs.substr(0, strs.length - 1) : '';
+      return strs != '' ? strs.substr(0, strs.length - 1) : ''
     }
   }
-};
+}
 </script>
 
 <style scoped lang="scss">
 .upload-file-uploader {
   margin-bottom: 5px;
 }
+
 .upload-file-list .el-upload-list__item {
   border: 1px solid #e4e7ed;
   line-height: 2;
   margin-bottom: 10px;
   position: relative;
 }
+
 .upload-file-list .ele-upload-list__item-content {
   display: flex;
   justify-content: space-between;
   align-items: center;
   color: inherit;
 }
+
 .ele-upload-list__item-content-action .el-link {
   margin-right: 10px;
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 9c6a8439..1a05cc7a 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -24,7 +24,7 @@
     <div class="el-upload__tip" slot="tip" v-if="showTip">
       请上传
       <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
-      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("、") }}</b> </template>
       的文件
     </div>
 
diff --git a/src/router/index.js b/src/router/index.js
index ca4911bb..5735de51 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -270,6 +270,35 @@ export const dynamicRoutes = [
       }
     ]
   },
+  {
+    path: '/equipment/equipment-input',
+    component: Layout,
+    hidden: true,
+    permissions: ['system:dict:list'],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/EquipmentEntryApply/equipmentInput/index'),
+        name: 'equipmentInput',
+        meta: { title: '装备录入', activeMenu: '/equipment/equipment-input' }
+      }
+    ]
+  },
+
+  {
+    path: '/equipment/equipment-input',
+    component: Layout,
+    hidden: true,
+    permissions: ['system:dict:list'],
+    children: [
+      {
+        path: 'add',
+        component: () => import('@/views/EquipmentEntryApply/equipmentInput/add'),
+        name: 'equipmentInputAdd',
+        meta: { title: '新增装备', activeMenu: '/equipment/equipment-input' }
+      }
+    ]
+  },
   {
     path: '/face/face-data',
     component: Layout,
diff --git a/src/utils/drawMixin.js b/src/utils/drawMixin.js
index ab1cd5fd..18c6bf38 100644
--- a/src/utils/drawMixin.js
+++ b/src/utils/drawMixin.js
@@ -36,9 +36,9 @@ export default {
       // 调试模式 - start
       if (DEBUG_MODE) {
         // 调试模式，不缩放，居中显示
-        // appRef.style.transform = `translate(-25%, -45%) scale(0.9, 0.9)`
-        // appRef.style.overflow = 'visible'
-        // return
+        appRef.style.transform = `translate(-25%, -45%) scale(0.9, 0.9)`
+        appRef.style.overflow = 'visible'
+        return
       }
       // 调试模式 - end
 
diff --git a/src/views/EquipmentEntryApply/equipmentInput/add.vue b/src/views/EquipmentEntryApply/equipmentInput/add.vue
new file mode 100644
index 00000000..68aac687
--- /dev/null
+++ b/src/views/EquipmentEntryApply/equipmentInput/add.vue
@@ -0,0 +1,543 @@
+<template>
+  <!-- 弹窗内容区域 -->
+  <div class="app-container" style="height: calc(100vh - 84px);overflow-y:unset">
+    <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">新增装备</span>
+      </div>
+      <div class="dialog-footer" style="float: right">
+        <el-button size="medium" @click="goBack">取消</el-button>
+        <el-button type="primary" size="medium" @click="handleSubmit">确认</el-button>
+      </div>
+    </div>
+
+    <el-form
+      label-width="110px"
+      ref="formRef"
+      style="padding: 12px;overflow-y: auto;height: calc(100vh - 180px);width: 100%"
+      label-position="right"
+      :model="form"
+      :rules="equipRules"
+    >
+      <div style="display:flex;padding-bottom: 5px">
+        <div style="width: 5px;background-color: #00a288;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" style="width: 100%"
+                       clearable
+            >
+              <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%" clearable
+                         v-model="form.process"
+                         placeholder="请选择工序"
+                         :options="processList"
+                         @change="processChange"
+            ></el-cascader>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="装备类目" prop="category">
+            <el-cascader style="width: 100%" clearable
+                         v-model="form.category"
+                         :options="categoryList"
+                         placeholder="请选择装备类目"
+                         @change="categoryChange"
+            ></el-cascader>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="装备名称" prop="deviceName">
+            <el-input
+              autocomplete="off"
+              maxlength="30"
+              placeholder="请输入装备名称"
+              v-model="form.deviceName"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="规格型号" prop="itemTypeModel">
+            <el-input
+              autocomplete="off"
+              maxlength="30"
+              v-model="form.itemTypeModel"
+              placeholder="请输入规格型号"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="资产原值" prop="buyPrice">
+            <el-input
+              @input="handlePriceInput"
+              autocomplete="off"
+              maxlength="20"
+              v-model="form.buyPrice"
+              placeholder="请输入资产原值"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="出厂日期" prop="productionDate">
+            <el-date-picker
+              v-model="form.productionDate"
+              placeholder="请选择出厂日期"
+              value-format="yyyy-MM-DD"
+              type="date"
+              style="width: 100%"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="生产厂家" prop="brand">
+            <el-input
+              v-model="form.brand"
+              autocomplete="off"
+              placeholder="请输入生产厂家"
+              maxlength="20"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="装备原始编码" prop="identifyCode">
+            <el-input
+              clearable
+              maxlength="20"
+              placeholder="请输入装备原始编码"
+              v-model="form.identifyCode"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="下次维保日期" prop="nextCheckTime">
+            <el-date-picker
+              v-model="form.nextCheckTime"
+              placeholder="请选择下次维保日期"
+              value-format="yyyy-MM-DD"
+              type="date"
+              style="width: 100%"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="装备寿命" prop="lifespan">
+            <el-input
+              clearable
+              maxlength="20"
+              placeholder="请输入装备寿命"
+              v-model="form.lifespan"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="管理模式" prop="deviceType">
+            <el-select
+              v-model="form.deviceType"
+              placeholder="请选择管理方式"
+              clearable
+              @change="deviceTypeChange"
+              style="width: 100%"
+            >
+              <el-option label="编码" :value="0"/>
+              <el-option label="数量" :value="1"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="装备数量" prop="deviceCount">
+            <el-input
+              v-model="form.deviceCount"
+              placeholder="请输入装备数量"
+              clearable
+              maxlength="10"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="计数单位" prop="unitName">
+            <el-input
+              v-model="form.unitName"
+              placeholder="请输入计数单位"
+              clearable
+              maxlength="11"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <div style="display:flex;padding-bottom: 10px">
+        <div style="width: 5px;background-color: #00a288;margin-right: 10px"></div>
+        特征属性
+      </div>
+      <el-row :gutter="24" style="padding-top: 10px">
+        <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: #00a288;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"
+              @change="handleImageChange"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <div style="display:flex;padding-bottom: 10px">
+        <div style="width: 5px;background-color: #00a288;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="['doc','docx', 'ppt','pdf']"
+              @change="handleCertificateChange"
+            />
+          </el-form-item>
+
+          <el-form-item label="检测证书" prop="inspectionList">
+            <FileUpload
+              v-model="form.inspectionList"
+              :value="form.inspectionList"
+              :limit="3"
+              :fileSize="10"
+              :fileType="['doc','docx', 'ppt','pdf']"
+              @change="handleInspectionChange"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+  </div>
+</template>
+
+<script>
+import {
+  equipmentAddApiNew,
+  getEquipmentAddIdApi,
+  firstLevel,
+  secondAndThirdLevel,
+  fourthToSixthLevel
+} from '@/api/EquipmentEntryApply'
+import ImageUpload from '@/components/ImageUpload'
+import FileUpload from '@/components/ImageUpload'
+
+export default {
+  name: 'EquipmentEntryEditDialog', // 明确组件名称
+  emits: ['update:isVisible', 'submit', 'getOrderId'], // 声明事件
+  data() {
+    return {
+      // 下拉列表数据
+      majorList: [],
+      processList: [],
+      categoryList: [],
+      form: {
+        major: '', // 专业
+        process: '', // 工序
+        category: '', // 类目
+        deviceName: '', // 装备名称
+        itemTypeModel: '', // 规格型号
+        buyPrice: '', // 资产原值
+        productionDate: '', // 出厂日期
+        brand: '', // 生产厂家
+        identifyCode: '', // 装备原始编码
+        nextCheckTime: '', // 下次维保日期
+        lifespan: '', // 装备寿命
+        deviceType: '', // 管理模式
+        deviceCount: 1, // 装备数量
+        unitName: '', // 计数单位
+        specialtyFeature: '', // 专业特征
+        processFeature: '', // 工序特征
+        categoryFeature: '', // 类目特征
+        deviceTypeList: [], // 装备类型列表
+        mainFileList: [], // 展示图
+        certificateList: [], // 合格证
+        inspectionList: [] // 检测证书
+      },
+      // 表单校验规则（所有字段均为必填）
+      equipRules: {
+        major: [
+          { required: true, message: '请选择专业', trigger: 'change' }
+        ],
+        process: [
+          { required: true, message: '请选择工序', trigger: 'change' }
+        ],
+        category: [
+          { required: true, message: '请选择装备类目', trigger: 'change' }
+        ],
+        deviceName: [
+          { required: true, message: '请输入装备名称', trigger: 'blur' }
+        ],
+        itemTypeModel: [
+          { required: true, message: '请输入规格型号', trigger: 'blur' }
+        ],
+        buyPrice: [
+          { required: true, message: '请输入资产原值', trigger: 'blur' }
+        ],
+        productionDate: [
+          { required: true, message: '请选择出厂日期', trigger: 'change' }
+        ],
+        brand: [
+          { required: true, message: '请输入生产厂家', trigger: 'blur' }
+        ],
+        identifyCode: [
+          { required: true, message: '请输入装备原始编码', trigger: 'blur' }
+        ],
+        nextCheckTime: [
+          { required: true, message: '请选择下次维保日期', trigger: 'change' }
+        ],
+        lifespan: [
+          { required: true, message: '请输入装备寿命', trigger: 'blur' }
+        ],
+        deviceType: [
+          { required: true, message: '请选择管理方式', trigger: 'change' }
+        ],
+        deviceCount: [
+          { required: true, message: '请输入装备数量', trigger: 'blur' }
+
+        ],
+        unitName: [
+          { required: true, message: '请输入计数单位', trigger: 'blur' }
+        ],
+        deviceTypeList: [
+          { required: true, message: '请选择装备类型', trigger: 'change' }
+        ],
+        certificateList: [
+          { required: true, message: '请上传合格证', trigger: 'change' }
+        ],
+        inspectionList: [
+          { required: true, message: '请上传检测证书', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  created() {
+    this.firstLevel()
+  },
+  methods: {
+    /**
+     * 获取一级类型
+     */
+    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.processList = this.convertToSubTree(res.data)
+          }
+        })
+      }
+    },
+    processChange(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) {
+
+    },
+    // 返回上一页
+    goBack() {
+      this.$router.go(-1)
+    },
+    deviceTypeChange(val) {
+      if (val === 0) {
+        this.form.deviceCount = '1'
+      }
+    },
+    // 价格输入处理
+    handlePriceInput(v) {
+      this.form.buyPrice = v.replace(/[^\d.]/g, '')
+    },
+    // 处理图片上传变化
+    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')
+    },
+
+    /**
+     * 处理表单提交
+     */
+    async handleSubmit() {
+      console.log(this.form)
+      this.$refs['formRef'].validate(async valid => {
+          if (valid) {
+            const result = await getEquipmentAddIdApi()
+            this.orderId = result.data.id
+            this.form.orderId = this.orderId
+            // 获取数组最后一个元素（最末级分类ID）
+            this.form.typeId = this.form.deviceTypeList[this.form.deviceTypeList.length - 1]
+            const res = await equipmentAddApiNew(this.form)
+            if (res.code === 200) {
+              this.goBack()
+            }
+          }
+        }
+      )
+    },
+    /**
+     * 转换类型数据为树形结构（适用于级联选择器）
+     */
+    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
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.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;
+    font-weight: 600;
+    margin-left: 15px;
+    color: #303133;
+  }
+}
+
+.dialog-content {
+  padding: 10px 0;
+  min-height: 200px; // 确保有足够高度
+}
+
+.goBack-btn:hover {
+  cursor: pointer;
+  color: #33b5a0;
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px; // 按钮间距
+}
+</style>
diff --git a/src/views/EquipmentEntryApply/equipmentInput/edit.vue b/src/views/EquipmentEntryApply/equipmentInput/edit.vue
index e3296ce9..c6dcc74f 100644
--- a/src/views/EquipmentEntryApply/equipmentInput/edit.vue
+++ b/src/views/EquipmentEntryApply/equipmentInput/edit.vue
@@ -238,11 +238,11 @@ export default {
         orderId: ''
       },// 表单校验规则（已移除文件相关校验）
       equipRules: {
-        originaValue: [
-          { required: true, message: '请输入原值', trigger: 'blur' }
+        major: [
+          { required: true, message: '请选择专业', trigger: 'change' }
         ],
-        buyPrice: [
-          { required: true, message: '请输入原值', trigger: 'blur' }
+        process: [
+          { required: true, message: '请选择工序', trigger: 'change' }
         ],
         itemTypeModel: [
           { required: true, message: '请输入规格型号', trigger: 'blur' }
diff --git a/src/views/EquipmentEntryApply/equipmentInput/index.vue b/src/views/EquipmentEntryApply/equipmentInput/index.vue
index bce2ccf7..4caa6059 100644
--- a/src/views/EquipmentEntryApply/equipmentInput/index.vue
+++ b/src/views/EquipmentEntryApply/equipmentInput/index.vue
@@ -1,69 +1,63 @@
 <template>
-  <div class="app-container">
+  <!-- 修复标题模板字符串语法错误，规范属性顺序 -->
+  <!-- 弹窗内容区域 -->
+  <div class="app-container" style="height: calc(100vh - 84px);">
+    <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">装备录入</span>
+      </div>
+      <div class="dialog-footer" style="float: right">
+        <el-button size="small" type="primary" @click="handleSubmit" v-if="!isAddVisible"
+                   :disabled="tableData.length===0"
+        >确认提交
+        </el-button>
+      </div>
+    </div>
     <!-- 商品管理 -->
     <el-form
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      size="default"
-      label-width="0"
+      inline
+      label-width="auto"
+      size="small"
     >
-      <!-- 表单搜索 -->
-      <el-row>
-        <el-col :span="6">
-          <el-form-item prop="deviceName">
-            <el-input
-              v-model.trim="queryParams.deviceName"
-              style="width: 100%"
-              clearable
-              placeholder="请输入装备名称"
-            />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="18">
-          <el-form-item>
-            <el-button class="primary-lease" type="primary" @click="queryTableList">
-              查询
-            </el-button>
-            <el-button
-              class="primary-lease"
-              type="primary"
-              @click="resetTableList"
-            >
-              重置
-            </el-button>
-            <el-button
-              class="primary-lease"
-              type="primary"
-              @click="equipmentDeployment"
-              v-if="!isView"
-            >
-              装备录入
-            </el-button>
-            <el-button
-              class="primary-lease"
-              type="primary"
-              @click="onHandleSubmit"
-              v-if="!isView"
-            >
-              提交申请
-            </el-button>
-            <el-button @click="onHandleBackList" class="primary-lease" type="primary">
-              返回列表
-            </el-button>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-form-item label="装备名称" prop="deviceName">
+        <el-input
+          v-model.trim="queryParams.deviceName"
+          style="width: 100%"
+          clearable
+          placeholder="请输入装备名称"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="queryTableList">
+          查询
+        </el-button>
+        <el-button
+          type="primary"
+          @click="resetTableList"
+        >
+          重置
+        </el-button>
+        <el-button
+          type="primary"
+          @click="equipmentDeployment"
+          v-show="!isAddVisible"
+        >
+          新增装备
+        </el-button>
+      </el-form-item>
     </el-form>
 
     <!-- 表格 -->
     <el-table
       :data="tableData"
       style="width: auto"
-      row-key="maId"
       show-overflow-tooltip
-      :header-cell-style="{ background: '#00a288', color: '#fff' }"
     >
       <el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
       <el-table-column align="center" label="装备名称">
@@ -75,26 +69,29 @@
       <el-table-column align="center" prop="typeName" label="装备类目">
         <template scope="{ row }">
           <span>
-            {{ row.firstName }} <span v-show="row.firstName">></span>
-            {{ row.secondName }}<span v-show="row.secondName">></span>
-            {{ row.thirdName }}
+            {{ row.proType }} <span v-show="row.proType">/</span>
+            {{ row.mainGx }}<span v-show="row.mainGx">/</span>
+            {{ row.childGx }}<span v-show="row.childGx">/</span>
+            {{ row.devCategory }}<span v-show="row.devCategory">/</span>
+            {{ row.devSubcategory }}<span v-show="row.devSubcategory">/</span>
+            {{ row.devName }}
           </span>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="typeName" label="装备型号"/>
+      <el-table-column align="center" prop="devModel" label="装备型号"/>
       <el-table-column align="center" prop="nextCheckDate" label="下次检验日期">
         <template scope="{ row }">
-          <span :style="{ backgroundColor: getUpdateTimeBgColor(row) }">{{
+          <span>{{
               row.nextCheckDate
             }}</span>
         </template>
       </el-table-column>
       <el-table-column align="center" label="装备状态">
         <template scope="{ row }">
-          <el-tag v-if="row.maStatus == 0" size="small" type="info">草稿状态</el-tag>
-          <el-tag v-if="row.maStatus == 1" size="small" type="warning">待上架</el-tag>
-          <el-tag v-if="row.maStatus == 2" size="small" type="success">上架</el-tag>
-          <el-tag v-if="row.maStatus == 3" size="small" type="danger">在租</el-tag>
+          <el-tag v-if="row.entryStatus == 0" size="small" type="info">待审批</el-tag>
+          <el-tag v-if="row.entryStatus == 1" size="small" type="warning">已审批</el-tag>
+          <el-tag v-if="row.entryStatus == 2" size="small" type="success">审批驳回</el-tag>
+          <el-tag v-if="row.entryStatus == 3" size="small" type="danger">草稿</el-tag>
         </template>
       </el-table-column>
       <el-table-column
@@ -102,24 +99,47 @@
         label="操作"
         min-width="160px"
         align="center"
-        v-if="!isView"
+        v-if="!isAddVisible"
       >
         <template scope="{ row }">
           <el-button
-            v-if="row.maStatus == 0 || row.maStatus == 1"
-            size="small"
+            size="mini"
             type="primary"
             @click="editRowInfo(row)"
           >
             编辑
           </el-button>
           <el-button
-            v-if="row.maStatus == 0 || row.maStatus == 1"
             size="small"
             type="danger"
             @click="deleteRowInfo(row)"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column
+        prop="name"
+        label="操作"
+        min-width="160px"
+        align="center"
+        v-if="isApprovalVisible"
+      >
+        <template scope="{ row }">
+          <el-button
+            size="small"
+            type="primary"
+            @click="approval(row,1)"
           >
-            删除
+            通过
+          </el-button>
+          <el-button
+            size="small"
+            type="primary"
+            @click="approval(row,2)"
+          >
+            驳回
           </el-button>
         </template>
       </el-table-column>
@@ -130,663 +150,119 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
     />
-
-
-    <!-- 装备弹框 -->
-    <el-dialog
-      :visible.sync="dialogFormVisibleSettlein"
-      :title="settleinTitle"
-      width="80%"
-      destroy-on-close
-      :close-on-click-modal="false"
-      :before-close="handleClose"
-      @close="onDialogClose"
-    >
-      <el-row
-        :gutter="20"
-        class="mb8"
-        style="display: flex; justify-content: flex-end; align-items: center"
-      >
-        <el-button type="primary" class="primary-lease" @click="closeDialogBtn">
-          关闭
-        </el-button>
-        <el-button
-          type="primary"
-          class="primary-lease"
-          @click="submitBtn"
-          v-if="!disabledForm || isEditDisabled"
-        >
-          提交
-        </el-button>
-      </el-row>
-
-      <TitleTip :titleText="`基本信息`"/>
-      <el-form
-        label-width="180px"
-        ref="addAndEditFormRef"
-        label-position="right"
-        :model="addAndEditForm"
-        :rules="equipRules"
-        :disabled="disabledForm"
-      >
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="装备名称：" prop="deviceName">
-              <el-input
-                autocomplete="off"
-                maxlength="30"
-                v-model="addAndEditForm.deviceName"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="装备类目：" prop="deviceTypeList">
-              <el-cascader
-                v-model="addAndEditForm.deviceTypeList"
-                :show-all-levels="true"
-                :options="deviceTypeTree"
-                :props="partTypeTreeProps"
-                filterable
-                clearable
-                collapse-tags
-                placeholder="请选择装备类目"
-                ref="dialogTypeCascader"
-                @change="dialogTypeChange"
-                style="width: 100%"
-              ></el-cascader>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="装备单位：" prop="unitName">
-              <el-input
-                autocomplete="off"
-                maxlength="20"
-                v-model="addAndEditForm.unitName"
-                clearable
-                :disabled="isDisabled || isEditForm"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="装备品牌" prop="brand">
-              <el-input
-                v-model="addAndEditForm.brand"
-                autocomplete="off"
-                maxlength="20"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="出厂日期：" prop="productionDate">
-              <el-date-picker
-                v-model="addAndEditForm.productionDate"
-                placeholder="请选择出厂日期"
-                value-format="YYYY-MM-DD"
-                type="date"
-                style="width: 100%"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="租赁价格(天/元)：" prop="dayLeasePrice">
-              <el-input
-                @input="handlePriceInput"
-                clearable
-                maxlength="20"
-                placeholder="请输入租赁价格"
-                v-model="addAndEditForm.dayLeasePrice"
-                :disabled="settleinTitle == '新增详情'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="联系人：" prop="person">
-              <el-input
-                v-model="addAndEditForm.person"
-                placeholder="请输入联系人"
-                clearable
-                maxlength="10"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系电话：" prop="personPhone">
-              <el-input
-                v-model="addAndEditForm.personPhone"
-                placeholder="请输入联系电话"
-                clearable
-                maxlength="11"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="上架数量：" prop="deviceCount">
-              <el-input
-                v-model="addAndEditForm.deviceCount"
-                placeholder="请输入上架数量"
-                type="number"
-                clearable
-                maxlength="10"
-                :disabled="typeDisabled"
-              />
-            </el-form-item>
-          </el-col>
-          <!-- 临时录入使用 - start -->
-          <el-col :span="12">
-            <el-form-item label="原值：" prop="buyPrice">
-              <el-input-number
-                v-model="addAndEditForm.buyPrice"
-                placeholder="请输入原值"
-                clearable
-                maxlength="20"
-                :controls="false"
-                align="left"
-                style="width: 100%"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="规格型号：" prop="itemTypeModel">
-              <el-input
-                v-model="addAndEditForm.itemTypeModel"
-                placeholder="请输入规格型号"
-                clearable
-                maxlength="11"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="管理方式：" prop="deviceType">
-              <!-- 0 编码 1 数量 -->
-              <el-select
-                v-model="addAndEditForm.deviceType"
-                placeholder="请选择管理方式"
-                clearable
-                style="width: 100%"
-                :disabled="!isAdd"
-              >
-                <el-option label="编码" :value="0"/>
-                <el-option label="数量" :value="1"/>
-              </el-select>
-              <span style="color: red"
-              >说明：编码管理按一台一台管理，一台设备一个唯一编码，数量管理支持同规格型号批量录入，一般小型工器具。</span
-              >
-            </el-form-item>
-          </el-col>
-          <!-- 临时录入使用 - end -->
-        </el-row>
-
-        <!-- 9.15新增 -->
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="标准使用时间：" prop="expirationTime">
-              <el-date-picker
-                type="date"
-                style="width: 100%"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择标准使用时间"
-                v-model="addAndEditForm.expirationTime"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <div>
-          <el-row
-            v-for="(item, index) in chunkedItems"
-            :key="index"
-            :model="item"
-            class="dynamic-item"
-            :gutter="20"
-            style="display: flex; margin-top: 10px; justify-content: left"
-          >
-            <el-col v-for="(itemTemp, indexTemp) in item" :key="indexTemp" :span="12">
-              <el-form-item :label="itemTemp.propertyName + '：'">
-                <el-input
-                  v-model="itemTemp.propertyValue"
-                  placeholder="请输入"
-                  maxlength="20"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-
-        <div style="display: flex; align-items: center">
-          <TitleTip :titleText="`装备证书信息`"/>
-          <el-button
-            size="mini"
-            type="primary"
-            @click="handleAddBack"
-            style="margin-left: 20px; margin-top: 20px"
-            :disabled="!addAndEditForm.deviceTypeList"
-            v-if="settleinTitle == '新增装备'"
-          >添加
-          </el-button>
-        </div>
-      </el-form>
-
-      <el-table :data="equipTableList" width="100%" height="450px" border>
-        <el-table-column label="序号" type="index" width="55" align="center"/>
-        <el-table-column
-          prop="identifyCode"
-          align="center"
-          :show-overflow-tooltip="true"
-          width="260"
-        >
-          <template #header>
-            <div style="display: flex; flex-direction: column; align-items: center">
-              <span>唯一标识符</span>
-              <span style="font-size: 10px; color: #999">
-                WHMY-DLSSJ-JSD5B-2025070101：<br/>
-                公司简称首字母-设备名称首字母-设备型号-YYYYMMDD序号
-              </span>
-            </div>
-          </template>
-          <template #default="scope">
-            <el-input
-              v-model="scope.row.identifyCode"
-              style="width: 100%"
-              placeholder="请输入唯一标识符"
-              maxlength="20"
-              :disabled="disabledForm"
-            ></el-input>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          label="检修人"
-          prop="checkMan"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
-          <template #default="scope">
-            <el-input
-              v-model="scope.row.checkMan"
-              controls-position="right"
-              style="width: 100%"
-              placeholder="请输入检修人"
-              :disabled="disabledForm"
-            ></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="检修时间"
-          prop="checkDate"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
-          <template #default="scope">
-            <el-date-picker
-              v-model="scope.row.checkDate"
-              value-format="YYYY-MM-DD"
-              type="date"
-              placeholder="请选择"
-              @change="changeDate(scope.row, scope.$index)"
-              style="width: 100%"
-              :disabled="disabledForm"
-            ></el-date-picker>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          label="下次检测时间"
-          prop="nextCheckDate"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
-          <template #default="scope">
-            <el-date-picker
-              v-model="scope.row.nextCheckDate"
-              value-format="YYYY-MM-DD"
-              type="date"
-              placeholder="请选择"
-              style="width: 100%"
-              @change="changeNextDate(scope.row)"
-              :disabled="disabledForm"
-            ></el-date-picker>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          label="操作"
-          align="center"
-          width="100px"
-          v-if="settleinTitle == '新增装备'"
-        >
-          <template #default="scope">
-            <div
-              style="
-                width: 100%;
-                height: 40px;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-              "
-            >
-              <el-button
-                size="small"
-                type="danger"
-                @click="handleDeleteBack(scope.$index)"
-                v-show="scope.$index != 0"
-              >删除
-              </el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-
-    <!-- 图片查看弹窗已移除 -->
+    <EquipmentEntryEditDialog
+      :is-visible.sync="isEditVisible"
+      :order-id="orderId"
+      @getOrderId="getOrderId"
+    />
   </div>
+
+
 </template>
 
 <script>
-import { mapState } from 'vuex'
-import TitleTip from '@/components/TitleTip/index.vue'
+import EquipmentEntryEditDialog from '@/views/EquipmentEntryApply/equipmentInput/edit.vue'
+
+// 使用defineComponent规范组件定义
 import {
-  equipmentAddApiNew,
-  equipmentEditApiNew,
-  equipmentEditApi,
-  removeDeviceApi,
-  getDetailApi,
-  updateUpDownApi,
-  getCompanyListApi,
-  getEquipmentTypeApi,
-  getEquipmentAddIdApi,
+  equipmentDraftListApiNew,
+  equipmentPassAndRejectApiNew,
   equipmentSubmitApiNew,
-  equipmentDraftListApiNew
-} from '@/api/EquipmentEntryApply/index'
+  removeDeviceApi
+} from '@/api/EquipmentEntryApply'
 
 export default {
-  components: {
-    TitleTip
-  },
-  props: {
-    isView: {
-      type: Boolean,
-      default: false
-    },
-    orderIds: {
-      type: String,
-      default: ''
-    }
+  name: 'EquipmentEntryDialog',
+  components: { EquipmentEntryEditDialog },
+  emits: ['update:isVisible', 'submit'], // 声明事件
+  created() {
+    console.log(this.$route)
+    this.orderId = this.$route.params && this.$route.params.orderId
+    this.isAddVisible = this.$route.params && this.$route.params.isAddVisible
+    this.isApprovalVisible = this.$route.params && this.$route.params.isApprovalVisible
+    this.getList()
   },
   data() {
     return {
+      isAddVisible: false,
+      isApprovalVisible: false,
+      isEditVisible: false,
+      orderId: '',
       // 表格数据
       tableData: [],
       total: 0,
-      // 查询参数
       queryParams: {
+        orderId: '',
         deviceName: '',
-        pageSize: 10,
         pageNum: 1,
-        orderId: ''
+        pageSize: 10
       },
-      // 设备类型树
-      deviceTypeTree: [],
-      partTypeTreeProps: {
-        children: 'children',
-        label: 'name'
-      },
-      // 表单相关
-      dialogFormVisibleSettlein: false,
-      settleinTitle: '',
-      isAdd: true,
-      isMaStatus: false,
-      disabledForm: false,
-      isEditDisabled: false,
-      isViewForm: false,
-      isEditForm: false,
-      maId: '',
-      warningDays: 0,
-      companyDataList: [],
-      // 装备表单数据
-      addAndEditForm: {
-        deviceName: '',
-        deviceTypeList: [],
-        deviceCount: 1,
-        originaValue: '',
-        itemTypeModel: '',
-        deviceType: '',
-        buyPrice: '',
-        unitName: '',
-        code: '',
-        brand: '',
-        typeId: '',
-        companyId: '',
-        productionDate: '',
-        dayLeasePrice: '',
-        person: '',
-        personPhone: '',
-        deviceWeight: '',
-        checkDate: '',
-        checkCycle: '',
-        devInfoProperties: [],
-        tableList: [],
-        isZone: true,
-        zoneId: '',
-        expirationTime: '',
-        orderId: ''
-      },
-      // 表单校验规则（已移除文件相关校验）
-      equipRules: {
-        originaValue: [
-          { required: true, message: '请输入原值', trigger: 'blur' }
-        ],
-        buyPrice: [
-          { required: true, message: '请输入原值', trigger: 'blur' }
-        ],
-        itemTypeModel: [
-          { required: true, message: '请输入规格型号', trigger: 'blur' }
-        ],
-        deviceType: [
-          { required: false, message: '请选择管理方式', trigger: 'change' }
-        ],
-        deviceName: [
-          { required: true, message: '请输入装备名称', trigger: 'blur' }
-        ],
-        deviceTypeList: [
-          { required: true, message: '请选择装备类目', trigger: 'change' }
-        ],
-        deviceCount: [
-          { required: true, message: '请输入上架数量', trigger: 'blur' }
-        ],
-        unitName: [
-          { required: true, message: '装备单位不可为空', trigger: 'blur' }
-        ],
-        brand: [
-          { required: true, message: '请输入装备品牌', trigger: 'blur' }
-        ],
-        code: [
-          { required: true, message: '请输入装备编号', trigger: 'change' }
-        ],
-        companyId: [
-          { required: true, message: '请选择所属公司', trigger: 'change' }
-        ],
-        productionDate: [
-          { required: true, message: '请选择出厂日期', trigger: 'change' }
-        ],
-        dayLeasePrice: [
-          { required: true, message: '请输入日租金', trigger: 'blur' }
-        ],
-        expirationTime: [
-          { required: true, trigger: 'change', message: '请选择标准使用时间' }
-        ],
-        person: [
-          { required: true, message: '联系人不能为空', trigger: 'blur' }
-        ],
-        checkDate: [
-          { required: true, message: '校验日期不能为空', trigger: 'blur' }
-        ],
-        checkCycle: [
-          { required: true, message: '校验周期不能为空', trigger: 'blur' }
-        ],
-        personPhone: [
-          { required: true, message: '联系电话不能为空', trigger: 'blur' },
-          { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
-        ]
-      },
-      // 其他状态
-      countDisabled: false,
-      dialogTypeCascader: null,
-      isDisabled: false,
-      typeDisabled: false,
-      descriptionFormList: [
-        {
-          newId: Date.now()
-        }
-      ],
-      descriptionFormRefList: [],
-      descriptionRules: {
-        identifyCode: [
-          { required: true, message: '请填写装备唯一标识符', trigger: 'blur' }
-        ]
-      },
-      propertyNames: [],
-      options: [],
-      orderId: '',
-      chunkedItems: [],
-      equipTableList: [
-        {
-          id: '',
-          identifyCode: '',
-          checkMan: '',
-          checkDate: '',
-          nextCheckDate: ''
-        }
-      ],
-      headerInfo: {
-        Authorization: 'Bearer ' + this.$store.state.token
+      // 可添加表单数据
+      formData: {
+        // 示例字段，可根据实际需求修改
+        equipmentName: '',
+        model: '',
+        quantity: 1
       }
     }
   },
-  computed: {
-    ...mapState(['token'])
-  },
   watch: {
-    propertyNames: {
-      handler(val) {
-        this.chunkedItems = []
-        for (let i = 0; i < val.length; i += 2) {
-          this.chunkedItems.push(val.slice(i, i + 2))
-        }
-      },
-      deep: true,
-      immediate: true
+    isVisible(val) {
+      if (val) {
+        this.getList()
+      }
     }
   },
   methods: {
+    // 返回上一页
+    goBack() {
+      this.$router.go(-1)
+    },
+    async approval(row, status) {
+      equipmentPassAndRejectApiNew({ devIds: row.maId, status: status, id: this.orderId }).then(res => {
+        if (res.code === 200) {
+          this.$message({
+            type: 'success',
+            message: '操作成功'
+          })
+          this.getList()
+        }
+      })
+    },
     // 获取列表数据
     async getList() {
       try {
+        this.queryParams.orderId = this.orderId
         const res = await equipmentDraftListApiNew(this.queryParams)
-        this.tableData = res.rows
-        this.total = res.total
+        this.tableData = res.data.rows
+        this.total = res.data.total
       } catch (error) {
         console.error('获取列表失败:', error)
       }
     },
+
+    getOrderId(data) {
+      this.orderId = data.orderId
+      this.queryTableList()
+    },
+
     // 查询表格数据
     queryTableList() {
       this.queryParams.pageNum = 1
       this.getList()
     },
-    // 重置表格查询
-    resetTableList() {
-      this.$refs.queryFormRef.resetFields()
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    // 打开入驻弹框
-    equipmentDeployment(row) {
-      this.dialogFormVisibleSettlein = true
-      this.isAdd = !row
-      this.settleinTitle = row ? '装备编辑' : '新增装备'
-
-      this.getTypeTreeData()
-
-      if (row) {
-        this.getDetailData(row)
-        this.isEditForm = true
-      } else {
-        this.addAndEditForm = {
-          deviceName: '',
-          deviceTypeList: [],
-          deviceCount: 1,
-          originaValue: '',
-          itemTypeModel: '',
-          deviceType: '',
-          buyPrice: '',
-          unitName: '',
-          code: '',
-          brand: '',
-          typeId: '',
-          companyId: '',
-          productionDate: '',
-          dayLeasePrice: '',
-          person: '',
-          personPhone: '',
-          deviceWeight: '',
-          checkDate: '',
-          checkCycle: '',
-          devInfoProperties: [],
-          tableList: [],
-          isZone: true,
-          zoneId: '',
-          expirationTime: '',
-          orderId: this.orderId || ''
+    equipmentDeployment() {
+      this.$router.push({
+        name: 'equipmentInputAdd',  // 完整路径
+        params: {  // 因为使用path，所以用query传递参数
+          orderId: this.orderId
         }
-        this.equipTableList = [
-          {
-            id: '',
-            identifyCode: '',
-            checkMan: '',
-            checkDate: '',
-            nextCheckDate: ''
-          }
-        ]
-        this.propertyNames = []
-        this.isEditForm = false
-      }
-    },
-    // 编辑按钮
-    editRowInfo(row) {
-      this.isAdd = false
-      this.settleinTitle = '装备编辑'
-      this.getDetailData(row)
-      this.isMaStatus = true
-      this.disabledForm = false
-      this.isEditDisabled = true
-      this.isViewForm = false
-      this.isEditForm = true
-    },
-    // 查看按钮
-    previewRowInfo(row) {
-      this.isAdd = false
-      this.settleinTitle = '装备详情'
-      this.getDetailData(row)
-      this.disabledForm = true
-      this.isEditDisabled = false
-      this.isViewForm = true
-      this.isEditForm = false
+      })
     },
+
     // 删除按钮
     async deleteRowInfo(row) {
-      ElMessageBox.confirm('是否确定删除？', {
+      this.$confirm('是否确定删除？', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -796,7 +272,7 @@ export default {
         })
         .then(res => {
           if (res.code === 200) {
-            ElMessage({
+            this.$message({
               type: 'success',
               message: '删除成功'
             })
@@ -806,521 +282,58 @@ export default {
         .catch(() => {
         })
     },
-    // 获取详情接口
-    async getDetailData(row) {
-      await this.getTypeTreeData()
-      const { data: res } = await getDetailApi(row.maId)
-      const {
-        deviceName,
-        deviceCount,
-        originaValue,
-        itemTypeModel,
-        deviceType,
-        buyPrice,
-        unitName,
-        code,
-        brand,
-        typeId,
-        companyId,
-        productionDate,
-        dayLeasePrice,
-        person,
-        personPhone,
-        deviceWeight,
-        checkDate,
-        checkCycle,
-        devInfoProperties,
-        tableList,
-        maintenanceAlarmDay,
-        isZone,
-        zoneId,
-        expirationTime
-      } = res
-
-      this.addAndEditForm = {
-        ...this.addAndEditForm,
-        deviceName,
-        deviceCount,
-        originaValue,
-        itemTypeModel,
-        deviceType,
-        buyPrice,
-        unitName,
-        code,
-        brand,
-        typeId,
-        companyId,
-        productionDate,
-        dayLeasePrice,
-        person,
-        personPhone,
-        deviceWeight,
-        checkDate,
-        checkCycle,
-        devInfoProperties,
-        tableList,
-        isZone,
-        zoneId,
-        expirationTime,
-        maId: row.maId
-      }
-
-      this.descriptionFormList = [
-        {
-          newId: Date.now()
-        }
-      ]
-
-      this.options = []
-      this.addAndEditForm.deviceTypeList = this.getSelectId(this.deviceTypeTree, this.addAndEditForm.typeId)
-      this.warningDays = this.addAndEditForm.maintenanceAlarmDay
-      this.propertyNames = this.addAndEditForm.devInfoProperties || []
-
-      this.equipTableList = []
-      if (this.isEditForm) {
-        if (this.addAndEditForm.tableList) {
-          this.addAndEditForm.tableList.forEach(item => {
-            this.equipTableList.push({
-              id: item.id,
-              identifyCode: item.identifyCode,
-              checkMan: item.checkMan,
-              checkDate: item.checkDate,
-              nextCheckDate: item.nextCheckDate
-            })
-          })
-        } else {
-          this.equipTableList = [
-            {
-              id: '',
-              identifyCode: '',
-              checkMan: '',
-              checkDate: '',
-              nextCheckDate: ''
-            }
-          ]
-        }
-      } else {
-        if (this.addAndEditForm.tableList) {
-          this.addAndEditForm.tableList.forEach(item => {
-            this.equipTableList.push({
-              id: item.id,
-              identifyCode: item.identifyCode,
-              checkMan: item.checkMan,
-              checkDate: item.checkDate,
-              nextCheckDate: item.nextCheckDate
-            })
-          })
-        } else {
-          this.equipTableList = []
-        }
-      }
-
-      this.dialogFormVisibleSettlein = true
-    },
-    // 获取选中的ID
-    getSelectId(tree, id) {
-      let result = []
-      const findNode = (nodes, targetId) => {
-        for (const node of nodes) {
-          if (node.id === targetId) {
-            result.unshift(node.id)
-            return true
-          }
-          if (node.children && node.children.length > 0) {
-            if (findNode(node.children, targetId)) {
-              result.unshift(node.id)
-              return true
-            }
-          }
-        }
-        return false
-      }
-      findNode(tree, id)
-      return result
-    },
-    // 上下架（批量）
-    handleUpdateUpDown(row, maStatus) {
-      ElMessageBox.confirm('是否确定操作', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          let maIds = []
-          if (!row) {
-            maIds = this.ids.map(item => item.maId)
-          } else {
-            maIds.push(row.maId)
-          }
-          if (maIds.length === 0) {
-            ElMessage({ type: 'error', message: '请选择要操作的数据' })
-            return
-          }
-          return updateUpDownApi({ maIds, maStatus })
-        })
-        .then(res => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '操作成功'
-            })
-            this.getList()
-          }
-        })
-        .catch(() => {
-        })
-    },
-    // 获取所属公司下拉数据
-    async getCompanyList() {
-      const res = await getCompanyListApi()
-      this.companyDataList = res.data
-    },
-    // 获取设备类型树
-    async getTypeTreeData() {
-      const res = await getEquipmentTypeApi()
-      this.deviceTypeTree = res.data
-    },
-    // 装备类目-change
-    async dialogTypeChange() {
-      this.options = []
-      const cascader = this.$refs.dialogTypeCascader
-      const deviceTypeList = cascader.getCheckedNodes()
-
-      if (deviceTypeList.length > 0) {
-        this.warningDays = deviceTypeList[0].data.maintenanceAlarmDay
-
-        if (deviceTypeList[0].data.deviceType === 0) {
-          this.addAndEditForm.deviceCount = 1
-          this.typeDisabled = true
-        } else {
-          this.addAndEditForm.deviceCount = 1
-          this.typeDisabled = false
-        }
-
-        if (!deviceTypeList[0].data.maTypeProperties) {
-          this.propertyNames = []
-        } else {
-          this.propertyNames = []
-          deviceTypeList[0].data.maTypeProperties.forEach(item => {
-            this.propertyNames.push({ propertyName: item.propertyName, propertyValue: '' })
-            this.options.push({ label: item.propertyName, value: item.propertyName })
-          })
-        }
-
-        this.isDisabled = true
-        this.addAndEditForm.unitName = deviceTypeList[0].data.unitName
-        this.addAndEditForm.dayLeasePrice = deviceTypeList[0].data.leasePrice
-        this.$refs.addAndEditFormRef.clearValidate(['unitName', 'dayLeasePrice'])
-
-        this.equipTableList = [
-          {
-            id: '',
-            identifyCode: '',
-            checkMan: '',
-            checkDate: '',
-            nextCheckDate: ''
-          }
-        ]
-      }
-    },
-    // 价格输入处理
-    handlePriceInput(v) {
-      this.addAndEditForm.dayLeasePrice = v.replace(/[^\d.]/g, '')
-    },
-    // 弹框保存提交
-    submitBtn() {
-      this.submitFun(this.isEditForm ? 3 : 1)
-    },
-    // 提交函数
-    submitFun(type) {
-      this.$refs.addAndEditFormRef.validate(async valid => {
-        if (valid) {
-          let isDescription = false
-
-          this.addAndEditForm.tableList = this.equipTableList
-
-          if (type !== 2 && type !== 4) {
-            for (let i = 0; i < this.addAndEditForm.tableList.length; i++) {
-              const row = this.addAndEditForm.tableList[i]
-              for (const key in row) {
-                if (
-                  row.hasOwnProperty(key) &&
-                  (row[key] === null || row[key] === '' || (row[key] && row[key].length === 0)) &&
-                  key !== 'id'
-                ) {
-                  let fieldName = ''
-                  switch (key) {
-                    case 'identifyCode':
-                      fieldName = '唯一标识符'
-                      break
-                    case 'checkMan':
-                      fieldName = '检修人'
-                      break
-                    case 'checkDate':
-                      fieldName = '检修日期'
-                      break
-                    case 'nextCheckDate':
-                      fieldName = '下次检修日期'
-                      break
-                    default:
-                      fieldName = key
-                  }
-                  ElMessage({
-                    type: 'error',
-                    message: `第 ${i + 1} 行的 ${fieldName} 字段不能为空`
-                  })
-                  isDescription = true
-                  return
-                }
-              }
-            }
-          }
-
-          if (isDescription) return
-
-          this.addAndEditForm.devInfoProperties = this.propertyNames
-          if (this.addAndEditForm.deviceTypeList.length > 0) {
-            this.addAndEditForm.typeId = this.addAndEditForm.deviceTypeList[this.addAndEditForm.deviceTypeList.length - 1]
-          }
-
-          let SEND_FUN_API = null
-          if (type === 1) {
-            SEND_FUN_API = equipmentAddApiNew
-            this.addAndEditForm.maStatus = 1
-            this.addAndEditForm.type = 1
-          }
-          if (type === 2) {
-            SEND_FUN_API = equipmentAddApiNew
-            this.addAndEditForm.maStatus = 0
-            this.addAndEditForm.type = 2
-          }
-          if (type === 3) {
-            SEND_FUN_API = equipmentEditApiNew
-            this.addAndEditForm.maStatus = 1
-            this.addAndEditForm.type = 3
-          }
-          if (type === 4) {
-            SEND_FUN_API = equipmentEditApi
-            this.addAndEditForm.maStatus = 0
-            this.addAndEditForm.type = 4
-          }
-
-          try {
-            if (!this.orderId) {
-              const result = await getEquipmentAddIdApi()
-              this.orderId = result.data.id
-              this.addAndEditForm.orderId = this.orderId
-              this.queryParams.orderId = this.orderId
-
-              const res = await SEND_FUN_API(this.addAndEditForm)
-              if (res.code === 200) {
-                this.handleSuccessSubmit()
-              }
-            } else {
-              this.addAndEditForm.orderId = this.orderId
-              this.queryParams.orderId = this.orderId
-
-              const res = await SEND_FUN_API(this.addAndEditForm)
-              if (res.code === 200) {
-                this.handleSuccessSubmit()
-              }
-            }
-          } catch (error) {
-            console.error('提交失败:', error)
-          }
-        } else {
-          console.log('校验失败')
-        }
-      })
-    },
-    // 提交成功处理
-    handleSuccessSubmit() {
-      ElMessage({
-        type: 'success',
-        message: '保存成功',
-        duration: 1000
-      })
-      this.propertyNames = []
-      this.dialogFormVisibleSettlein = false
+    // 重置表格查询
+    resetTableList() {
+      this.$refs.queryFormRef.resetFields()
+      this.queryParams.pageNum = 1
       this.getList()
     },
-    // 保存草稿
-    saveTemp() {
-      this.submitFun(this.isMaStatus ? 4 : 2)
-    },
-    // 关闭按钮
-    closeDialogBtn() {
-      this.getTypeTreeData()
-      this.dialogFormVisibleSettlein = false
-    },
-    // 关闭对话框
-    handleClose(done) {
-      done()
-      this.propertyNames = []
-      this.dialogFormVisibleSettlein = false
-    },
-    // 添加装备证书行
-    handleAddBack() {
-      const obj = {
-        identifyCode: '',
-        checkMan: '',
-        checkDate: '',
-        nextCheckDate: ''
-      }
-      this.equipTableList.push(obj)
-    },
-    // 删除行
-    handleDeleteBack(index) {
-      this.equipTableList.splice(index, 1)
-    },
-    // 日期变更
-    changeDate(row, index) {
-      const currentDate = new Date(row.checkDate)
-      const nextYearDate = dayjs(currentDate).add(1, 'year').subtract(1, 'day').toDate()
-      this.equipTableList[index].nextCheckDate = dayjs(nextYearDate).format('YYYY-MM-DD')
-    },
-    // 下次日期变更
-    changeNextDate(row) {
-      if (row.checkDate && row.nextCheckDate) {
-        if (dayjs(row.checkDate).isAfter(row.nextCheckDate)) {
-          ElMessage({
-            type: 'error',
-            message: '下次检修时间不能早于检修时间'
+
+    /**
+     * 处理表单提交
+     */
+    handleSubmit() {
+      equipmentSubmitApiNew({ id: this.orderId, status: 0 }).then(res => {
+        if (res.code === 200) {
+          this.$message({
+            type: 'success',
+            message: '提交成功'
           })
-          row.nextCheckDate = ''
+          this.goBack()
         }
-      }
-    },
-    // 获取更新时间背景色
-    getUpdateTimeBgColor(row) {
-      const checkDate = new Date()
-      const nextCheckDate = new Date(row.nextCheckDate)
+      })
 
-      const diffTime = Math.abs(nextCheckDate - checkDate)
-      const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
-
-      if (checkDate < nextCheckDate && diffDays <= 30) {
-        return '#FFFFCC'
-      } else if (checkDate > nextCheckDate) {
-        return '#FFCCCC'
-      }
-      return ''
-    },
-    // 返回列表
-    onHandleBackList() {
-      this.$emit('backList')
-    },
-    // 提交申请
-    async onHandleSubmit() {
-      if (!this.queryParams.orderId) {
-        ElMessage({
-          message: '请先添加设备',
-          type: 'error'
-        })
-        return
-      }
-
-      const res = await equipmentSubmitApiNew({ id: this.queryParams.orderId, status: 0 })
-      if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '提交成功'
-        })
-        this.$emit('backList')
-      }
-    }
-  },
-  mounted() {
-    this.getCompanyList()
-    this.getTypeTreeData()
-
-    if (this.orderIds) {
-      this.queryParams.orderId = this.orderIds
-      this.addAndEditForm.orderId = this.orderIds
-      this.getList()
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.el-form {
-  // margin: 15px 0;
-}
-
-.title {
-  margin: 10px;
-  margin-left: 20px;
+.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;
 
-.title-sign {
-  display: inline-block;
-  width: 4px;
-  height: 16px;
-  background: #00a288;
-}
-
-.title-text {
-  font-weight: 700;
-  margin-left: 10px;
-}
-
-.tipBox {
-  color: red;
-  font-size: 12px;
-  margin-left: 20px;
-}
-
-:deep .el-form--inline .el-form-item {
-  margin-right: 6px;
-  width: 95%;
-}
-
-:deep .upload-tip .el-form-item__label {
-  color: transparent;
-}
-
-.app-container-content {
-  :deep .el-dialog {
-    display: flex !important;
-    flex-direction: column !important;
-    margin: 0 !important;
-    position: absolute !important;
-    top: 5vh !important;
-    left: 50% !important;
-    transform: translate(-50%, 0%) !important;
-    height: 90vh;
-
-    .el-dialog__body {
-      flex: 1;
-      overflow-y: scroll !important;
-
-      .el-table__header-wrapper .el-checkbox {
-        display: none !important;
-      }
-    }
-
-    .dialog-content {
-      padding: 20px;
-    }
+  .page-title {
+    font-size: 18px;
+    font-weight: 600;
+    margin-left: 15px;
+    color: #303133;
   }
 }
 
-:deep .el-button--primary {
-  background-color: #3cb4a6 !important;
-  border-color: #3cb4a6 !important;
+.dialog-content {
+  padding: 10px 0;
+  min-height: 200px; // 确保有足够高度
 }
 
-:deep .el-button--primary:hover,
-:deep .el-button--primary:focus,
-:deep .el-button--primary:active {
-  background-color: #2fa18f !important;
-  border-color: #2fa18f !important;
-}
-
-:deep .el-input-number .el-input__inner {
-  text-align: left !important;
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px; // 按钮间距
 }
 </style>
diff --git a/src/views/EquipmentEntryApply/index.vue b/src/views/EquipmentEntryApply/index.vue
index 2e97132f..4cbe16b5 100644
--- a/src/views/EquipmentEntryApply/index.vue
+++ b/src/views/EquipmentEntryApply/index.vue
@@ -19,7 +19,7 @@
                 v-model="queryParams.status"
               >
                 <el-option label="待审批" value="0"/>
-                <el-option label="已审批" value="2"/>
+                <el-option label="已审批" value="1"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -34,7 +34,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="5" style="float:right;">
+          <el-col :span="4" style="float:right;">
             <el-form-item>
               <el-button class="primary-lease" type="primary" @click="getEquipmentApplyList">
                 查询
@@ -61,27 +61,35 @@
           <el-table-column prop="devCount" label="设备数量" align="center"/>
           <el-table-column prop="status" align="center" label="审批状态">
             <template slot-scope="{ row }">
-              <el-tag v-if="row.status == 0" size="small" type="info">待审批</el-tag>
-              <el-tag v-if="row.status == 1" size="small" type="warning">已审批</el-tag>
-              <el-tag v-if="row.status == 3" size="small" type="success">草稿</el-tag>
+              <el-tag v-if="row.status == 0" size="small" type="warning">审批中</el-tag>
+              <el-tag v-if="row.status == 1" size="small" type="success">已审批</el-tag>
+              <el-tag v-if="row.status == 3" size="small" type="info">草稿</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center">
+          <el-table-column prop="agree" label="已通过数量" align="center"/>
+          <el-table-column prop="reject" label="已驳回数量" align="center"/>
+          <el-table-column label="操作" align="center" min-width="100">
             <template slot-scope="{ row }">
-              <el-button type="primary" size="small" @click="showEquipmentInput(row.id, true)">
-                查看
+              <el-button type="success" size="mini" @click="showEquipmentInput(row.id, true)">
+                <i class="el-icon-view"></i> 查看
               </el-button>
               <el-button
                 type="primary"
-                size="small"
+                size="mini"
                 @click="showEquipmentInput(row.id, false)"
-                v-if="row.status == '3'"
+                v-if="row.status === '3'"
               >
-                编辑
+                <i class="el-icon-edit"></i> 编辑
               </el-button>
-<!--              <el-button type="primary" size="small"  v-if="row.status == '0'" @click="deleteItem(row)">
-                删除
-              </el-button>-->
+              <el-button
+                type="danger"
+                size="mini"
+                @click="deleteItem(row)"
+                v-if="row.status === '3'"
+              >
+                <i class="el-icon-delete"></i> 删除
+              </el-button>
+
             </template>
           </el-table-column>
         </el-table>
@@ -95,19 +103,19 @@
         />
       </el-form>
     </template>
-    <EquipmentEntryDialog
-      :is-visible.sync="isVisible"
-      :order-id="orderId"
-      :is-add-visible="isAddVisible"
-      :is-approval-visible="true"
-      @submit="getEquipmentApplyList"
-    />
+    <!--    <EquipmentEntryDialog
+          :is-visible.sync="isVisible"
+          :order-id="orderId"
+          :is-add-visible="isAddVisible"
+          :is-approval-visible="true"
+          @submit="getEquipmentApplyList"
+        />-->
   </div>
 </template>
 
 <script>
 import { getEquipmentApplyListApi, equipmentDelApiNew } from '@/api/EquipmentEntryApply/index'
-import EquipmentEntryDialog from '@/views/EquipmentEntryApply/equipmentInput/index1.vue'
+import EquipmentEntryDialog from '@/views/EquipmentEntryApply/equipmentInput/index.vue'
 
 export default {
   components: {
@@ -165,11 +173,23 @@ export default {
     /**
      * 显示装备录入/编辑/查看界面
      */
-    showEquipmentInput(orderId, isAddVisible) {
-      this.orderId = orderId
-      this.isVisible = true
-      this.isAddVisible = isAddVisible
+    /*  showEquipmentInput(orderId, isAddVisible) {
+       this.orderId = orderId
+       this.isVisible = true
+       this.isAddVisible = isAddVisible
 
+     }, */
+
+    // 点击事件处理函数 - 实现页面跳转
+    showEquipmentInput(orderId, isAddVisible) {
+      this.$router.push({
+        name: 'equipmentInput',  // 完整路径
+        params: {  // 因为使用path，所以用query传递参数
+          orderId: orderId,
+          isAddVisible: isAddVisible,
+          isApprovalVisible: false
+        }
+      })
     },
 
     /**
@@ -203,6 +223,24 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.view-btn {
+  color: #409eff;
+  font-size: 14px;
+  font-weight: bold;
+}
+
+.edit-btn {
+  color: #67c23a;
+  font-size: 12px;
+  font-weight: bold;
+}
+
+.delete-btn {
+  color: #f56c6c;
+  font-size: 16px;
+  font-weight: bold;
+}
+
 .app-container {
   padding: 20px;
 }
diff --git a/src/views/EquipmentEntryApproval/index.vue b/src/views/EquipmentEntryApproval/index.vue
index e243d5bb..515c98f2 100644
--- a/src/views/EquipmentEntryApproval/index.vue
+++ b/src/views/EquipmentEntryApproval/index.vue
@@ -95,7 +95,7 @@
 
 <script>
 import { getEquipmentApplyListApi, equipmentDelApiNew } from '@/api/EquipmentEntryApply/index'
-import EquipmentEntryDialog from '@/views/EquipmentEntryApply/equipmentInput/index1.vue'
+import EquipmentEntryDialog from '@/views/EquipmentEntryApply/equipmentInput/index.vue'
 
 export default {
   components: {
diff --git a/src/views/EquipmentLedger/index.vue b/src/views/EquipmentLedger/index.vue
index 12a5be65..b7f549ce 100644
--- a/src/views/EquipmentLedger/index.vue
+++ b/src/views/EquipmentLedger/index.vue
@@ -1,12 +1,15 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20" class="main-content">
-      <el-col :span="5">
-        <div class="card-container">
-          <div class="card-header">
+    <el-row :gutter="24" class="main-content" type="justify">
+      <el-col :span="collapsed ? 1: 5" class="tree-column">
+        <div class="card-container" v-if="!collapsed">
+          <div class="card-header" v-if="!collapsed">
+            <!-- 只有在未折叠状态显示标题 -->
             <span class="card-title">装备分类</span>
           </div>
+          <!-- 树组件，折叠时隐藏 -->
           <el-tree
+            v-if="!collapsed"
             :data="treeData"
             :props="defaultProps"
             :indent="6"
@@ -15,11 +18,22 @@
             class="tree-container"
             :loading="treeLoading"
           />
+
+
+        </div>
+        <div   style="position: relative;width:20px;height: calc(100vh - 130px);margin-left: 5px">
+          <!-- 右侧折叠/展开按钮 -->
+          <el-button
+            icon="el-icon-d-arrow-left"
+            size="mini"
+            @click="toggleCollapse"
+            class="collapse-btn"
+            :icon="collapsed ? 'el-icon-d-arrow-right' : 'el-icon-d-arrow-left'"
+          />
         </div>
       </el-col>
-
       <!-- 右侧列表和查询区域 -->
-      <el-col :span="19" style="height: calc(100vh - 130px);">
+      <el-col :span="collapsed ?23:19" style="height: calc(100vh - 130px);transition: all 0.3s ease;">
         <div class="card-container">
           <div class="card-header">
 
@@ -218,21 +232,6 @@
             @selection-change="handleSelectionChange"
             :loading="tableLoading"
           >
-
-
-
-
-            <el-table-column type="expand">
-              <template slot-scope="props">
-                <el-row :gutter="24" v-for="item in props.row.propertyVoList">
-                  <el-col :span="8" v-show="item.propertyName && item.propertyValue"
-                          style="font-size: 16px;padding: 10px;margin-left: 60px"
-                  >
-                    {{ item.propertyName }} : {{ item.propertyValue }}
-                  </el-col>
-                </el-row>
-              </template>
-            </el-table-column>
             <el-table-column
               align="center"
               show-overflow-tooltip
@@ -324,6 +323,41 @@
             />
             <el-table-column align="center" show-overflow-tooltip prop="brand" label="生产厂商" min-width="300"
             />
+            <!-- 动态生成特征项和特征值列 -->
+            <template v-for="item in tableColumns">
+              <el-table-column
+                :key="`item-${item}`"
+                align="center"
+                show-overflow-tooltip
+                :label="`特征项${item}`"
+                width="120"
+              >
+                <template slot-scope="{ row }">
+                  <span
+                    v-if="row.propertyVoList && row.propertyVoList.length > 0 && item - 1 < row.propertyVoList.length"
+                  >
+                    {{ row.propertyVoList[item - 1].propertyName || '-' }}
+                  </span>
+                  <span v-else> - </span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                :key="`value-${item}`"
+                align="center"
+                show-overflow-tooltip
+                :label="`特征值${item}`"
+                width="120"
+              >
+                <template slot-scope="{ row }">
+                  <span
+                    v-if="row.propertyVoList && row.propertyVoList.length > 0 && item - 1 < row.propertyVoList.length"
+                  >
+                    {{ row.propertyVoList[item - 1].propertyValue || '-' }}
+                  </span>
+                  <span v-else> - </span>
+                </template>
+              </el-table-column>
+            </template>
             <el-table-column align="center" fixed="right" min-width="200" label="操作">
               <template slot-scope="scope">
                 <el-button type="text" size="mini" @click="onHandlePreview(scope.row)" class="view-btn">
@@ -481,20 +515,6 @@
               <el-input v-model="formData.brand" disabled/>
             </el-form-item>
           </el-col>
-
-          <!--          &lt;!&ndash; 特征项和特征值 &ndash;&gt;
-                    <template v-for="(item, index) in formData.propertyVoList">
-                      <el-col :span="12" :key="`feature-item-${index}`">
-                        <el-form-item :label="`特征项${index + 1}`">
-                          <el-input v-model="item.propertyName" disabled/>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item :label="`特征值${index + 1}`">
-                          <el-input v-model="item.propertyValue" disabled/>
-                        </el-form-item>
-                      </el-col>
-                    </template>-->
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -728,6 +748,7 @@ export default {
     return {
       total: 0,
       tableHeight: 510,
+      collapsed: false,
       // 查询参数
       queryParams: {
         deptName: undefined,
@@ -817,6 +838,11 @@ export default {
     }
   },
   methods: {
+    // 切换折叠状态
+    toggleCollapse() {
+      this.collapsed = !this.collapsed
+      // 可以在这里添加折叠/展开的动画效果或其他逻辑
+    },
     /**
      * 切换搜索区域展开/收起状态
      */
@@ -1223,6 +1249,17 @@ export default {
   overflow: hidden;
 }
 
+.card-container-btn {
+  /* 使用 clip-path 创建三角形形状 */
+  clip-path: polygon(0 0, 100% 50%, 0 100%);
+  width: 40px;
+  height: 70px;
+  background-color: red;
+  position: relative;
+  cursor: pointer;
+  transition: all 0.3s ease;
+}
+
 .card-header {
   padding: 14px;
   border-bottom: 1px solid #e4e7ed;
@@ -1410,4 +1447,33 @@ export default {
   margin-bottom: 0;
   width: 50%;
 }
+
+.card-container {
+  position: relative; /* 新增：为按钮绝对定位提供参考 */
+}
+
+.collapse-btn {
+  /* 修改：将按钮定位在右侧中间 */
+  position: absolute;
+  right: 0;
+  top: 50%;
+  transform: translateY(-50%);
+  background: white;
+  color: #606266;
+  padding: 2px;
+  z-index: 10; /* 确保按钮在最上层 */
+}
+
+/* 优化按钮悬停效果 */
+.collapse-btn:hover {
+  background: white;
+  color: #409eff;
+}
+
+/* 折叠状态的样式和过渡动画 */
+.tree-column {
+  transition: all 0.3s ease;
+  display: flex;
+  flex-direction: row;
+}
 </style>