From ebe21dfd11699005abbd1ad4730a76af4692eeea Mon Sep 17 00:00:00 2001
From: jiang <BnsGit@123!>
Date: Mon, 22 Sep 2025 18:52:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/index.vue           |   4 +-
 .../equipmentInput/edit.vue                   | 379 +++++++
 .../equipmentInput/index.vue                  | 944 ++----------------
 .../equipmentInput/index1.vue                 | 349 +++++++
 src/views/EquipmentEntryApply/index.vue       | 194 ++--
 src/views/EquipmentEntryApproval/index.vue    | 208 ++--
 6 files changed, 960 insertions(+), 1118 deletions(-)
 create mode 100644 src/views/EquipmentEntryApply/equipmentInput/edit.vue
 create mode 100644 src/views/EquipmentEntryApply/equipmentInput/index1.vue

diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 097b1d3b..e13b2b83 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="upload-file">
-    <el-upload
+    <z
       multiple
       :action="uploadFileUrl"
       :before-upload="handleBeforeUpload"
@@ -23,7 +23,7 @@
         <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
         的文件
       </div>
-    </el-upload>
+    </z>
 
     <!-- 文件列表 -->
     <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
diff --git a/src/views/EquipmentEntryApply/equipmentInput/edit.vue b/src/views/EquipmentEntryApply/equipmentInput/edit.vue
new file mode 100644
index 00000000..e3296ce9
--- /dev/null
+++ b/src/views/EquipmentEntryApply/equipmentInput/edit.vue
@@ -0,0 +1,379 @@
+<template>
+  <!-- 修复标题模板字符串语法错误，规范属性顺序 -->
+  <el-dialog
+    title="新增装备"
+    :visible.sync="isVisible"
+    width="70%"
+    style="z-index: 3000 !important;"
+    :modal="false"
+    :close-on-click-modal="false"
+    :before-close="handleClose"
+    destroy-on-close
+  >
+    <!-- 弹窗内容区域 -->
+    <div class="app-content">
+      <el-form
+        label-width="180px"
+        ref="formRef"
+        label-position="right"
+        :model="form"
+        :rules="equipRules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="装备名称：" prop="deviceName">
+              <el-input
+                autocomplete="off"
+                maxlength="30"
+                v-model="form.deviceName"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="装备类目：" prop="deviceTypeList">
+              <el-cascader
+                v-model="form.deviceTypeList"
+                :show-all-levels="true"
+                :options="deviceTypeTree"
+                :props="partTypeTreeProps"
+                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="form.unitName"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="装备品牌" prop="brand">
+              <el-input
+                v-model="form.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="form.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="form.dayLeasePrice"
+              />
+            </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="form.person"
+                placeholder="请输入联系人"
+                clearable
+                maxlength="10"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话：" prop="personPhone">
+              <el-input
+                v-model="form.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="form.deviceCount"
+                placeholder="请输入装备数量"
+                type="number"
+                clearable
+                maxlength="10"
+                :disabled="form.deviceType == 0"
+              />
+            </el-form-item>
+          </el-col>
+          <!-- 临时录入使用 - start -->
+          <el-col :span="12">
+            <el-form-item label="原值：" prop="buyPrice">
+              <el-input-number
+                v-model="form.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="deviceType">
+              <!-- 0 编码 1 数量 -->
+              <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-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="form.expirationTime"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+
+    <!-- 底部按钮区域 -->
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="handleClose">取消</el-button>
+        <el-button type="primary" @click="handleSubmit">确认</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { equipmentAddApiNew, getEquipmentAddIdApi, getEquipmentTypeApi } from '@/api/EquipmentEntryApply'
+
+export default {
+  name: 'EquipmentEntryEditDialog', // 明确组件名称
+  props: {
+    // 重命名prop，避免与内置属性冲突
+    isVisible: {
+      type: Boolean,
+      default: false,
+      description: '控制弹窗显示与隐藏'
+    },
+    orderId: {
+      type: String,
+      default: '',
+      description: '关联的订单ID字符串'
+    }
+  },
+  emits: ['update:isVisible', 'submit', 'getOrderId'], // 声明事件
+  data() {
+    return {
+      deviceTypeTree: [],
+      partTypeTreeProps: {
+        children: 'children',
+        label: 'name',
+        value: 'id'
+
+      },
+      orderId: '',
+      form: {
+        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' }
+        ]
+      }
+    }
+  },
+  watch: {
+    isVisible(val) {
+      if (val) {
+        this.getTypeTreeData()
+      }
+    }
+  },
+  methods: {
+    deviceTypeChange(val) {
+      if (val === 0) {
+        this.form.deviceCount = '1'
+      }
+    },
+    async dialogTypeChange() {
+      this.options = []
+      const cascader = this.$refs.dialogTypeCascader
+      const deviceTypeList = cascader.getCheckedNodes()
+      if (deviceTypeList.length > 0) {
+        this.form.unitName = deviceTypeList[0].data.unitName
+        this.form.dayLeasePrice = deviceTypeList[0].data.leasePrice
+      }
+    },
+    // 价格输入处理
+    handlePriceInput(v) {
+      this.form.dayLeasePrice = v.replace(/[^\d.]/g, '')
+    },
+    // 获取设备类型树
+    async getTypeTreeData() {
+      const res = await getEquipmentTypeApi()
+      this.deviceTypeTree = res.data
+    },
+    /**
+     * 处理弹窗关闭
+     */
+    handleClose() {
+      this.$refs.formRef.resetFields()
+      this.$emit('update:isVisible', false)
+    },
+
+    /**
+     * 处理表单提交
+     */
+    async handleSubmit() {
+      this.$refs['formRef'].validate(async valid => {
+          if (valid) {
+            if (!this.orderId) {
+              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.$emit('getOrderId', {
+                orderId: this.orderId
+              })
+              this.handleClose()
+            }
+          }
+        }
+      )
+
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-content {
+  padding: 10px 0;
+  min-height: 200px; // 确保有足够高度
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px; // 按钮间距
+}
+</style>
diff --git a/src/views/EquipmentEntryApply/equipmentInput/index.vue b/src/views/EquipmentEntryApply/equipmentInput/index.vue
index 8ba1cd29..bce2ccf7 100644
--- a/src/views/EquipmentEntryApply/equipmentInput/index.vue
+++ b/src/views/EquipmentEntryApply/equipmentInput/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container-content">
+  <div class="app-container">
     <!-- 商品管理 -->
     <el-form
       :model="queryParams"
@@ -41,9 +41,6 @@
             >
               装备录入
             </el-button>
-            <el-button class="primary-lease" type="primary" v-if="!isView">
-              批量导入
-            </el-button>
             <el-button
               class="primary-lease"
               type="primary"
@@ -74,22 +71,22 @@
           {{ `${row.deviceName}` }}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="code" label="装备编号" />
+      <el-table-column align="center" prop="code" label="装备编号"/>
       <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 }}</span
-                    >
+          <span>
+            {{ row.firstName }} <span v-show="row.firstName">></span>
+            {{ row.secondName }}<span v-show="row.secondName">></span>
+            {{ row.thirdName }}
+          </span>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="typeName" label="装备型号" />
+      <el-table-column align="center" prop="typeName" label="装备型号"/>
       <el-table-column align="center" prop="nextCheckDate" label="下次检验日期">
         <template scope="{ row }">
-                    <span :style="{ backgroundColor: getUpdateTimeBgColor(row) }">{{
-                        row.nextCheckDate
-                      }}</span>
+          <span :style="{ backgroundColor: getUpdateTimeBgColor(row) }">{{
+              row.nextCheckDate
+            }}</span>
         </template>
       </el-table-column>
       <el-table-column align="center" label="装备状态">
@@ -133,6 +130,8 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
     />
+
+
     <!-- 装备弹框 -->
     <el-dialog
       :visible.sync="dialogFormVisibleSettlein"
@@ -161,7 +160,7 @@
         </el-button>
       </el-row>
 
-      <TitleTip :titleText="`基本信息`" />
+      <TitleTip :titleText="`基本信息`"/>
       <el-form
         label-width="180px"
         ref="addAndEditFormRef"
@@ -308,7 +307,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="规格型号：" prop="deviceType">
+            <el-form-item label="管理方式：" prop="deviceType">
               <!-- 0 编码 1 数量 -->
               <el-select
                 v-model="addAndEditForm.deviceType"
@@ -317,8 +316,8 @@
                 style="width: 100%"
                 :disabled="!isAdd"
               >
-                <el-option label="编码" :value="0" />
-                <el-option label="数量" :value="1" />
+                <el-option label="编码" :value="0"/>
+                <el-option label="数量" :value="1"/>
               </el-select>
               <span style="color: red"
               >说明：编码管理按一台一台管理，一台设备一个唯一编码，数量管理支持同规格型号批量录入，一般小型工器具。</span
@@ -365,152 +364,8 @@
           </el-row>
         </div>
 
-        <TitleTip :titleText="`装备图片`" />
-        <el-row :gutter="20" v-if="!isViewForm">
-          <el-col :span="24">
-            <el-form-item label="1" style="margin-bottom: 0" class="upload-tip">
-              支持格式：.jpg、.png 单个文件大小不能超过5M
-              <div class="tipBox">
-                *注:图片排序为平台展示顺序，不得少于1张，不得多于6张，建议使用图片比例1:1
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item
-              style="font-weight: bold"
-              label="主展示图："
-              prop="mainFileList"
-            >
-              <div
-                class="img-list"
-                v-if="addAndEditForm.mainFileList.length > 0 && !isAdd"
-              >
-                <div
-                  v-for="(j, i) in addAndEditForm.mainFileList"
-                  :key="j.fileUrl"
-                  class="img-items"
-                >
-                  <img :src="j.fileUrl" alt="" />
-
-                  <div class="mask-img">
-                    <div>
-                      <el-icon
-                        class="delete-icon"
-                        @click="onDeleteImgInMain(i)"
-                        v-if="!isViewForm"
-                      >
-                        <delete-filled />
-                      </el-icon>
-                      <el-icon
-                        class="delete-icon"
-                        style="margin-left: 10px"
-                        @click="onPreviewImg(j.fileUrl)"
-                      >
-                        <zoom-in />
-                      </el-icon>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <UploadComponentNew
-                v-if="!isViewForm"
-                :maxSize="5"
-                :max-limit="6"
-                width="100px"
-                height="100px"
-                :actionUrl="uploadUrl"
-                :autoUpload="true"
-                :multiple="true"
-                :minLimit="addAndEditForm.mainFileList.length"
-                listType="picture-card"
-                :acceptTypeList="['.jpg', '.png']"
-                @onFileChange="onMainFileChange"
-              >
-                <template slot="default">
-                  <el-icon size="42" color="#aaa">
-                    <plus />
-                  </el-icon>
-                </template>
-              </UploadComponentNew>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" v-if="!isViewForm">
-          <el-col :span="24">
-            <el-form-item label="1" style="margin-bottom: 0" class="upload-tip">
-              支持格式：.jpg、.png 单个文件大小不能超过5M
-              <div class="tipBox">
-                *注:图片排序为平台展示顺序，不得少于1张，不得多于6张，建议使用图片比例16:9
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item
-              style="font-weight: bold"
-              label="详情页展示图："
-              prop="detailsFileList"
-            >
-              <div
-                class="img-list"
-                v-if="addAndEditForm.detailsFileList.length > 0 && !isAdd"
-              >
-                <div
-                  v-for="(j, i) in addAndEditForm.detailsFileList"
-                  :key="j.fileUrl"
-                  class="img-items"
-                >
-                  <img :src="j.fileUrl" alt="" />
-
-                  <div class="mask-img">
-                    <div>
-                      <el-icon
-                        class="delete-icon"
-                        @click="onDeleteImgInDetails(i)"
-                        v-if="!isViewForm"
-                      >
-                        <delete-filled />
-                      </el-icon>
-                      <el-icon
-                        class="delete-icon"
-                        style="margin-left: 10px"
-                        @click="onPreviewImg(j.fileUrl)"
-                      >
-                        <zoom-in />
-                      </el-icon>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <UploadComponentNew
-                v-if="!isViewForm"
-                :maxSize="5"
-                :max-limit="6"
-                width="100px"
-                height="100px"
-                :actionUrl="uploadUrl"
-                :autoUpload="true"
-                :multiple="true"
-                :minLimit="addAndEditForm.detailsFileList.length"
-                listType="picture-card"
-                :acceptTypeList="['.jpg', '.png']"
-                @onFileChange="onDetailsFileChange"
-              >
-                <template slot="default">
-                  <el-icon size="42" color="#aaa">
-                    <plus />
-                  </el-icon>
-                </template>
-              </UploadComponentNew>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
         <div style="display: flex; align-items: center">
-          <TitleTip :titleText="`装备证书`" />
+          <TitleTip :titleText="`装备证书信息`"/>
           <el-button
             size="mini"
             type="primary"
@@ -524,25 +379,25 @@
       </el-form>
 
       <el-table :data="equipTableList" width="100%" height="450px" border>
-        <el-table-column label="序号" type="index" width="55" align="center" />
+        <el-table-column label="序号" type="index" width="55" align="center"/>
         <el-table-column
           prop="identifyCode"
           align="center"
           :show-overflow-tooltip="true"
           width="260"
         >
-          <template slot="header">
+          <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>
+                WHMY-DLSSJ-JSD5B-2025070101：<br/>
+                公司简称首字母-设备名称首字母-设备型号-YYYYMMDD序号
+              </span>
             </div>
           </template>
-          <template slot="default" scope="{ row, $index }">
+          <template #default="scope">
             <el-input
-              v-model="row.identifyCode"
+              v-model="scope.row.identifyCode"
               style="width: 100%"
               placeholder="请输入唯一标识符"
               maxlength="20"
@@ -557,9 +412,9 @@
           align="center"
           :show-overflow-tooltip="true"
         >
-          <template slot="default" scope="{ row, $index }">
+          <template #default="scope">
             <el-input
-              v-model="row.checkMan"
+              v-model="scope.row.checkMan"
               controls-position="right"
               style="width: 100%"
               placeholder="请输入检修人"
@@ -573,13 +428,13 @@
           align="center"
           :show-overflow-tooltip="true"
         >
-          <template slot="default" scope="{ row, $index }">
+          <template #default="scope">
             <el-date-picker
-              v-model="row.checkDate"
+              v-model="scope.row.checkDate"
               value-format="YYYY-MM-DD"
               type="date"
               placeholder="请选择"
-              @change="changeDate(row, $index)"
+              @change="changeDate(scope.row, scope.$index)"
               style="width: 100%"
               :disabled="disabledForm"
             ></el-date-picker>
@@ -592,94 +447,40 @@
           align="center"
           :show-overflow-tooltip="true"
         >
-          <template slot="default" scope="{ row, $index }">
+          <template #default="scope">
             <el-date-picker
-              v-model="row.nextCheckDate"
+              v-model="scope.row.nextCheckDate"
               value-format="YYYY-MM-DD"
               type="date"
               placeholder="请选择"
               style="width: 100%"
-              @change="changeNextDate(row)"
+              @change="changeNextDate(scope.row)"
               :disabled="disabledForm"
             ></el-date-picker>
           </template>
         </el-table-column>
 
-        <el-table-column label="合格证(最多5个)" prop="name2" align="center" width="220">
-          <template slot="default" scope="{ row, $index }">
-            <el-upload
-              :file-list="row.insurancePdf"
-              class="upload-demo"
-              :action="uploadUrl"
-              :headers="headerInfo"
-              :before-upload="beforeUpload"
-              :on-preview="handlePreview"
-              :on-remove="(file) => handleRemove(file, row, 2)"
-              :on-exceed="handleExceed"
-              :limit="5"
-              :on-success="(file) => handleSuccess(file, row, 2)"
-              accept=".jpg,.png,.pdf, .doc, .docx"
-              :disabled="settleinTitle == '装备详情'"
-            >
-              <el-button
-                type="primary"
-                size="small"
-                v-if="settleinTitle != '装备详情'"
-              >
-                上传
-              </el-button>
-            </el-upload>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="检测证明(最多5个)" prop="name6" align="center" width="220">
-          <template slot="default" scope="{ row, $index }">
-            <el-upload
-              class="upload-demo"
-              :action="uploadUrl"
-              :headers="headerInfo"
-              :file-list="row.examinationPdf"
-              :before-upload="beforeUpload"
-              :on-preview="handlePreview"
-              :on-remove="(file) => handleRemove(file, row, 1)"
-              :on-exceed="handleExceed"
-              :limit="5"
-              :on-success="(file) => handleSuccess(file, row, 1)"
-              accept=".jpg,.png,.pdf, .doc, .docx"
-              :disabled="settleinTitle == '装备详情'"
-            >
-              <el-button
-                size="small"
-                type="primary"
-                v-if="settleinTitle != '装备详情'"
-              >
-                上传
-              </el-button>
-            </el-upload>
-          </template>
-        </el-table-column>
-
         <el-table-column
           label="操作"
           align="center"
           width="100px"
           v-if="settleinTitle == '新增装备'"
         >
-          <template slot="default" scope="{ row, $index }">
+          <template #default="scope">
             <div
               style="
-                                width: 100%;
-                                height: 40px;
-                                display: flex;
-                                align-items: center;
-                                justify-content: center;
-                            "
+                width: 100%;
+                height: 40px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+              "
             >
               <el-button
                 size="small"
                 type="danger"
-                @click="handleDeleteBack($index)"
-                v-show="$index != 0"
+                @click="handleDeleteBack(scope.$index)"
+                v-show="scope.$index != 0"
               >删除
               </el-button>
             </div>
@@ -688,93 +489,7 @@
       </el-table>
     </el-dialog>
 
-    <!-- 图片查看弹窗 -->
-    <el-dialog center width="60%" destroy-on-close v-model="previewDialogVisible">
-      <el-image
-        style="width: 100%; height: 50%"
-        :src="previewDialogImageUrl"
-        fit="cover"
-        :z-index="9999999999"
-      />
-    </el-dialog>
-
-    <!-- 批量新增弹框 -->
-    <el-dialog
-      v-model="batchAddVisible"
-      title="批量新增"
-      width="80%"
-      destroy-on-close
-      :close-on-click-modal="false"
-    >
-      <el-row :gutter="20">
-        <el-col :span="1.5" :offset="0">
-          <a :href="uploadUrlTemp" download="模板">
-            <el-button class="primary-lease" type="primary" style="margin-left: 20px"
-            >模板下载
-            </el-button>
-          </a>
-        </el-col>
-        <el-col :span="1.5" :offset="0">
-          <el-upload
-            class="upload-demo"
-            :action="uploadUrl2"
-            :headers="headerInfo"
-            :show-file-list="false"
-            accept=".xlsx"
-            :on-success="handleUpload"
-          >
-            <el-button type="primary">上传文件</el-button>
-          </el-upload>
-        </el-col>
-        <el-col :span="5" :offset="0">
-          <div style="color: #ccc; font-size: small; line-height: 30px">
-            备注: 一次上传装备数量不能超过50条
-          </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12" :offset="0">
-          <TitleTip titleText="资料不全装备清单" />
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="20" style="margin-bottom: 10px">
-        <el-col :span="1.5" :offset="0">
-          <el-button type="primary" @click="handleBatchDel">删除</el-button>
-        </el-col>
-      </el-row>
-
-      <el-table
-        :data="batchAddData"
-        row-key="typeId"
-        show-overflow-tooltip
-        :header-cell-style="{ background: '#00a288', color: '#fff' }"
-        style="width: 100%"
-        @selection-change="selectionChange"
-      >
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" width="80px">
-          <template slot="default" scope="{ row, $index }">
-            {{ $index + 1 }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(column, index) in batchAddColumn"
-          :key="index"
-          :prop="column.prop"
-          :label="column.label"
-          :width="column.width"
-          align="center"
-        ></el-table-column>
-        <!-- 操作 -->
-        <el-table-column label="操作" align="center" width="180px">
-          <template slot="default" scope="{ row, $index }">
-            <el-button type="primary" @click="handleDel($index)">删除</el-button>
-            <el-button type="primary" @click="equipmentDeployment(row)">调整</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
+    <!-- 图片查看弹窗已移除 -->
   </div>
 </template>
 
@@ -792,7 +507,7 @@ import {
   getEquipmentTypeApi,
   getEquipmentAddIdApi,
   equipmentSubmitApiNew,
-  getEquipmentListApi, equipmentDraftListApiNew
+  equipmentDraftListApiNew
 } from '@/api/EquipmentEntryApply/index'
 
 export default {
@@ -860,14 +575,6 @@ export default {
         deviceWeight: '',
         checkDate: '',
         checkCycle: '',
-        mainFileList: [],
-        detailsFileList: [],
-        mainFileTempList: [],
-        detailsFileTempList: [],
-        insurancePdf: [],
-        examinationPdf: [],
-        insurancePdfs: [],
-        examinationPdfs: [],
         devInfoProperties: [],
         tableList: [],
         isZone: true,
@@ -875,7 +582,7 @@ export default {
         expirationTime: '',
         orderId: ''
       },
-      // 表单校验规则
+      // 表单校验规则（已移除文件相关校验）
       equipRules: {
         originaValue: [
           { required: true, message: '请输入原值', trigger: 'blur' }
@@ -931,12 +638,6 @@ export default {
         personPhone: [
           { required: true, message: '联系电话不能为空', trigger: 'blur' },
           { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
-        ],
-        mainFileList: [
-          { required: true, message: '请上传主展示图', trigger: 'change' }
-        ],
-        detailsFileList: [
-          { required: true, message: '请上传详情展示图', trigger: 'change' }
         ]
       },
       // 其他状态
@@ -944,62 +645,33 @@ export default {
       dialogTypeCascader: null,
       isDisabled: false,
       typeDisabled: false,
-      uploadUrl: process.env.VUE_APP_API_URL + '/file/upload',
-      uploadUrl2: process.env.VUE_APP_API_URL + '/material-mall/dev/importData',
-      uploadUrlTemp: process.env.VUE_APP_API_URL + '/template/download',
       descriptionFormList: [
         {
-          newId: Date.now(),
-          insurancePdfs: [],
-          insuranceATempPdf: [],
-          examinationPdfs: [],
-          examinationTempPdf: []
+          newId: Date.now()
         }
       ],
       descriptionFormRefList: [],
       descriptionRules: {
         identifyCode: [
           { required: true, message: '请填写装备唯一标识符', trigger: 'blur' }
-        ],
-        insurancePdfs: [
-          { required: true, message: '请上传合格证', trigger: 'change' }
-        ],
-        examinationPdfs: [
-          { required: true, message: '请上传检测证明', trigger: 'change' }
         ]
       },
       propertyNames: [],
       options: [],
       orderId: '',
-      previewDialogVisible: false,
-      previewDialogImageUrl: '',
       chunkedItems: [],
       equipTableList: [
         {
           id: '',
           identifyCode: '',
-          name2: '',
           checkMan: '',
           checkDate: '',
-          nextCheckDate: '',
-          name6: '',
-          insurancePdf: [],
-          examinationPdf: []
+          nextCheckDate: ''
         }
       ],
       headerInfo: {
         Authorization: 'Bearer ' + this.$store.state.token
-      },
-      batchAddVisible: false,
-      batchAddData: [],
-      batchAddColumn: [
-        { prop: 'deviceName', label: '装备名称', width: 150 },
-        { prop: 'code', label: '装备编号', width: 150 },
-        { prop: 'brand', label: '品牌', width: 120 },
-        { prop: 'itemTypeModel', label: '规格型号', width: 150 },
-        { prop: 'errorMsg', label: '错误信息', width: 300 }
-      ],
-      selectColumn: []
+      }
     }
   },
   computed: {
@@ -1021,12 +693,9 @@ export default {
     // 获取列表数据
     async getList() {
       try {
-        equipmentDraftListApiNew(this.queryParams).then((res) => {
-          console.log(res)
-          this.tableData = res.rows
-          this.total = res.total
-        })
-
+        const res = await equipmentDraftListApiNew(this.queryParams)
+        this.tableData = res.rows
+        this.total = res.total
       } catch (error) {
         console.error('获取列表失败:', error)
       }
@@ -1045,14 +714,13 @@ export default {
     // 打开入驻弹框
     equipmentDeployment(row) {
       this.dialogFormVisibleSettlein = true
-      console.log("213123")
       this.isAdd = !row
       this.settleinTitle = row ? '装备编辑' : '新增装备'
 
       this.getTypeTreeData()
 
       if (row) {
-        //this.getDetailData(row)
+        this.getDetailData(row)
         this.isEditForm = true
       } else {
         this.addAndEditForm = {
@@ -1075,14 +743,6 @@ export default {
           deviceWeight: '',
           checkDate: '',
           checkCycle: '',
-          mainFileList: [],
-          detailsFileList: [],
-          mainFileTempList: [],
-          detailsFileTempList: [],
-          insurancePdf: [],
-          examinationPdf: [],
-          insurancePdfs: [],
-          examinationPdfs: [],
           devInfoProperties: [],
           tableList: [],
           isZone: true,
@@ -1094,13 +754,9 @@ export default {
           {
             id: '',
             identifyCode: '',
-            name2: '',
             checkMan: '',
             checkDate: '',
-            nextCheckDate: '',
-            name6: '',
-            insurancePdf: [],
-            examinationPdf: []
+            nextCheckDate: ''
           }
         ]
         this.propertyNames = []
@@ -1147,7 +803,8 @@ export default {
             this.getList()
           }
         })
-        .catch(() => {})
+        .catch(() => {
+        })
     },
     // 获取详情接口
     async getDetailData(row) {
@@ -1172,10 +829,6 @@ export default {
         deviceWeight,
         checkDate,
         checkCycle,
-        mainFileList,
-        detailsFileList,
-        insurancePdf,
-        examinationPdf,
         devInfoProperties,
         tableList,
         maintenanceAlarmDay,
@@ -1204,10 +857,6 @@ export default {
         deviceWeight,
         checkDate,
         checkCycle,
-        mainFileList,
-        detailsFileList,
-        insurancePdf,
-        examinationPdf,
         devInfoProperties,
         tableList,
         isZone,
@@ -1218,11 +867,7 @@ export default {
 
       this.descriptionFormList = [
         {
-          newId: Date.now(),
-          insurancePdfs: insurancePdf || [],
-          insuranceATempPdf: [],
-          examinationPdfs: examinationPdf || [],
-          examinationTempPdf: []
+          newId: Date.now()
         }
       ]
 
@@ -1235,28 +880,12 @@ export default {
       if (this.isEditForm) {
         if (this.addAndEditForm.tableList) {
           this.addAndEditForm.tableList.forEach(item => {
-            if (item.examinationPdf && item.examinationPdf.length > 0) {
-              item.examinationPdf.forEach(e => {
-                e.url = e.fileUrl
-                e.name = e.fileName
-              })
-            }
-            if (item.insurancePdf && item.insurancePdf.length > 0) {
-              item.insurancePdf.forEach(e => {
-                e.url = e.fileUrl
-                e.name = e.fileName
-              })
-            }
             this.equipTableList.push({
               id: item.id,
               identifyCode: item.identifyCode,
-              name2: item.insurancePdf[0]?.fileUrl,
               checkMan: item.checkMan,
               checkDate: item.checkDate,
-              nextCheckDate: item.nextCheckDate,
-              name6: item.examinationPdf[0]?.fileUrl,
-              insurancePdf: item.insurancePdf,
-              examinationPdf: item.examinationPdf
+              nextCheckDate: item.nextCheckDate
             })
           })
         } else {
@@ -1264,41 +893,21 @@ export default {
             {
               id: '',
               identifyCode: '',
-              name2: '',
               checkMan: '',
               checkDate: '',
-              nextCheckDate: '',
-              name6: '',
-              insurancePdf: [],
-              examinationPdf: []
+              nextCheckDate: ''
             }
           ]
         }
       } else {
         if (this.addAndEditForm.tableList) {
           this.addAndEditForm.tableList.forEach(item => {
-            if (item.examinationPdf && item.examinationPdf.length > 0) {
-              item.examinationPdf.forEach(e => {
-                e.url = e.fileUrl
-                e.name = e.fileName
-              })
-            }
-            if (item.insurancePdf && item.insurancePdf.length > 0) {
-              item.insurancePdf.forEach(e => {
-                e.url = e.fileUrl
-                e.name = e.fileName
-              })
-            }
             this.equipTableList.push({
               id: item.id,
               identifyCode: item.identifyCode,
-              name2: item.insurancePdf[0]?.fileUrl,
               checkMan: item.checkMan,
               checkDate: item.checkDate,
-              nextCheckDate: item.nextCheckDate,
-              name6: item.examinationPdf[0]?.fileUrl,
-              insurancePdf: item.insurancePdf,
-              examinationPdf: item.examinationPdf
+              nextCheckDate: item.nextCheckDate
             })
           })
         } else {
@@ -1358,7 +967,8 @@ export default {
             this.getList()
           }
         })
-        .catch(() => {})
+        .catch(() => {
+        })
     },
     // 获取所属公司下拉数据
     async getCompanyList() {
@@ -1406,13 +1016,9 @@ export default {
           {
             id: '',
             identifyCode: '',
-            name2: '',
             checkMan: '',
             checkDate: '',
-            nextCheckDate: '',
-            name6: '',
-            insurancePdf: [],
-            examinationPdf: []
+            nextCheckDate: ''
           }
         ]
       }
@@ -1427,44 +1033,10 @@ export default {
     },
     // 提交函数
     submitFun(type) {
-      if (this.isAdd || this.isEditForm) {
-        this.addAndEditForm.mainFileList = Array.from(
-          new Set([...this.addAndEditForm.mainFileList, ...this.addAndEditForm.mainFileTempList])
-        )
-        this.addAndEditForm.detailsFileList = Array.from(
-          new Set([...this.addAndEditForm.detailsFileList, ...this.addAndEditForm.detailsFileTempList])
-        )
-      }
-
-      if (type === 2 || type === 4) {
-        this.equipRules.mainFileList = []
-        this.equipRules.detailsFileList = []
-      } else {
-        this.equipRules.mainFileList = [
-          { required: true, message: '请上传主展示图', trigger: 'change' }
-        ]
-        this.equipRules.detailsFileList = [
-          { required: true, message: '请上传详情展示图', trigger: 'change' }
-        ]
-      }
-
       this.$refs.addAndEditFormRef.validate(async valid => {
         if (valid) {
           let isDescription = false
 
-          this.descriptionFormList.forEach((e, index) => {
-            e.insurancePdfs = [...e.insurancePdfs, ...e.insuranceATempPdf]
-            e.examinationPdfs = [...e.examinationPdfs, ...e.examinationTempPdf]
-
-            if (type === 3 || type === 4) {
-              this.addAndEditForm.examinationPdf = e.examinationPdfs.map(item => {
-                return { fileNam: item.fileName, fileUrl: item.fileUrl }
-              })
-            } else {
-              this.addAndEditForm.examinationPdfs[index] = e.examinationPdfs
-            }
-          })
-
           this.addAndEditForm.tableList = this.equipTableList
 
           if (type !== 2 && type !== 4) {
@@ -1474,10 +1046,7 @@ export default {
                 if (
                   row.hasOwnProperty(key) &&
                   (row[key] === null || row[key] === '' || (row[key] && row[key].length === 0)) &&
-                  key !== 'name2' &&
-                  key !== 'name6' &&
-                  key !== 'id' &&
-                  key !== 'insurancePdf'
+                  key !== 'id'
                 ) {
                   let fieldName = ''
                   switch (key) {
@@ -1503,28 +1072,12 @@ export default {
                   isDescription = true
                   return
                 }
-
-                if (row.examinationPdf.length === 0) {
-                  ElMessage({
-                    type: 'error',
-                    message: `请上传第 ${i + 1} 行的检测证明`
-                  })
-                  isDescription = true
-                  return
-                }
               }
             }
           }
 
           if (isDescription) return
 
-          this.addAndEditForm.mainFileList = Array.from(
-            new Set([...this.addAndEditForm.mainFileList, ...this.addAndEditForm.mainFileTempList])
-          )
-          this.addAndEditForm.detailsFileList = Array.from(
-            new Set([...this.addAndEditForm.detailsFileList, ...this.addAndEditForm.detailsFileTempList])
-          )
-
           this.addAndEditForm.devInfoProperties = this.propertyNames
           if (this.addAndEditForm.deviceTypeList.length > 0) {
             this.addAndEditForm.typeId = this.addAndEditForm.deviceTypeList[this.addAndEditForm.deviceTypeList.length - 1]
@@ -1606,213 +1159,13 @@ export default {
       this.propertyNames = []
       this.dialogFormVisibleSettlein = false
     },
-    // 文件上传前处理-上传大小
-    beforeUpload(file) {
-      if (file.size / 1024 / 1024 > 10) {
-        ElMessage({
-          type: 'error',
-          message: '上传文件大小不能超过10M!'
-        })
-        return false
-      }
-    },
-    // 文件上传失败
-    uploadError() {
-      ElMessage({
-        type: 'error',
-        message: '上传文件失败!'
-      })
-    },
-    // 文件查看
-    picturePreview(file) {
-      this.previewDialogImageUrl = file.fileUrl
-      this.previewDialogVisible = true
-    },
-    // 添加装备证书
-    onAddDescription() {
-      const newId = Date.now()
-      this.descriptionFormList.push({
-        newId,
-        insurancePdfs: [],
-        insuranceATempPdf: [],
-        examinationPdfs: [],
-        examinationTempPdf: []
-      })
-    },
-    // 移除装备证书
-    onDeleteDescription(index) {
-      this.descriptionFormList.splice(index, 1)
-      this.descriptionFormRefList.splice(index, 1)
-    },
-    // 主文件变更
-    onMainFileChange(fileList) {
-      this.addAndEditForm.mainFileTempList = []
-      const origin = window.location.origin
-      const isProd = origin.indexOf('sgwpdm.ah.sgcc.com.cn') > -1
-
-      const fileListTemp = fileList.map(e => {
-        let testUrl = ''
-        if (process.env.VUE_APP_API_URL === '/proxyApi') {
-          testUrl = e.url
-        } else {
-          testUrl = origin + '/ahbns/' + e.url
-        }
-        return {
-          fileName: e.name,
-          fileUrl: isProd ? 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + e.url : testUrl
-        }
-      })
-
-      this.$refs.addAndEditFormRef.clearValidate('mainFileList')
-      this.addAndEditForm.mainFileTempList.push(...fileListTemp)
-    },
-    // 详情文件变更
-    onDetailsFileChange(fileList) {
-      this.addAndEditForm.detailsFileTempList = []
-      const origin = window.location.origin
-      const isProd = origin.indexOf('sgwpdm.ah.sgcc.com.cn') > -1
-
-      const fileListTemp = fileList.map(e => {
-        let testUrl = ''
-        if (process.env.VUE_APP_API_URL === '/proxyApi') {
-          testUrl = e.url
-        } else {
-          testUrl = origin + '/ahbns/' + e.url
-        }
-        return {
-          fileName: e.name,
-          fileUrl: isProd ? 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + e.url : testUrl
-        }
-      })
-
-      this.$refs.addAndEditFormRef.clearValidate('detailsFileList')
-      this.addAndEditForm.detailsFileTempList.push(...fileListTemp)
-    },
-    // 文件查看
-    handlePreview(file) {
-      window.open(file.url || file.fileUrl, '_blank')
-    },
-    // 删除附件
-    handleRemove(file, row, type) {
-      if (row.id) {
-        if (type === 1) {
-          const index = row.examinationPdf.findIndex(e => e.fileUrl === file.fileUrl)
-          if (index > -1) {
-            row.examinationPdf.splice(index, 1)
-          }
-        } else {
-          const index = row.insurancePdf.findIndex(e => e.fileUrl === file.fileUrl)
-          if (index > -1) {
-            row.insurancePdf.splice(index, 1)
-          }
-        }
-      } else {
-        if (type === 1) {
-          const index = row.examinationPdf.findIndex(e => e.fileUrl === file.response.data.url)
-          if (index > -1) {
-            row.examinationPdf.splice(index, 1)
-          }
-        } else {
-          const index = row.insurancePdf.findIndex(e => e.fileUrl === file.response.data.url)
-          if (index > -1) {
-            row.insurancePdf.splice(index, 1)
-          }
-        }
-      }
-    },
-    // 上传附件成功
-    handleSuccess(file, row, type) {
-      if (file.code === 200) {
-        let fileUrl = ''
-        if (process.env.VUE_APP_API_URL === '/proxyApi') {
-          fileUrl = file.data.url
-        } else {
-          fileUrl = 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + file.data.url
-        }
-
-        if (type === 1) {
-          row.examinationPdf.push({
-            fileName: file.data.name,
-            fileUrl: fileUrl
-          })
-        } else {
-          row.insurancePdf.push({
-            fileName: file.data.name,
-            fileUrl: fileUrl
-          })
-        }
-      }
-    },
-    // 超限提示
-    handleExceed() {
-      ElMessage({
-        type: 'error',
-        message: '最多只能上传5个文件'
-      })
-    },
-    // 删除主图
-    onDeleteImgInMain(index) {
-      this.addAndEditForm.mainFileList.splice(index, 1)
-    },
-    // 删除详情图
-    onDeleteImgInDetails(index) {
-      this.addAndEditForm.detailsFileList.splice(index, 1)
-    },
-    // 对话框关闭
-    onDialogClose() {
-      this.$refs.addAndEditFormRef.resetFields()
-      this.addAndEditForm = {
-        deviceName: '',
-        deviceTypeList: [],
-        deviceCount: 1,
-        originaValue: '',
-        itemTypeModel: '',
-        deviceType: '',
-        buyPrice: '',
-        unitName: '',
-        code: '',
-        brand: '',
-        typeId: '',
-        companyId: '',
-        productionDate: '',
-        dayLeasePrice: '',
-        person: '',
-        personPhone: '',
-        deviceWeight: '',
-        checkDate: '',
-        checkCycle: '',
-        mainFileList: [],
-        detailsFileList: [],
-        mainFileTempList: [],
-        detailsFileTempList: [],
-        insurancePdf: [],
-        examinationPdf: [],
-        insurancePdfs: [],
-        examinationPdfs: [],
-        devInfoProperties: [],
-        tableList: [],
-        isZone: true,
-        zoneId: '',
-        expirationTime: '',
-        orderId: ''
-      }
-    },
-    // 图片预览
-    onPreviewImg(fileUrl) {
-      this.previewDialogImageUrl = fileUrl
-      this.previewDialogVisible = true
-    },
-    // 添加行
+    // 添加装备证书行
     handleAddBack() {
       const obj = {
         identifyCode: '',
-        name2: '',
         checkMan: '',
         checkDate: '',
-        nextCheckDate: '',
-        name6: '',
-        insurancePdf: [],
-        examinationPdf: []
+        nextCheckDate: ''
       }
       this.equipTableList.push(obj)
     },
@@ -1820,10 +1173,6 @@ export default {
     handleDeleteBack(index) {
       this.equipTableList.splice(index, 1)
     },
-    // 查看证书
-    viewCertificate(url) {
-      window.open(url, '_blank')
-    },
     // 日期变更
     changeDate(row, index) {
       const currentDate = new Date(row.checkDate)
@@ -1857,56 +1206,6 @@ export default {
       }
       return ''
     },
-    // 批量新增
-    handleBatchAddVisible() {
-      this.batchAddData = []
-      this.batchAddVisible = true
-    },
-    // 选择变更
-    selectionChange(val) {
-      this.selectColumn = val
-    },
-    // 上传处理
-    handleUpload(file) {
-      if (file.code === 200) {
-        this.batchAddData = file.data
-      } else {
-        ElMessage({
-          message: file.msg,
-          type: 'error'
-        })
-      }
-    },
-    // 批量删除
-    handleBatchDel() {
-      if (this.selectColumn.length === 0) {
-        ElMessage({
-          message: '请选择要删除的数据',
-          type: 'error'
-        })
-        return
-      }
-
-      ElMessageBox.confirm('是否确认删除所选数据', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.batchAddData = this.batchAddData.filter(
-          item => !this.selectColumn.includes(item)
-        )
-      })
-    },
-    // 删除
-    handleDel(index) {
-      ElMessageBox.confirm('是否确认删除所选数据', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.batchAddData.splice(index, 1)
-      })
-    },
     // 返回列表
     onHandleBackList() {
       this.$emit('backList')
@@ -1968,71 +1267,6 @@ export default {
   margin-left: 10px;
 }
 
-.uploadBox {
-  margin: 20px 40px;
-}
-
-.labelBox {
-  width: auto;
-  height: auto;
-  display: flex;
-  align-items: center;
-  margin-bottom: 20px;
-}
-
-.imgsBox {
-  width: 100%;
-  height: auto;
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  margin-bottom: 30px;
-  margin-left: 20px;
-
-  .imgItem {
-    width: 150px;
-    height: 150px;
-    margin-right: 20px;
-    margin-bottom: 30px;
-    border: 1px dashed #bbb;
-    position: relative;
-
-    .picture-card {
-      width: 150px;
-      height: 150px;
-    }
-
-    .icon-list {
-      width: 60px;
-      height: 20px;
-      position: absolute;
-      top: 70px;
-      left: 30px;
-      display: flex;
-      align-items: center;
-    }
-
-    .imgItem__icon {
-      margin: 0 5px;
-      cursor: pointer;
-    }
-
-    .file-name {
-      font-size: 10px;
-      width: 100%;
-      word-break: break-all;
-    }
-  }
-
-  .hide {
-    display: none;
-  }
-
-  .imgItem:hover .hide {
-    display: block;
-  }
-}
-
 .tipBox {
   color: red;
   font-size: 12px;
@@ -2048,54 +1282,6 @@ export default {
   color: transparent;
 }
 
-.img-list {
-  display: flex;
-  align-items: center;
-
-  .img-items {
-    width: 100px;
-    height: 100px;
-    margin-right: 8px;
-    position: relative;
-
-    img {
-      width: 100%;
-      height: 100%;
-    }
-
-    .mask-img {
-      visibility: hidden;
-      position: absolute;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      background-color: #000;
-      opacity: 0.5;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      .delete-icon {
-        font-size: 20px;
-        cursor: pointer;
-        z-index: 9;
-        color: #fff;
-      }
-    }
-  }
-
-  .img-items:hover .mask-img {
-    visibility: visible;
-  }
-}
-
-.centered-dialog {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
 .app-container-content {
   :deep .el-dialog {
     display: flex !important;
diff --git a/src/views/EquipmentEntryApply/equipmentInput/index1.vue b/src/views/EquipmentEntryApply/equipmentInput/index1.vue
new file mode 100644
index 00000000..320133c0
--- /dev/null
+++ b/src/views/EquipmentEntryApply/equipmentInput/index1.vue
@@ -0,0 +1,349 @@
+<template>
+  <!-- 修复标题模板字符串语法错误，规范属性顺序 -->
+  <el-dialog
+    title="装备录入"
+    :visible.sync="isVisible"
+    width="70%"
+    :modal="false"
+    :close-on-click-modal="false"
+    :before-close="handleClose"
+    destroy-on-close
+  >
+    <!-- 弹窗内容区域 -->
+    <div class="app-content">
+      <!-- 商品管理 -->
+      <el-form
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        inline
+        label-width="auto"
+        size="small"
+      >
+        <!-- 表单搜索 -->
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="装备名称" prop="deviceName">
+              <el-input
+                v-model.trim="queryParams.deviceName"
+                style="width: 100%"
+                clearable
+                placeholder="请输入装备名称"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="5" style="float: right">
+            <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-show="!isAddVisible"
+              >
+                新增装备
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <!-- 表格 -->
+      <el-table
+        :data="tableData"
+        style="width: auto"
+        show-overflow-tooltip
+      >
+        <el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
+        <el-table-column align="center" label="装备名称">
+          <template scope="{ row }">
+            {{ `${row.deviceName}` }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="code" label="装备编号"/>
+        <el-table-column align="center" prop="typeName" label="装备类目">
+          <template scope="{ row }">
+          <span>
+            {{ 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="devModel" label="装备型号"/>
+        <el-table-column align="center" prop="nextCheckDate" label="下次检验日期">
+          <template scope="{ row }">
+          <span>{{
+              row.nextCheckDate
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="装备状态">
+          <template scope="{ row }">
+            <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
+          prop="name"
+          label="操作"
+          min-width="160px"
+          align="center"
+          v-if="!isAddVisible"
+        >
+          <template scope="{ row }">
+            <el-button
+              size="small"
+              type="primary"
+              @click="editRowInfo(row)"
+            >
+              编辑
+            </el-button>
+            <el-button
+              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>
+      </el-table>
+      <pagination
+        :total="total"
+        @pagination="getList"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+      />
+
+
+    </div>
+
+    <!-- 底部按钮区域 -->
+    <template #footer>
+      <div class="dialog-footer" v-show="!isAddVisible">
+        <el-button @click="handleClose">取消</el-button>
+        <el-button type="primary" @click="handleSubmit" :disabled="tableData.length==0">确认提交</el-button>
+      </div>
+    </template>
+
+    <EquipmentEntryEditDialog
+      :is-visible.sync="isEditVisible"
+      :order-id="orderId"
+      @getOrderId="getOrderId"
+    />
+  </el-dialog>
+</template>
+
+<script>
+import EquipmentEntryEditDialog from '@/views/EquipmentEntryApply/equipmentInput/edit.vue'
+
+// 使用defineComponent规范组件定义
+import {
+  equipmentDraftListApiNew,
+  equipmentPassAndRejectApiNew,
+  equipmentSubmitApiNew,
+  removeDeviceApi
+} from '@/api/EquipmentEntryApply'
+
+export default {
+  name: 'EquipmentEntryDialog',
+  components: { EquipmentEntryEditDialog },
+  // 明确组件名称
+  props: {
+    // 重命名prop，避免与内置属性冲突
+    isVisible: {
+      type: Boolean,
+      default: false,
+      description: '控制弹窗显示与隐藏'
+    },
+    isAddVisible: {
+      type: Boolean,
+      default: false
+    },
+    orderId: {
+      type: String,
+      default: '',
+      description: '关联的订单ID字符串'
+    },
+    isApprovalVisible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ['update:isVisible', 'submit'], // 声明事件
+  data() {
+    return {
+      isEditVisible: false,
+      // 表格数据
+      tableData: [],
+      total: 0,
+      queryParams: {
+        orderId: '',
+        deviceName: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      // 可添加表单数据
+      formData: {
+        // 示例字段，可根据实际需求修改
+        equipmentName: '',
+        model: '',
+        quantity: 1
+      }
+    }
+  },
+  watch: {
+    isVisible(val) {
+      if (val) {
+        this.getList()
+      }
+    }
+  },
+  methods: {
+    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.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()
+    },
+    equipmentDeployment() {
+      this.isEditVisible = true
+    },
+
+    // 删除按钮
+    async deleteRowInfo(row) {
+      this.$confirm('是否确定删除？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          return removeDeviceApi([row.maId])
+        })
+        .then(res => {
+          if (res.code === 200) {
+            this.$message({
+              type: 'success',
+              message: '删除成功'
+            })
+            this.getList()
+          }
+        })
+        .catch(() => {
+        })
+    },
+    // 重置表格查询
+    resetTableList() {
+      this.$refs.queryFormRef.resetFields()
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /**
+     * 处理弹窗关闭
+     */
+    handleClose() {
+      this.$emit('update:isVisible', false)
+    },
+
+    /**
+     * 处理表单提交
+     */
+    handleSubmit() {
+      equipmentSubmitApiNew({ id: this.orderId, status: 0 }).then(res => {
+        if (res.code === 200) {
+          this.$message({
+            type: 'success',
+            message: '提交成功'
+          })
+          this.handleClose()
+          this.$emit('submit', {
+            orderId: this.orderId
+          })
+        }
+      })
+
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-content {
+  padding: 10px 0;
+  min-height: 200px; // 确保有足够高度
+}
+
+.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 aba7331f..2e97132f 100644
--- a/src/views/EquipmentEntryApply/index.vue
+++ b/src/views/EquipmentEntryApply/index.vue
@@ -1,19 +1,15 @@
 <template>
   <div class="app-container">
-    <template v-if="!isEquipmentInputShow">
-      <el-form :model="queryParams" ref="queryFormRef" inline label-width="auto" size="small">
+    <template>
+      <el-form
+        :model="queryParams"
+        ref="queryFormRef"
+        inline
+        label-width="auto"
+        size="small"
+      >
         <!-- 表单搜索 -->
         <el-row>
-          <el-col :span="5">
-            <el-form-item label="关键字" prop="keyWord">
-              <el-input
-                clearable
-                style="width: 100%"
-                placeholder="请输入关键字"
-                v-model.trim="queryParams.keyWord"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="5">
             <el-form-item label="审批状态" prop="status">
               <el-select
@@ -35,32 +31,24 @@
                 value-format="YYYY-MM-DD"
                 placeholder="请选择申请时间"
                 v-model="queryParams.applyTime"
-              >
-              </el-date-picker>
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="9">
-            <el-form-item prop="code">
-              <el-button class="primary-lease" type="primary" @click="onHandleSQuery()">
+          <el-col :span="5" style="float:right;">
+            <el-form-item>
+              <el-button class="primary-lease" type="primary" @click="getEquipmentApplyList">
                 查询
               </el-button>
-              <el-button class="primary-lease" type="primary" @click="onHandleReset()">
+              <el-button class="primary-lease" type="primary" @click="resetForm">
                 重置
               </el-button>
               <el-button
                 class="primary-lease"
                 type="primary"
-                @click="onHandleEquipmentInput()"
+                @click="showEquipmentInput()"
               >
                 装备录入
               </el-button>
-              <el-button
-                class="primary-lease"
-                type="primary"
-                @click="onHandleBatchImport()"
-              >
-                批量导入
-              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -80,25 +68,25 @@
           </el-table-column>
           <el-table-column label="操作" align="center">
             <template slot-scope="{ row }">
-              <el-button type="primary" size="small" @click="onHandleView(row)">
+              <el-button type="primary" size="small" @click="showEquipmentInput(row.id, true)">
                 查看
               </el-button>
               <el-button
                 type="primary"
                 size="small"
-                @click="onHandleEdit(row)"
-                v-if="row.status == 3"
+                @click="showEquipmentInput(row.id, false)"
+                v-if="row.status == '3'"
               >
                 编辑
               </el-button>
-              <el-button type="primary" size="small" @click="onHandleDelete(row)">
+<!--              <el-button type="primary" size="small"  v-if="row.status == '0'" @click="deleteItem(row)">
                 删除
-              </el-button>
+              </el-button>-->
             </template>
           </el-table-column>
         </el-table>
-        <!-- 分页 -->
 
+        <!-- 分页 -->
         <pagination
           :total="total"
           @pagination="handlePageChange"
@@ -107,27 +95,31 @@
         />
       </el-form>
     </template>
-
-    <EquipmentInput :order-ids="orderIds" :is-view="isView" v-else @backList="onHandleBackList"/>
+    <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 EquipmentInput from '@/views/EquipmentEntryApply/equipmentInput/index.vue'
+import EquipmentEntryDialog from '@/views/EquipmentEntryApply/equipmentInput/index1.vue'
 
 export default {
   components: {
-    EquipmentInput
+    EquipmentEntryDialog
   },
   data() {
     return {
       total: 0,
-      orderIds: '',
-      isView: false,
-      isEquipmentInputShow: false,
+      orderId: '',
+      isVisible: false,
+      isAddVisible: false,
       queryParams: {
-        keyWord: '',
         status: '',
         applyTime: '',
         pageNum: 1,
@@ -140,106 +132,72 @@ export default {
     this.getEquipmentApplyList()
   },
   methods: {
-    // 获取装备申请列表
+    /**
+     * 获取装备申请列表
+     */
     getEquipmentApplyList() {
-      getEquipmentApplyListApi(this.queryParams).then((res) => {
-        console.log('获取装备申请列表***', res)
-        this.tableData = res.data.rows
-        this.total = res.data.total
-      }).catch(error => {
-        console.error('获取装备申请列表失败:', error)
-      })
+      getEquipmentApplyListApi(this.queryParams)
+        .then(res => {
+          this.tableData = res.data.rows
+          this.total = res.data.total
+        })
+        .catch(error => {
+          console.error('获取装备申请列表失败:', error)
+        })
     },
 
-    // 分页相关方法
-    handlePageChange(pageNum) {
-      this.queryParams.pageNum = pageNum
+    /**
+     * 分页变化处理
+     */
+    handlePageChange() {
       this.getEquipmentApplyList()
     },
 
-    handleSizeChange(pageSize) {
-      this.queryParams.pageSize = pageSize
-      this.getEquipmentApplyList()
-    },
-
-    onHandleSQuery() {
-      console.log('查询')
-      this.getEquipmentApplyList()
-    },
-
-    onHandleReset() {
-      console.log('重置')
-      this.queryParams = {
-        keyWord: '',
-        status: '',
-        applyTime: '',
-        pageNum: 1,
-        pageSize: 10
-      }
+    /**
+     * 重置表单
+     */
+    resetForm() {
       this.$refs.queryFormRef.resetFields()
+      this.queryParams.pageNum = 1
       this.getEquipmentApplyList()
     },
 
-    onHandleEquipmentInput() {
-      this.orderIds = ''
-      this.isView = false
-      this.isEquipmentInputShow = true
+    /**
+     * 显示装备录入/编辑/查看界面
+     */
+    showEquipmentInput(orderId, isAddVisible) {
+      this.orderId = orderId
+      this.isVisible = true
+      this.isAddVisible = isAddVisible
+
     },
 
-    onHandleBatchImport() {
-      console.log('批量导入')
-    },
-
-    onHandleView(row) {
-      console.log('查看', row)
-      this.orderIds = row.id
-      this.isView = true
-      this.isEquipmentInputShow = true
-    },
-
-    onHandleEdit(row) {
-      this.orderIds = row.id
-      this.isView = false
-      this.isEquipmentInputShow = true
-      console.log('编辑', row)
-    },
-
-    onHandleDelete(row) {
+    /**
+     * 删除项目
+     */
+    deleteItem(row) {
       this.$confirm('是否确定删除？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        console.log('删除', row)
-        equipmentDelApiNew({ id: row.id }).then((res) => {
-          console.log('删除结果', res)
+      })
+        .then(() => equipmentDelApiNew({ id: row.id }))
+        .then(res => {
           if (res.code === 200) {
-            this.$message({
-              type: 'success',
-              message: '删除成功',
-              duration: 1000
-            })
+            this.$message.success('删除成功')
             this.getEquipmentApplyList()
           } else {
-            this.$message({
-              type: 'error',
-              message: '删除失败',
-              duration: 1000
-            })
+            this.$message.error('删除失败')
+          }
+        })
+        .catch(error => {
+          if (error !== 'cancel') { // 排除取消操作的错误
+            console.error('删除失败:', error)
+            this.$message.error('删除失败，请重试')
           }
-        }).catch(error => {
-          console.error('删除失败:', error)
-          this.$message.error('删除失败，请重试')
         })
-      }).catch(() => {
-        // 取消删除
-      })
-    },
-
-    onHandleBackList() {
-      this.isEquipmentInputShow = false
-      this.getEquipmentApplyList()
     }
+
   }
 }
 </script>
diff --git a/src/views/EquipmentEntryApproval/index.vue b/src/views/EquipmentEntryApproval/index.vue
index 24bffc5f..e243d5bb 100644
--- a/src/views/EquipmentEntryApproval/index.vue
+++ b/src/views/EquipmentEntryApproval/index.vue
@@ -1,19 +1,15 @@
 <template>
   <div class="app-container">
-    <template v-if="!isEquipmentInputShow">
-      <el-form :model="queryParams" ref="queryFormRef" inline  label-width="auto" size="small">
+    <template>
+      <el-form
+        :model="queryParams"
+        ref="queryFormRef"
+        inline
+        label-width="auto"
+        size="small"
+      >
         <!-- 表单搜索 -->
         <el-row>
-          <el-col :span="5">
-            <el-form-item label="关键字" prop="keyWord">
-              <el-input
-                clearable
-                style="width: 100%"
-                placeholder="请输入关键字"
-                v-model.trim="queryParams.keyWord"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="5">
             <el-form-item label="审批状态" prop="status">
               <el-select
@@ -22,8 +18,8 @@
                 placeholder="请选择审批状态"
                 v-model="queryParams.status"
               >
-                <el-option label="待审批" value="0" />
-                <el-option label="已审批" value="1" />
+                <el-option label="待审批" value="0"/>
+                <el-option label="已审批" value="1"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -35,53 +31,51 @@
                 value-format="YYYY-MM-DD"
                 placeholder="请选择申请时间"
                 v-model="queryParams.applyTime"
-              >
-              </el-date-picker>
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="9">
-            <el-form-item prop="code">
-              <el-button class="primary-lease" type="primary" @click="onHandleSQuery()">
+          <el-col :span="5" style="float:right;">
+            <el-form-item>
+              <el-button class="primary-lease" type="primary" @click="getEquipmentApplyList">
                 查询
               </el-button>
-              <el-button class="primary-lease" type="primary" @click="onHandleReset()">
+              <el-button class="primary-lease" type="primary" @click="resetForm">
                 重置
               </el-button>
-              <el-button
-                class="primary-lease"
-                type="primary"
-                @click="onHandleBatchImport()"
-              >
-                批量导入
-              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
 
         <!-- 表格 -->
         <el-table :data="tableData">
-          <el-table-column label="序号" align="center" width="55" type="index" />
-          <el-table-column prop="createUser" label="申请人" align="center" />
-          <el-table-column prop="createTime" label="申请时间" align="center" />
-          <el-table-column prop="devCount" label="设备数量" align="center" />
+          <el-table-column label="序号" align="center" width="55" type="index"/>
+          <el-table-column prop="createUser" label="申请人" align="center"/>
+          <el-table-column prop="createTime" label="申请时间" align="center"/>
+          <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 == 1" size="small" type="warning">已审批</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center">
             <template slot-scope="{ row }">
-              <el-button type="primary" size="small" @click="onHandleView(row)">
+              <el-button type="primary" size="small" @click="showEquipmentInput(row.id, true)">
                 查看
               </el-button>
-              <el-button type="primary" size="small" @click="onHandleAuditing(row)">
+              <el-button
+                type="primary"
+                size="small"
+                @click="showEquipmentInput(row.id, false)"
+                v-if="row.status == '0'"
+              >
                 审批
               </el-button>
             </template>
           </el-table-column>
         </el-table>
+
+        <!-- 分页 -->
         <pagination
           :total="total"
           @pagination="handlePageChange"
@@ -90,31 +84,35 @@
         />
       </el-form>
     </template>
-
-<!--    <EquipmentInput :order-ids="orderIds" :is-view="isView" v-else @backList="onHandleBackList" />-->
+    <EquipmentEntryDialog
+      :is-visible.sync="isVisible"
+      :order-id="orderId"
+      :is-add-visible="true"
+      :is-approval-visible="isApprovalVisible"
+    />
   </div>
 </template>
 
 <script>
 import { getEquipmentApplyListApi, equipmentDelApiNew } from '@/api/EquipmentEntryApply/index'
-
+import EquipmentEntryDialog from '@/views/EquipmentEntryApply/equipmentInput/index1.vue'
 
 export default {
   components: {
-    /* EquipmentInput */
+    EquipmentEntryDialog
   },
   data() {
     return {
       total: 0,
-      orderIds: '',
-      isView: false,
-      isEquipmentInputShow: false,
+      orderId: '',
+      isVisible: false,
+      isAddVisible: false,
+      isApprovalVisible: false,
       queryParams: {
-        keyWord: '',
         status: '0',
         applyTime: '',
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       },
       tableData: []
     }
@@ -123,106 +121,79 @@ export default {
     this.getEquipmentApplyList()
   },
   methods: {
-    // 获取装备申请列表
+    /**
+     * 获取装备申请列表
+     */
     getEquipmentApplyList() {
-      getEquipmentApplyListApi(this.queryParams).then((res) => {
-        console.log('获取装备申请列表***', res)
-        this.tableData = res.data.rows
-        this.total = res.data.total
-      }).catch(error => {
-        console.error('获取装备申请列表失败:', error)
-      })
+      getEquipmentApplyListApi(this.queryParams)
+        .then(res => {
+          this.tableData = res.data.rows
+          this.total = res.data.total
+        })
+        .catch(error => {
+          console.error('获取装备申请列表失败:', error)
+        })
     },
 
-    // 分页处理
-    handlePageChange(pageNum) {
-      this.queryParams.pageNum = pageNum
+    /**
+     * 分页变化处理
+     */
+    handlePageChange() {
       this.getEquipmentApplyList()
     },
 
-    handleSizeChange(pageSize) {
-      this.queryParams.pageSize = pageSize
-      this.getEquipmentApplyList()
-    },
-
-    onHandleSQuery() {
-      console.log('查询')
-      this.getEquipmentApplyList()
-    },
-
-    onHandleReset() {
-      console.log('重置')
-      this.queryParams = {
-        keyWord: '',
-        status: '0',
-        applyTime: '',
-        pageNum: 1,
-        pageSize: 10,
-      }
+    /**
+     * 重置表单
+     */
+    resetForm() {
       this.$refs.queryFormRef.resetFields()
+      this.queryParams.pageNum = 1
       this.getEquipmentApplyList()
     },
 
-    onHandleEquipmentInput() {
-      this.orderIds = ''
-      this.isView = false
-      this.isEquipmentInputShow = true
+    /**
+     * 显示装备录入/编辑/查看界面
+     */
+    showEquipmentInput(orderId, isApprovalVisible) {
+      this.orderId = orderId
+      this.isVisible = true
+      this.isApprovalVisible = isApprovalVisible
+
     },
 
+    /**
+     * 批量导入
+     */
     onHandleBatchImport() {
       console.log('批量导入')
     },
 
-    onHandleView(row) {
-      console.log('查看', row)
-      this.orderIds = row.id
-      this.isView = true
-      this.isEquipmentInputShow = true
-    },
-
-    onHandleAuditing(row) {
-      this.orderIds = row.id
-      this.isView = false
-      this.isEquipmentInputShow = true
-      console.log('审批', row)
-    },
-
-    onHandleDelete(row) {
+    /**
+     * 删除项目
+     */
+    deleteItem(row) {
       this.$confirm('是否确定删除？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        console.log('删除', row)
-        equipmentDelApiNew({ id: row.id }).then((res) => {
-          console.log('删除结果', res)
+      })
+        .then(() => equipmentDelApiNew({ id: row.id }))
+        .then(res => {
           if (res.code === 200) {
-            this.$message({
-              type: 'success',
-              message: '删除成功',
-              duration: 1000,
-            })
+            this.$message.success('删除成功')
             this.getEquipmentApplyList()
           } else {
-            this.$message({
-              type: 'error',
-              message: '删除失败',
-              duration: 1000,
-            })
+            this.$message.error('删除失败')
+          }
+        })
+        .catch(error => {
+          if (error !== 'cancel') { // 排除取消操作的错误
+            console.error('删除失败:', error)
+            this.$message.error('删除失败，请重试')
           }
-        }).catch(error => {
-          console.error('删除失败:', error)
-          this.$message.error('删除失败，请重试')
         })
-      }).catch(() => {
-        // 取消删除
-      })
-    },
-
-    onHandleBackList() {
-      this.isEquipmentInputShow = false
-      this.getEquipmentApplyList()
     }
+
   }
 }
 </script>
@@ -241,4 +212,3 @@ export default {
   margin-right: 8px;
 }
 </style>
-