diff --git a/src/views/EquipmentEntryApply/equipmentInput/index.vue b/src/views/EquipmentEntryApply/equipmentInput/index.vue
index 0cfdf49c..be611e6e 100644
--- a/src/views/EquipmentEntryApply/equipmentInput/index.vue
+++ b/src/views/EquipmentEntryApply/equipmentInput/index.vue
@@ -25,276 +25,291 @@
       label-width="auto"
       size="small"
     >
-    <el-card class="search-box">
-      <el-row>
-      <el-form-item prop="orderCreateUser" label="申请人：">
-        <el-input
-          clearable
-          style="width: 200px"
-          placeholder="请输入内容"
-          v-model.trim="queryParams.orderCreateUser"
-        />
-      </el-form-item>
-      <el-form-item label="申请时间：" prop="orderCreateTime">
-        <el-date-picker
-          type="daterange"
-          style="width: 200px"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          value-format="yyyy-MM-dd"
-          v-model="queryParams.orderCreateTime"
-        />
-      </el-form-item>
+      <el-card class="search-box">
+        <el-row>
+          <el-form-item prop="orderCreateUser" label="申请人：">
+            <el-input
+              clearable
+              style="width: 200px"
+              placeholder="请输入内容"
+              v-model.trim="queryParams.orderCreateUser"
+            />
+          </el-form-item>
+          <el-form-item label="申请时间：" prop="orderCreateTime">
+            <el-date-picker
+              type="daterange"
+              style="width: 200px"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+              v-model="queryParams.orderCreateTime"
+            />
+          </el-form-item>
 
-      <el-form-item label="审批状态" prop="status">
-        <el-select
-          clearable
-          style="width: 200px"
-          placeholder="请选择审批状态"
-          v-model="queryParams.status"
-        >
-          <el-option label="待审批" value="0"/>
-          <el-option label="已审批" value="1"/>
-          <el-option label="草稿" value="3"/>
-        </el-select>
-      </el-form-item>
+          <el-form-item label="审批状态" prop="status">
+            <el-select
+              clearable
+              style="width: 200px"
+              placeholder="请选择审批状态"
+              v-model="queryParams.status"
+            >
+              <el-option label="待审批" value="0"/>
+              <el-option label="已审批" value="1"/>
+              <el-option label="草稿" value="3"/>
+            </el-select>
+          </el-form-item>
 
-      <el-form-item prop="name" label="装备名称：">
-        <el-input
-          clearable
-          style="width: 200px"
-          placeholder="请输入内容"
-          v-model.trim="queryParams.name"
-        />
-      </el-form-item>
+          <el-form-item prop="name" label="装备名称：">
+            <el-input
+              clearable
+              style="width: 200px"
+              placeholder="请输入内容"
+              v-model.trim="queryParams.name"
+            />
+          </el-form-item>
 
-      <el-form-item prop="specificationModel" label="规格型号：">
-        <el-input
-          clearable
-          style="width: 200px"
-          placeholder="请输入内容"
-          v-model.trim="queryParams.specificationModel"
-        />
-      </el-form-item>
+          <el-form-item prop="specificationModel" label="规格型号：">
+            <el-input
+              clearable
+              style="width: 200px"
+              placeholder="请输入内容"
+              v-model.trim="queryParams.specificationModel"
+            />
+          </el-form-item>
 
-      <el-form-item prop="originalCode" label="装备原始编码：">
-        <el-input
-          clearable
-          style="width: 200px"
-          placeholder="请输入内容"
-          v-model.trim="queryParams.originalCode"
-        />
-      </el-form-item>
+          <el-form-item prop="originalCode" label="装备原始编码：">
+            <el-input
+              clearable
+              style="width: 200px"
+              placeholder="请输入内容"
+              v-model.trim="queryParams.originalCode"
+            />
+          </el-form-item>
 
-      <el-form-item prop="manufacturerId" label="生产厂家：">
-        <el-select
-          v-model="queryParams.manufacturerId"
-          placeholder="请选择生产厂家"
-          clearable
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in manufacturerList"
-            :key="item.id"
-            :label="item.label"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
+          <el-form-item prop="manufacturerId" label="生产厂家：">
+            <el-select
+              v-model="queryParams.manufacturerId"
+              placeholder="请选择生产厂家"
+              clearable
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in manufacturerList"
+                :key="item.id"
+                :label="item.label"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
 
-      <el-form-item prop="productionDate" label="出厂日期：">
-        <el-date-picker
-          type="daterange"
-          style="width: 200px"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          value-format="yyyy-MM-dd"
-          v-model="queryParams.productionDate"
-        />
-      </el-form-item>
+          <el-form-item prop="productionDate" label="出厂日期：">
+            <el-date-picker
+              type="daterange"
+              style="width: 200px"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+              v-model="queryParams.productionDate"
+            />
+          </el-form-item>
 
-      <!--        <el-form-item prop="keyword" label="采购日期：">
-                <el-date-picker
-                  type="date"
-                  style="width: 240px"
-                  value-format="YYYY-MM-DD"
-                  placeholder="请选择采购日期"
-                  v-model="queryParams.applyTime"
-                />
-              </el-form-item>-->
+          <!--        <el-form-item prop="keyword" label="采购日期：">
+                    <el-date-picker
+                      type="date"
+                      style="width: 240px"
+                      value-format="YYYY-MM-DD"
+                      placeholder="请选择采购日期"
+                      v-model="queryParams.applyTime"
+                    />
+                  </el-form-item>-->
 
-      <el-form-item prop="minBuyPrice" label="资产原值：">
-        <el-input
-          clearable
-          style="width: 90px"
-          placeholder="请输入"
-          v-model.trim="queryParams.minBuyPrice"
-        />
+          <el-form-item prop="minBuyPrice" label="资产原值：">
+            <el-input
+              clearable
+              style="width: 90px"
+              placeholder="请输入"
+              v-model.trim="queryParams.minBuyPrice"
+            />
 
-      </el-form-item>
-      <el-form-item prop="maxBuyPrice" label="-" style="margin-left: -6%;">
-        <el-input
-          clearable
-          style="width: 90px"
-          placeholder="请输入"
-          v-model.trim="queryParams.maxBuyPrice"
-        />
-      </el-form-item>
-    </el-row>
-      <el-row>
-        <el-col :span="24" style="text-align: right;">
-          <el-button icon="el-icon-search" type="primary" @click="queryTableList" size="mini">
-          查询
-        </el-button>
-        <el-button icon="el-icon-refresh"
-          @click="resetTableList" size="mini"
-        >
-          重置
-        </el-button>
-        </el-col>
-      </el-row>
-    </el-card>
+          </el-form-item>
+          <el-form-item prop="maxBuyPrice" label="-" style="margin-left: -6%;">
+            <el-input
+              clearable
+              style="width: 90px"
+              placeholder="请输入"
+              v-model.trim="queryParams.maxBuyPrice"
+            />
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-col :span="24" style="text-align: right;">
+            <el-button icon="el-icon-search" type="primary" @click="queryTableList" size="mini">
+              查询
+            </el-button>
+            <el-button icon="el-icon-refresh"
+                       @click="resetTableList" size="mini"
+            >
+              重置
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-card>
     </el-form>
 
     <el-card class="content-box">
+
       <el-row>
         <el-col :span="24" style="text-align: right;">
           <el-button
-          type="primary"
-          size="mini"
-          @click="equipmentDeployment"
-          v-show="!isAddVisible"
-        >
-          新增装备
-        </el-button>
+            type="primary"
+            size="mini"
+            @click="equipmentDeployment"
+            v-show="!isAddVisible"
+          >
+            新增装备
+          </el-button>
+          <el-button
+            type="primary"
+            size="mini"
+            @click="handleImport"
+            v-show=" !isAddVisible"
+          >
+            批量导入
+          </el-button>
         </el-col>
       </el-row>
-    <!-- 表格 -->
-    <el-table
-      :data="tableData"
-      style="width: auto"
-      show-overflow-tooltip
-      :span-method="handleSpanMethod"
-      border
-      stripe
-      height="100%"
-    >
-      <el-table-column label="序号" align="center" width="55" type="index" fixed/>
-      <el-table-column prop="orderNumber" label="录入单号" align="center" show-overflow-tooltip
-                       column-key="orderNumber" fixed min-width="200"
-      />
-      <el-table-column prop="major" label="专业" align="center" show-overflow-tooltip min-width="100"/>
-      <el-table-column prop="orderNumber" label="工序" align="center" show-overflow-tooltip min-width="100">
-        <template slot-scope="scope">
-          {{ scope.row.mainProcess }}{{ scope.row.subProcess ? '>' + scope.row.subProcess : '' }}
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="orderNumber" label="装备类目" show-overflow-tooltip align="center" min-width="100">
-        <template slot-scope="scope">
-          {{ scope.row.mainCategory ? scope.row.mainCategory + '>' : '' }}
-          {{ scope.row.branch ? scope.row.subCategory + '>' : scope.row.subCategory }}{{ scope.row.branch }}
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="name" label="装备名称" show-overflow-tooltip align="center" min-width="100"/>
-      <el-table-column prop="specificationModel" label="规格型号" show-overflow-tooltip align="center" min-width="100"/>
-      <el-table-column prop="originalCode" label="装备原始编码" show-overflow-tooltip align="center" min-width="100"/>
-      <el-table-column prop="unit" label="计量单位" show-overflow-tooltip align="center" min-width="100"/>
-      <el-table-column prop="manufacturer" label="生产厂家" show-overflow-tooltip align="center" min-width="100"/>
-      <el-table-column prop="productionDate" label="出厂日期" show-overflow-tooltip align="center" min-width="100"/>
-      <!--        <el-table-column prop="orderNumber" label="采购日期" align="center"/>-->
-      <el-table-column prop="originalValue" label="资产原值（元）" show-overflow-tooltip align="center" min-width="100"/>
-      <!--        <el-table-column prop="orderNumber" label="最大使用年限（年）" align="center"/>-->
-      <!--        <el-table-column prop="orderNumber" label="下次维保日期" align="center"/>-->
-      <el-table-column prop="province" label="所属省份" show-overflow-tooltip align="center" min-width="100"/>
-      <el-table-column prop="appearanceImages" label="装备外观" show-overflow-tooltip align="center" min-width="100">
-        <template v-slot="{ row }">
-          <span style="color: #00a288; cursor: pointer" @click="handleView(row, 1)">查看</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="certificates" label="合格证" show-overflow-tooltip align="center" min-width="100">
-        <template v-slot="{ row }">
-          <span style="color: #00a288; cursor: pointer" @click="handleView(row, 2)">查看</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="inspectionReports" label="定期检验报告" show-overflow-tooltip align="center" min-width="100">
-        <template v-slot="{ row }">
-          <span style="color: #00a288; cursor: pointer" @click="handleView(row, 3)">查看</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="purchaseInvoices" label="采购发票" show-overflow-tooltip align="center" min-width="100">
-        <template v-slot="{ row }">
-          <span style="color: #00a288; cursor: pointer" @click="handleView(row, 4)">查看</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in columns"
-        v-if="item.visible"
-        :key="index"
-        align="center"
+      <!-- 表格 -->
+      <el-table
+        :data="tableData"
+        style="width: auto"
         show-overflow-tooltip
-        :label="item.label"
-        :prop="item.prop"
+        :span-method="handleSpanMethod"
+        border
+        stripe
+        height="100%"
       >
-        <template v-slot="{ row }" v-if="/^feature(Item|Value)\d+$/.test(item.prop)">
+        <el-table-column label="序号" align="center" width="55" type="index" fixed/>
+        <el-table-column prop="orderNumber" label="录入单号" align="center" show-overflow-tooltip
+                         column-key="orderNumber" fixed min-width="200"
+        />
+        <el-table-column prop="major" label="专业" align="center" show-overflow-tooltip min-width="100"/>
+        <el-table-column prop="orderNumber" label="工序" align="center" show-overflow-tooltip min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.mainProcess }}{{ scope.row.subProcess ? '>' + scope.row.subProcess : '' }}
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="orderNumber" label="装备类目" show-overflow-tooltip align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.mainCategory ? scope.row.mainCategory + '>' : '' }}
+            {{ scope.row.branch ? scope.row.subCategory + '>' : scope.row.subCategory }}{{ scope.row.branch }}
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="name" label="装备名称" show-overflow-tooltip align="center" min-width="100"/>
+        <el-table-column prop="specificationModel" label="规格型号" show-overflow-tooltip align="center"
+                         min-width="100"
+        />
+        <el-table-column prop="originalCode" label="装备原始编码" show-overflow-tooltip align="center" min-width="100"/>
+        <el-table-column prop="unit" label="计量单位" show-overflow-tooltip align="center" min-width="100"/>
+        <el-table-column prop="manufacturer" label="生产厂家" show-overflow-tooltip align="center" min-width="100"/>
+        <el-table-column prop="productionDate" label="出厂日期" show-overflow-tooltip align="center" min-width="100"/>
+        <!--        <el-table-column prop="orderNumber" label="采购日期" align="center"/>-->
+        <el-table-column prop="originalValue" label="资产原值（元）" show-overflow-tooltip align="center"
+                         min-width="100"
+        />
+        <!--        <el-table-column prop="orderNumber" label="最大使用年限（年）" align="center"/>-->
+        <!--        <el-table-column prop="orderNumber" label="下次维保日期" align="center"/>-->
+        <el-table-column prop="province" label="所属省份" show-overflow-tooltip align="center" min-width="100"/>
+        <el-table-column prop="appearanceImages" label="装备外观" show-overflow-tooltip align="center" min-width="100">
+          <template v-slot="{ row }">
+            <span style="color: #00a288; cursor: pointer" @click="handleView(row, 1)">查看</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="certificates" label="合格证" show-overflow-tooltip align="center" min-width="100">
+          <template v-slot="{ row }">
+            <span style="color: #00a288; cursor: pointer" @click="handleView(row, 2)">查看</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="inspectionReports" label="定期检验报告" show-overflow-tooltip align="center"
+                         min-width="100"
+        >
+          <template v-slot="{ row }">
+            <span style="color: #00a288; cursor: pointer" @click="handleView(row, 3)">查看</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="purchaseInvoices" label="采购发票" show-overflow-tooltip align="center" min-width="100">
+          <template v-slot="{ row }">
+            <span style="color: #00a288; cursor: pointer" @click="handleView(row, 4)">查看</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item, index) in columns"
+          v-if="item.visible"
+          :key="index"
+          align="center"
+          show-overflow-tooltip
+          :label="item.label"
+          :prop="item.prop"
+        >
+          <template v-slot="{ row }" v-if="/^feature(Item|Value)\d+$/.test(item.prop)">
           <span>
             {{ getFeatureValue(row, item.prop) }}
           </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="orderCreateUser" label="申请人" show-overflow-tooltip align="center" fixed="right"
-                       min-width="100"
-      />
-      <el-table-column prop="orderCreateTime" label="申请时间" show-overflow-tooltip align="center" fixed="right"
-                       min-width="100"
-      />
-      <el-table-column prop="entryStatus" align="center" show-overflow-tooltip label="审批状态" fixed="right"
-                       min-width="100"
-      >
-        <template slot-scope="{ row }">
-          <el-tag v-if="row.entryStatus == 0" size="small" type="warning">待审批</el-tag>
-          <el-tag v-if="row.entryStatus == 1" size="small" type="success">已通过</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="info">草稿</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" min-width="300" fixed="right">
-        <template slot-scope="{ row }">
-          <el-button type="text" @click="handleViewDetail(row)">
-            <i class="el-icon-view"></i> 查看
-          </el-button>
-          <el-button
-            type="text"
-            @click="editRowInfo(row)"
-            v-if="row.orderStatus == '3' && !isAddVisible"
-          >
-            <i class="el-icon-edit"></i> 编辑
-          </el-button>
-          <el-button
-            type="text"
-            @click="deleteRowInfo(row)"
-            v-if="row.orderStatus == '3' && !isAddVisible"
-          >
-            <i class="el-icon-delete"></i> 删除
-          </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="orderCreateUser" label="申请人" show-overflow-tooltip align="center" fixed="right"
+                         min-width="100"
+        />
+        <el-table-column prop="orderCreateTime" label="申请时间" show-overflow-tooltip align="center" fixed="right"
+                         min-width="100"
+        />
+        <el-table-column prop="entryStatus" align="center" show-overflow-tooltip label="审批状态" fixed="right"
+                         min-width="100"
+        >
+          <template slot-scope="{ row }">
+            <el-tag v-if="row.entryStatus == 0" size="small" type="warning">待审批</el-tag>
+            <el-tag v-if="row.entryStatus == 1" size="small" type="success">已通过</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="info">草稿</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" min-width="300" fixed="right">
+          <template slot-scope="{ row }">
+            <el-button type="text" @click="handleViewDetail(row)">
+              <i class="el-icon-view"></i> 查看
+            </el-button>
+            <el-button
+              type="text"
+              @click="editRowInfo(row)"
+              v-if="row.orderStatus == '3' && !isAddVisible"
+            >
+              <i class="el-icon-edit"></i> 编辑
+            </el-button>
+            <el-button
+              type="text"
+              @click="deleteRowInfo(row)"
+              v-if="row.orderStatus == '3' && !isAddVisible"
+            >
+              <i class="el-icon-delete"></i> 删除
+            </el-button>
 
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="pagination-wrapper">
-      <pagination
-        :total="total"
-        @pagination="getList"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-      />
-    </div>
-   </el-card>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination-wrapper">
+        <pagination
+          :total="total"
+          @pagination="getList"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+        />
+      </div>
+    </el-card>
     <EquipmentEntryEditDialog
       :is-visible.sync="isEditVisible"
       :order-id="orderId"
@@ -304,7 +319,7 @@
     <!-- 弹框 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
       <el-table :data="dialogList" fit highlight-current-row style="width: 100%" :max-height="500">
-        <el-table-column type="index" width="55" label="序号" align="center" />
+        <el-table-column type="index" width="55" label="序号" align="center"/>
         <el-table-column label="附件名称" prop="fileName" align="center">
           <!-- 插槽 -->
           <template v-slot="{ row }">
@@ -317,7 +332,43 @@
         <el-button @click="dialogVisible = false">关 闭</el-button>
       </span>
     </el-dialog>
-    
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?orderId=' + orderId"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+          >下载模板
+          </el-link
+          >
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 
 
@@ -334,6 +385,7 @@ import {
   removeDeviceApi
 } from '@/api/EquipmentEntryApply'
 import { getManufacturerSelectApi } from '@/api/EquipmentLedger/index.js'
+import { getToken } from '@/utils/auth'
 
 export default {
   name: 'EquipmentInput',
@@ -342,7 +394,7 @@ export default {
   created() {
     console.log(this.$route)
     this.orderId = this.$route.query && this.$route.query.orderId
-    this.isAddVisible = this.$route.query && this.$route.query.isAddVisible == 'true'
+    this.isAddVisible = this.$route.query && this.$route.query.isAddVisible
     this.isApprovalVisible = this.$route.query && this.$route.query.isApprovalVisible
     if (!this.orderId) {
       this.pageTitle = '新增设备录入'
@@ -367,6 +419,20 @@ export default {
       // 表格数据
       tableData: [],
       total: 0,
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: '',
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+
+        // 设置上传的请求头部
+        headers: { Authorization: 'Bearer ' + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + '/material-mall/order/importData'
+      },
       queryParams: {
         orderCreateUser: '',
         orderCreateTime: '',
@@ -391,7 +457,7 @@ export default {
         quantity: 1
       },
       isViewMode: false, // 添加查看模式标识
-      pageTitle:'',
+      pageTitle: '',
       submitButtonText: '',
       columns: [
         { key: 26, label: `特征项1`, prop: 'featureItem1', visible: true },
@@ -411,11 +477,11 @@ export default {
         { key: 40, label: `特征项8`, prop: 'featureItem8', visible: true },
         { key: 41, label: `特征值8`, prop: 'featureValue8', visible: true },
         { key: 42, label: `特征项9`, prop: 'featureItem9', visible: true },
-        { key: 43, label: `特征值9`, prop: 'featureValue9', visible: true },
+        { key: 43, label: `特征值9`, prop: 'featureValue9', visible: true }
       ],
       dialogVisible: false,
       dialogTitle: '',
-      dialogList: [],
+      dialogList: []
     }
   },
   watch: {
@@ -429,6 +495,22 @@ export default {
     this.getManufacturerSelectList()
   },
   methods: {
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false
+      this.upload.isUploading = false
+      this.$refs.upload.clearFiles()
+      this.$alert('<div style=\'overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;\'>' + response.msg + '</div>', '导入结果', { dangerouslyUseHTMLString: true })
+      this.getList()
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit()
+    },
     // 获取厂家
     getManufacturerSelectList() {
       getManufacturerSelectApi().then((res) => {
@@ -525,7 +607,7 @@ export default {
      * 处理表单提交
      */
     handleSubmit() {
-      if(this.isSubmit) return
+      if (this.isSubmit) return
       this.isSubmit = true
       const loading = this.$loading()
       equipmentSubmitApiNew({ id: this.orderId, status: 0 }).then(res => {
@@ -582,7 +664,10 @@ export default {
         }
       }
     },
-
+    handleImport() {
+      this.upload.title = '导入'
+      this.upload.open = true
+    },
     //编辑
     editRowInfo(row) {
       // this.orderId = orderId.toString()
@@ -638,7 +723,7 @@ export default {
         this.dialogList = row.purchaseInvoices || []
       }
       this.dialogVisible = true
-    },
+    }
   }
 }
 </script>
@@ -717,7 +802,7 @@ export default {
     padding-top: 6px;
     margin-top: auto;
 
-    ::v-deep  .pagination-container {
+    ::v-deep .pagination-container {
       padding: 0px 20px !important;
       margin-bottom: 30px;
     }
@@ -742,11 +827,12 @@ export default {
       }
     }
 
-    &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
+    &.el-table--striped .el-table__body tr.el-table__row:hover > td.el-table__cell {
       background-color: #CCF1E9 !important;
     }
+
     .el-table__body tr.hover-row > td.el-table__cell {
-            background-color: #ccf1e9 !important;
+      background-color: #ccf1e9 !important;
     }
   }
 }
diff --git a/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue b/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue
index 25e3f1b8..e16c799c 100644
--- a/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <div class="table-container" style="flex: 1; overflow-y: auto;">
-        <el-table :data="tableData" style="width: 100%" border stripe >
+        <el-table :data="tableData" style="width: 100%" border stripe>
           <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50"/>
           <el-table-column align="center" show-overflow-tooltip prop="createUser" label="操作人"/>
           <el-table-column align="center" show-overflow-tooltip prop="type" label="操作类型">
@@ -124,7 +124,8 @@
         </el-row>
         <div class="dialog-table">
           <table border="1" cellspacing="0" cellpadding="6"
-                 style="width: 100%; border-collapse: collapse; text-align: center;">
+                 style="width: 100%; border-collapse: collapse; text-align: center;"
+          >
             <thead>
             <tr>
               <th style="width: 100px;">序号</th>
@@ -138,11 +139,11 @@
             <tbody>
             <tr v-for="(item, index) in outRecordData" :key="index">
               <td>{{ index + 1 }}</td>
-              <td>  {{ item.type === '1' ? '工具' : (item.type === '2' ? '装备' : '未知类型')  }}</td>
+              <td> {{ item.type === '1' ? '工具' : (item.type === '2' ? '装备' : '未知类型') }}</td>
               <td>{{ item.devName }}</td>
               <td>{{ item.devModel }}</td>
               <td>{{ item.devCode }}</td>
-              <td>{{item.devNum}}</td>
+              <td>{{ item.devNum }}</td>
             </tr>
             </tbody>
           </table>
@@ -164,7 +165,7 @@
 </template>
 
 <script>
-import {getRoamRecordListAPI, getOutRecordListAPI} from '@/api/EquipmentRoamRecord'
+import { getRoamRecordListAPI, getOutRecordListAPI } from '@/api/EquipmentRoamRecord'
 import vueEasyPrint from 'vue-easy-print'
 
 export default {
@@ -220,10 +221,10 @@ export default {
 
     // 出库记录单
     async onHandleOutRecord(row) {
-      const {changeUnit, useUint, proName, devNum, id, createUser, createTime} = row
-      this.outRecordParams = {changeUnit, useUint, proName, devNum, createUser, createTime}
+      const { changeUnit, useUint, proName, devNum, id, createUser, createTime } = row
+      this.outRecordParams = { changeUnit, useUint, proName, devNum, createUser, createTime }
       this.recordId = id
-      const res = await getOutRecordListAPI({id})
+      const res = await getOutRecordListAPI({ id })
       this.outRecordData = res.data
       this.outRecordVisible = true
     },
@@ -235,7 +236,7 @@ export default {
 
     // 重置
     onHandleReset() {
-      this.queryParams = {keyWord: '', type: '', startTime: '', endTime: '', pageNum: 1, pageSize: 10}
+      this.queryParams = { keyWord: '', type: '', startTime: '', endTime: '', pageNum: 1, pageSize: 10 }
       this.dateRange = []
       this.getRoamRecordList()
     },
@@ -248,13 +249,13 @@ export default {
         {
           ...this.queryParams
         },
-        `装备流转记录.xlsx`
+        `维修记录_${new Date().getTime()}.xlsx`
       )
     },
 
     // 下载
     onHandleDownload() {
-      this.download('material-mall/decChange/exportDetails', {id: this.recordId}, `出库记录单.xlsx`)
+      this.download('material-mall/decChange/exportDetails', { id: this.recordId }, `出库记录单.xlsx`)
     },
 
     // 打印
diff --git a/src/views/EquipmentRoamRecord/outboundRecord/index.vue b/src/views/EquipmentRoamRecord/outboundRecord/index.vue
index d50b92cd..98edb674 100644
--- a/src/views/EquipmentRoamRecord/outboundRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/outboundRecord/index.vue
@@ -258,7 +258,7 @@ export default {
         {
           ...this.queryParams
         },
-        `装备流转记录.xlsx`
+        `出库记录_${new Date().getTime()}.xlsx`
       )
     },
 
diff --git a/src/views/EquipmentRoamRecord/retirementRecord/index.vue b/src/views/EquipmentRoamRecord/retirementRecord/index.vue
index e41db5dc..c8ecd75e 100644
--- a/src/views/EquipmentRoamRecord/retirementRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/retirementRecord/index.vue
@@ -259,7 +259,7 @@ export default {
         {
           ...this.queryParams
         },
-        `装备流转记录.xlsx`
+        `退役记录_${new Date().getTime()}.xlsx`
       )
     },
 
diff --git a/src/views/EquipmentRoamRecord/returnRecord/index.vue b/src/views/EquipmentRoamRecord/returnRecord/index.vue
index dcb65195..ccb4788d 100644
--- a/src/views/EquipmentRoamRecord/returnRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/returnRecord/index.vue
@@ -6,12 +6,13 @@
         <el-row>
           <el-col :span="12">
             <el-form-item prop="keyword" label="关键字">
-              <el-input clearable style="width: 240px" placeholder="请输入关键字" v-model.trim="queryParams.keyWord" />
+              <el-input clearable style="width: 240px" placeholder="请输入关键字" v-model.trim="queryParams.keyWord"/>
             </el-form-item>
 
             <el-form-item label="操作时间">
               <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" style="width: 240px"
-                value-format="yyyy-MM-dd" end-placeholder="结束日期" start-placeholder="开始日期" />
+                              value-format="yyyy-MM-dd" end-placeholder="结束日期" start-placeholder="开始日期"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12" style="text-align: right;">
@@ -31,9 +32,9 @@
         </el-col>
       </el-row>
       <div class="table-container">
-        <el-table :data="tableData" style="width: 100%" border stripe >
-          <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50" />
-          <el-table-column align="center" show-overflow-tooltip prop="createUser" label="操作人" />
+        <el-table :data="tableData" style="width: 100%" border stripe>
+          <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50"/>
+          <el-table-column align="center" show-overflow-tooltip prop="createUser" label="操作人"/>
           <el-table-column align="center" show-overflow-tooltip prop="type" label="操作类型">
             <template slot-scope="scope">
               <el-tag size="mini">
@@ -41,7 +42,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column align="center" show-overflow-tooltip prop="createTime" label="操作时间" />
+          <el-table-column align="center" show-overflow-tooltip prop="createTime" label="操作时间"/>
           <!--        <el-table-column align="center" show-overflow-tooltip prop="changeStatus" label="流转前状态">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.changeStatus == 1" size="mini">在库</el-tag>
@@ -51,17 +52,17 @@
             <el-tag v-if="scope.row.changeStatus == 5" size="mini"> 维修</el-tag>
           </template>
         </el-table-column>-->
-<!--          <el-table-column align="center" show-overflow-tooltip prop="changeStatus" label="流转后状态">-->
-<!--            <template slot-scope="scope">-->
-<!--              <el-tag v-if="scope.row.status == 1" size="mini" type="success">在库</el-tag>-->
-<!--              <el-tag v-if="scope.row.status == 2 || scope.row.status == 3" size="mini">-->
-<!--                在用-->
-<!--              </el-tag>-->
-<!--              <el-tag v-if="scope.row.status == 5" size="mini" type="waring"> 维修</el-tag>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-          <el-table-column align="center" show-overflow-tooltip prop="useUint" label="需求单位" />
-          <el-table-column align="center" show-overflow-tooltip prop="proName" label="使用项目" />
+          <!--          <el-table-column align="center" show-overflow-tooltip prop="changeStatus" label="流转后状态">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-tag v-if="scope.row.status == 1" size="mini" type="success">在库</el-tag>-->
+          <!--              <el-tag v-if="scope.row.status == 2 || scope.row.status == 3" size="mini">-->
+          <!--                在用-->
+          <!--              </el-tag>-->
+          <!--              <el-tag v-if="scope.row.status == 5" size="mini" type="waring"> 维修</el-tag>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column align="center" show-overflow-tooltip prop="useUint" label="需求单位"/>
+          <el-table-column align="center" show-overflow-tooltip prop="proName" label="使用项目"/>
           <el-table-column align="center" show-overflow-tooltip label="地址">
             <template #default="scope">
               <!-- 拼接省+市+区，空值显示为空字符串，避免出现“undefined” -->
@@ -72,7 +73,7 @@
               }}
             </template>
           </el-table-column>
-          <el-table-column align="center" show-overflow-tooltip prop="devNum" label="数量" />
+          <el-table-column align="center" show-overflow-tooltip prop="devNum" label="数量"/>
           <el-table-column align="center" show-overflow-tooltip prop="address" label="操作">
             <template slot-scope="scope">
               <el-button type="text" @click="onHandleOutRecord(scope.row)">
@@ -85,7 +86,8 @@
 
       <div class="pagination-container-fage" style="flex-shrink: 0;">
         <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getRoamRecordList" />
+                    @pagination="getRoamRecordList"
+        />
       </div>
     </el-card>
     <!-- 出库记录单 -->
@@ -115,32 +117,34 @@
           </el-col>
         </el-row>
         <div class="dialog-table">
-          <table border="1" cellspacing="0" cellpadding="6" style="width: 100%; border-collapse: collapse; text-align: center;">
+          <table border="1" cellspacing="0" cellpadding="6"
+                 style="width: 100%; border-collapse: collapse; text-align: center;"
+          >
             <thead>
-              <tr>
-                <th style="width: 100px;">序号</th>
-                <th>类型</th>
-                <th>装备名称</th>
-                <th>规格型号</th>
-                <th>装备编码</th>
-                <th>数量</th>
-                <th>使用到期时间</th>
-              </tr>
+            <tr>
+              <th style="width: 100px;">序号</th>
+              <th>类型</th>
+              <th>装备名称</th>
+              <th>规格型号</th>
+              <th>装备编码</th>
+              <th>数量</th>
+              <th>使用到期时间</th>
+            </tr>
             </thead>
             <tbody>
-              <tr v-for="(item, index) in outRecordData" :key="index">
-                <td>{{ index + 1 }}</td>
-                <td>  {{ item.type === '1' ? '工具' : (item.type === '2' ? '装备' : '未知类型')  }}</td>
-                <td>{{ item.devName }}</td>
-                <td>{{ item.devModel }}</td>
-                <td>{{ item.devCode }}</td>
-                <td>{{item.devNum}}</td>
-                <td>
-                  {{ item.useStartTime ? item.useStartTime : '-' }}
-                  至
-                  {{ item.useEndTime ? item.useEndTime : '-' }}
-                </td>
-              </tr>
+            <tr v-for="(item, index) in outRecordData" :key="index">
+              <td>{{ index + 1 }}</td>
+              <td> {{ item.type === '1' ? '工具' : (item.type === '2' ? '装备' : '未知类型') }}</td>
+              <td>{{ item.devName }}</td>
+              <td>{{ item.devModel }}</td>
+              <td>{{ item.devCode }}</td>
+              <td>{{ item.devNum }}</td>
+              <td>
+                {{ item.useStartTime ? item.useStartTime : '-' }}
+                至
+                {{ item.useEndTime ? item.useEndTime : '-' }}
+              </td>
+            </tr>
             </tbody>
           </table>
         </div>
@@ -245,7 +249,7 @@ export default {
         {
           ...this.queryParams
         },
-        `装备流转记录.xlsx`
+        `退库记录_${new Date().getTime()}.xlsx`
       )
     },
 
@@ -282,7 +286,6 @@ export default {
 }
 
 
-
 .button-group {
   float: right;
   margin-left: 10px;
@@ -296,9 +299,10 @@ export default {
   margin-bottom: 20px;
   border-radius: 8px;
   padding: 0;
+
   ::v-deep .el-card__body {
     padding: 20px !important;
-}
+  }
 }
 
 .content-box {
@@ -367,7 +371,7 @@ export default {
       }
     }
 
-    &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
+    &.el-table--striped .el-table__body tr.el-table__row:hover > td.el-table__cell {
       background-color: #CCF1E9 !important;
     }
   }
@@ -418,7 +422,7 @@ export default {
       }
     }
 
-    &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
+    &.el-table--striped .el-table__body tr.el-table__row:hover > td.el-table__cell {
       background-color: #CCF1E9 !important;
     }
 
@@ -432,6 +436,7 @@ export default {
     }
   }
 }
+
 table {
   width: 100%;
   border-collapse: collapse; /* ✅ 连起来的关键 */
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d04abfcc..c15c984b 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -4,7 +4,7 @@
 
     <el-row :gutter="20">
       <!--部门数据-->
-      <el-col :span="4" :xs="24">
+      <el-col :span="5" :xs="24">
         <div class="head-container">
           <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
                     style="margin-bottom: 20px"
@@ -22,7 +22,7 @@
       <!--用户数据-->
       <!--    查询条件卡片-->
 
-      <el-col :span="20" :xs="24">
+      <el-col :span="19" :xs="24">
         <div class="card-container">
           <div class="card-header query-header">
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"