From 307997e527140fa7094b06d7bddcae86b78f0e33 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Thu, 30 Oct 2025 11:31:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EquipmentLedger/components/equ-store.vue  | 102 +++++++++++-------
 .../maintenanceRecord/index.vue               |  93 ++++++++++------
 .../outboundRecord/index.vue                  |  94 ++++++++++------
 .../retirementRecord/index.vue                |  93 ++++++++++------
 .../returnRecord/index.vue                    |  93 ++++++++++------
 5 files changed, 316 insertions(+), 159 deletions(-)

diff --git a/src/views/EquipmentLedger/components/equ-store.vue b/src/views/EquipmentLedger/components/equ-store.vue
index 73108f7d..2fde59d5 100644
--- a/src/views/EquipmentLedger/components/equ-store.vue
+++ b/src/views/EquipmentLedger/components/equ-store.vue
@@ -61,10 +61,17 @@
       </el-row>
       <el-table :data="selectedEquipment" border stripe>
         <el-table-column label="序号" type="index" align="center" width="55" />
-        <el-table-column prop="devName" label="装备名称" align="center" />
-        <el-table-column prop="devName" label="装备系列" align="center" />
-        <el-table-column prop="devModel" label="规格型号" align="center" />
-        <el-table-column prop="devCode" label="装备编码" align="center" />
+        <el-table-column prop="name" label="装备名称" align="center" />
+        <el-table-column prop="devCategory" label="装备类目" align="center">
+          <template slot-scope="{ row }">
+            <span>
+              {{ row.mainCategory ? row.mainCategory + '>' : '' }}
+              {{ row.branch ? row.subCategory + '>' : row.subCategory }}{{ row.branch }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="specificationModel" label="规格型号" align="center" />
+        <el-table-column prop="code" label="装备编码" align="center" />
         <el-table-column label="入库数量" align="center">
           <template slot-scope="{ row }">
             <!-- <el-input-number
@@ -85,7 +92,7 @@
             <span v-if="row.status == 5" size="mini">维修</span>
           </template>
         </el-table-column>
-        <el-table-column label="使用到期日期" align="center">
+        <el-table-column label="使用到期日期" align="center" width="180">
           <template slot-scope="scope">
             <el-date-picker
               type="date"
@@ -93,6 +100,7 @@
               placeholder="选择使用日期"
               value-format="yyyy-MM-dd"
               :class="{ 'error-border': scope.row.validationError && scope.row.validationError.useTime }"
+              style="width: 150px"
             />
             <span class="error-text" v-if="scope.row.validationError && scope.row.validationError.useTime">
               使用到期日期不能为空
@@ -102,9 +110,9 @@
         <!-- 是否维修 -->
         <el-table-column label="是否维修" align="center">
           <template slot-scope="{ row }">
-            <el-select v-model="row.isRepair" placeholder="请选择是否维修">
-              <el-option label="是" value="1" />
-              <el-option label="否" value="0" />
+            <el-select v-model="row.changeStatus" placeholder="请选择是否维修">
+              <el-option label="是" value="5" />
+              <el-option label="否" value="1" />
             </el-select>
           </template>
         </el-table-column>
@@ -116,7 +124,7 @@
       </el-table>
     </div>
 
-    <el-dialog title="添加变更装备" :visible.sync="addEquipmentVisible" width="90%" @close="handleDialogClose">
+    <el-dialog title="添加装备" :visible.sync="addEquipmentVisible" width="90%" @close="handleDialogClose">
       <el-form :inline="true" label-width="auto">
         <el-row>
           <el-col :span="6">
@@ -149,47 +157,57 @@
       >
         <el-table-column label="序号" type="index" align="center" width="55" />
         <el-table-column width="55" align="center" type="selection" />
-        <el-table-column width="160" show-overflow-tooltip prop="compName" label="公司名称" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="devName" label="装备名称" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="devModel" label="装备型号" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="devCode" label="装备编号" align="center" />
-        <el-table-column align="center" show-overflow-tooltip prop="changeStatus" label="状态">
+        <el-table-column width="160" show-overflow-tooltip prop="propertyUnit" label="公司名称" align="center" />
+        <el-table-column width="160" show-overflow-tooltip prop="name" label="装备名称" align="center" />
+        <el-table-column width="160" show-overflow-tooltip prop="specificationModel" label="装备型号" align="center" />
+        <el-table-column width="160" show-overflow-tooltip prop="code" label="装备编号" align="center" />
+        <el-table-column width="160" show-overflow-tooltip prop="unit" label="计数单位" align="center" />
+        <el-table-column align="center" show-overflow-tooltip prop="status" label="状态">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status == 1" size="mini">在库</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"> 维修 </el-tag>
           </template>
         </el-table-column>
-        <el-table-column width="160" show-overflow-tooltip prop="unit" label="计数单位" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="compName" label="产权单位" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="buyPrice" label="资产原值(元)" align="center" />
+        <el-table-column width="160" show-overflow-tooltip prop="propertyUnit" label="产权单位" align="center" />
+        <el-table-column width="160" show-overflow-tooltip prop="originalValue" label="资产原值(元)" align="center" />
         <el-table-column width="160" show-overflow-tooltip prop="productDate" label="出厂日期" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="useYears" label="使用年限" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="proName" label="所在项目" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="nextDate" label="下次检验日期" align="center" />
+        <el-table-column
+          width="160"
+          show-overflow-tooltip
+          prop="maxServiceLifeYears"
+          label="最大使用年限"
+          align="center"
+        />
+        <el-table-column width="160" show-overflow-tooltip prop="usingProject" label="使用项目" align="center" />
+        <el-table-column
+          width="160"
+          show-overflow-tooltip
+          prop="nextMaintenanceDate"
+          label="下次检验日期"
+          align="center"
+        />
         <el-table-column width="160" show-overflow-tooltip prop="manufacturer" label="生产厂商" align="center" />
         <template v-for="item in tableColumns">
           <!-- 特征项列 -->
-          <el-table-column :key="'item-' + item" align="center" show-overflow-tooltip :label="'特征项' + item">
-            <template slot-scope="scope">
-              <span v-if="scope.row.propertyVoList && scope.row.propertyVoList.length > 0">
-                <span v-if="item - 1 < scope.row.propertyVoList.length">
-                  {{ scope.row.propertyVoList[item - 1].propertyName || '-' }}
+          <el-table-column :key="`item-${item}`" align="center" show-overflow-tooltip :label="`特征项${item}`">
+            <template slot-scope="{ row }">
+              <span v-if="row.propertyVoList && row.propertyVoList.length > 0">
+                <span v-if="item - 1 < row.propertyVoList.length">
+                  {{ row.propertyVoList[item - 1].propertyName || '-' }}
                 </span>
               </span>
-
               <span v-else> - </span>
             </template>
           </el-table-column>
           <!-- 特征值列 -->
-          <el-table-column :key="'value-' + item" align="center" show-overflow-tooltip :label="'特征值' + item">
-            <template slot-scope="scope">
-              <span v-if="scope.row.propertyVoList && scope.row.propertyVoList.length > 0">
-                <span v-if="item - 1 < scope.row.propertyVoList.length">
-                  {{ scope.row.propertyVoList[item - 1].propertyValue || '-' }}
+          <el-table-column :key="`value-${item}`" align="center" show-overflow-tooltip :label="`特征值${item}`">
+            <template slot-scope="{ row }">
+              <span v-if="row.propertyVoList && row.propertyVoList.length > 0">
+                <span v-if="item - 1 < row.propertyVoList.length">
+                  {{ row.propertyVoList[item - 1].propertyValue || '-' }}
                 </span>
               </span>
-
               <span v-else> - </span>
             </template>
           </el-table-column>
@@ -209,12 +227,12 @@
 <script>
 import { regionData } from 'element-china-area-data'
 import {
-  getSelectEquipmentListAPI,
   getMaxFeatureAPI,
   getUseProjectListAPI,
   getVoltageListAPI,
   addProjectOutAPI,
 } from '@/api/EquipmentLedger/equ-out'
+import { getDeviceListAPI } from '@/api/EquipmentLedger/index.js'
 import { deptTreeSelect } from '@/api/system/user'
 import { addProjectStoreAPI } from '@/api/EquipmentLedger/equ-store.js'
 
@@ -310,9 +328,9 @@ export default {
     // 获取可选择的变更设备列表
     getSelectEquipmentList() {
       return new Promise((resolve) => {
-        getSelectEquipmentListAPI(this.addEquipmentQueryParams).then((res) => {
-          this.addEquipmentList = res.rows
-          this.addEquipmentTotal = res.total
+        getDeviceListAPI(this.addEquipmentQueryParams).then((res) => {
+          this.addEquipmentList = res.data.rows || []
+          this.addEquipmentTotal = res.data.total || 0
           this.getMaxFeature()
 
           // 数据加载完成后设置选中状态
@@ -425,8 +443,9 @@ export default {
           const params = { ...this.outForm, jsonData: '' }
           const jsonData = this.selectedEquipment.map((item) => {
             return {
-              devId: item.devId,
+              devId: item.maId,
               useTime: item.useTime,
+              changeStatus: item.changeStatus,
             }
           })
 
@@ -437,7 +456,9 @@ export default {
 
           if (res.code === 200) {
             this.$modal.msgSuccess('状态变更成功')
-            this.$router.go(-1)
+            this.$router.push({
+              path: '/equipment/equipment-ledger',
+            })
           } else {
             this.$modal.msgError(res.msg)
           }
@@ -518,8 +539,11 @@ export default {
       if (newItems.length > 0) {
         this.selectedEquipment = [...this.selectedEquipment, ...newItems]
         this.$modal.msgSuccess('成功添加 ' + newItems.length + ' 个装备')
+        this.selectedEquipment.forEach((item) => {
+          item.changeStatus = '1'
+        })
       } else {
-        this.$modal.msgInfo('所选装备已全部添加')
+        this.$modal.msgError('所选装备已添加')
       }
 
       this.addEquipmentVisible = false
diff --git a/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue b/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue
index 79d56004..bddea9e9 100644
--- a/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue
@@ -98,45 +98,54 @@
     </div>
     </el-card>
     <!-- 出库记录单 -->
-    <el-dialog title="出库记录单" :visible.sync="outRecordVisible" width="80%" append-to-body>
+    <el-dialog title="维修记录单" :visible.sync="outRecordVisible" width="80%" append-to-body>
       <el-row>
         <el-button size="mini" type="primary" @click="onHandleDownload">下载</el-button>
         <el-button size="mini" type="primary" @click="onHandlePrint">打印</el-button>
         <el-button size="mini" type="primary" @click="onHandleClose">关闭</el-button>
       </el-row>
-      <el-row class="record-row">
-        <el-col :span="12">
-          <div> 流转前使用单位：{{ outRecordParams.changeUnit }}</div>
-        </el-col>
-        <el-col :span="8">
-          <div> 流转后使用单位：{{ outRecordParams.useUint }}</div>
-        </el-col>
-        <el-col :span="4">
-          <div> 流转前使用工程：/</div>
-        </el-col>
-      </el-row>
-      <el-row class="record-row">
-        <el-col :span="12">
-          <div> 流转后使用工程： {{ outRecordParams.proName }}</div>
-        </el-col>
-        <el-col :span="8">
-          <div> 装备数量： {{ outRecordParams.devNum }}</div>
-        </el-col>
-      </el-row>
 
       <vue-easy-print ref="recordPrintRef" tableShow style="width: 100%">
+        <h2 style="text-align: center;font-size: 28px;">维修记录单</h2>
+        <el-row class="record-row">
+          <el-col :span="12">
+            <div> 操作人：{{ outRecordParams.createUser }}</div>
+          </el-col>
+          <el-col :span="12">
+            <div> 需求单位：{{ outRecordParams.useUint }}</div>
+          </el-col>
+        </el-row>
+        <el-row class="record-row">
+          <el-col :span="12">
+            <div> 操作时间： {{ outRecordParams.createTime }}</div>
+          </el-col>
+          <el-col :span="12">
+            <div> 使用项目： {{ outRecordParams.proName }}</div>
+          </el-col>
+        </el-row>
         <div class="dialog-table">
-        <el-table :data="outRecordData" style="width: 100%" border stripe>
-          <el-table-column align="center" show-overflow-tooltip type="index" width="100px"  label="序号"/>
-          <el-table-column align="center" show-overflow-tooltip prop="devName" label="装备名称"/>
-          <!-- <el-table-column align="center" show-overflow-tooltip prop="createUser" label="装备系列" /> -->
-          <el-table-column align="center" show-overflow-tooltip prop="devModel" label="规格型号"/>
-          <el-table-column align="center" show-overflow-tooltip prop="devCode" label="装备编码"/>
-        </el-table>
+          <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>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item, index) in outRecordData" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.devName }}</td>
+                <td>{{ item.devModel }}</td>
+                <td>{{ item.devCode }}</td>
+              </tr>
+            </tbody>
+          </table>
         </div>
       </vue-easy-print>
 
-      <el-row class="record-row" style="margin-top: 10px">
+      <!-- <el-row class="record-row" style="margin-top: 10px">
         <el-col :span="24" style="text-align: right">
           <div>
             操作人：
@@ -145,7 +154,7 @@
             {{ outRecordParams.createTime }}
           </div>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-dialog>
   </div>
 </template>
@@ -259,7 +268,7 @@ export default {
 
 <style scoped lang="scss">
 .record-row {
-  margin-bottom: 10px;
+  /* margin-bottom: 10px; */
   font-size: 16px;
   font-weight: 600;
   color: #333;
@@ -421,4 +430,28 @@ export default {
     }
   }
 }
+table {
+  width: 100%;
+  border-collapse: collapse; /* ✅ 连起来的关键 */
+  text-align: center;
+  font-size: 14px;
+}
+
+th, td {
+  border: 1px solid #dcdfe6; /* Element Plus 默认边框色 */
+  padding: 8px 10px;
+}
+
+thead {
+  background-color: #f5f7fa; /* 表头灰背景 */
+  font-weight: 600;
+}
+
+tbody tr:nth-child(even) {
+  background-color: #fafafa; /* 条纹行 */
+}
+
+tbody tr:hover {
+  background-color: #f0f9eb; /* hover 效果 */
+}
 </style>
diff --git a/src/views/EquipmentRoamRecord/outboundRecord/index.vue b/src/views/EquipmentRoamRecord/outboundRecord/index.vue
index 168bbfae..1cd9e6a5 100644
--- a/src/views/EquipmentRoamRecord/outboundRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/outboundRecord/index.vue
@@ -100,39 +100,48 @@
         <el-button size="mini" type="primary" @click="onHandlePrint">打印</el-button>
         <el-button size="mini" type="primary" @click="onHandleClose">关闭</el-button>
       </el-row>
-      <el-row class="record-row">
-        <el-col :span="12">
-          <div> 流转前使用单位：{{ outRecordParams.changeUnit }}</div>
-        </el-col>
-        <el-col :span="8">
-          <div> 流转后使用单位：{{ outRecordParams.useUint }}</div>
-        </el-col>
-        <el-col :span="4">
-          <div> 流转前使用工程：/</div>
-        </el-col>
-      </el-row>
-      <el-row class="record-row">
-        <el-col :span="12">
-          <div> 流转后使用工程： {{ outRecordParams.proName }}</div>
-        </el-col>
-        <el-col :span="8">
-          <div> 装备数量： {{ outRecordParams.devNum }}</div>
-        </el-col>
-      </el-row>
-
+      
       <vue-easy-print ref="recordPrintRef" tableShow style="width: 100%">
+        <h2 style="text-align: center;font-size: 28px;">出库记录单</h2>
+        <el-row class="record-row">
+          <el-col :span="12">
+            <div> 操作人：{{ outRecordParams.createUser }}</div>
+          </el-col>
+          <el-col :span="12">
+            <div> 需求单位：{{ outRecordParams.useUint }}</div>
+          </el-col>
+        </el-row>
+        <el-row class="record-row">
+          <el-col :span="12">
+            <div> 操作时间： {{ outRecordParams.createTime }}</div>
+          </el-col>
+          <el-col :span="12">
+            <div> 使用项目： {{ outRecordParams.proName }}</div>
+          </el-col>
+        </el-row>
         <div class="dialog-table">
-        <el-table :data="outRecordData" style="width: 100%" border stripe>
-          <el-table-column align="center" show-overflow-tooltip type="index" width="100px" label="序号"/>
-          <el-table-column align="center" show-overflow-tooltip prop="devName" label="装备名称"/>
-          <!-- <el-table-column align="center" show-overflow-tooltip prop="createUser" label="装备系列" /> -->
-          <el-table-column align="center" show-overflow-tooltip prop="devModel" label="规格型号"/>
-          <el-table-column align="center" show-overflow-tooltip prop="devCode" label="装备编码"/>
-        </el-table>
+        <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>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-for="(item, index) in outRecordData" :key="index">
+              <td>{{ index + 1 }}</td>
+              <td>{{ item.devName }}</td>
+              <td>{{ item.devModel }}</td>
+              <td>{{ item.devCode }}</td>
+            </tr>
+          </tbody>
+        </table>
         </div>
       </vue-easy-print>
 
-      <el-row class="record-row" style="margin-top: 10px">
+      <!-- <el-row class="record-row" style="margin-top: 10px">
         <el-col :span="24" style="text-align: right">
           <div>
             操作人：
@@ -141,7 +150,7 @@
             {{ outRecordParams.createTime }}
           </div>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-dialog>
   </div>
 </template>
@@ -255,7 +264,7 @@ export default {
 
 <style scoped lang="scss">
 .record-row {
-  margin-bottom: 10px;
+  /* margin-bottom: 10px; */
   font-size: 16px;
   font-weight: 600;
   color: #333;
@@ -419,4 +428,29 @@ export default {
 .el-form-item--small.el-form-item {
     margin-bottom: 0px;
 }
+table {
+  width: 100%;
+  border-collapse: collapse; /* ✅ 连起来的关键 */
+  text-align: center;
+  font-size: 14px;
+}
+
+th, td {
+  border: 1px solid #dcdfe6; /* Element Plus 默认边框色 */
+  padding: 8px 10px;
+}
+
+thead {
+  background-color: #f5f7fa; /* 表头灰背景 */
+  font-weight: 600;
+}
+
+tbody tr:nth-child(even) {
+  background-color: #fafafa; /* 条纹行 */
+}
+
+tbody tr:hover {
+  background-color: #f0f9eb; /* hover 效果 */
+}
+
 </style>
diff --git a/src/views/EquipmentRoamRecord/retirementRecord/index.vue b/src/views/EquipmentRoamRecord/retirementRecord/index.vue
index 489ec01a..f6f26ac5 100644
--- a/src/views/EquipmentRoamRecord/retirementRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/retirementRecord/index.vue
@@ -96,45 +96,54 @@
     </div>
     </el-card>
     <!-- 出库记录单 -->
-    <el-dialog title="出库记录单" :visible.sync="outRecordVisible" width="80%" append-to-body>
+    <el-dialog title="退役记录单" :visible.sync="outRecordVisible" width="80%" append-to-body>
       <el-row>
         <el-button size="mini" type="primary" @click="onHandleDownload">下载</el-button>
         <el-button size="mini" type="primary" @click="onHandlePrint">打印</el-button>
         <el-button size="mini" type="primary" @click="onHandleClose">关闭</el-button>
       </el-row>
-      <el-row class="record-row">
-        <el-col :span="12">
-          <div> 流转前使用单位：{{ outRecordParams.changeUnit }}</div>
-        </el-col>
-        <el-col :span="8">
-          <div> 流转后使用单位：{{ outRecordParams.useUint }}</div>
-        </el-col>
-        <el-col :span="4">
-          <div> 流转前使用工程：/</div>
-        </el-col>
-      </el-row>
-      <el-row class="record-row">
-        <el-col :span="12">
-          <div> 流转后使用工程： {{ outRecordParams.proName }}</div>
-        </el-col>
-        <el-col :span="8">
-          <div> 装备数量： {{ outRecordParams.devNum }}</div>
-        </el-col>
-      </el-row>
 
       <vue-easy-print ref="recordPrintRef" tableShow style="width: 100%">
+        <h2 style="text-align: center;font-size: 28px;">退役记录单</h2>
+        <el-row class="record-row">
+          <el-col :span="12">
+            <div> 操作人：{{ outRecordParams.createUser }}</div>
+          </el-col>
+          <el-col :span="12">
+            <div> 需求单位：{{ outRecordParams.useUint }}</div>
+          </el-col>
+        </el-row>
+        <el-row class="record-row">
+          <el-col :span="12">
+            <div> 操作时间： {{ outRecordParams.createTime }}</div>
+          </el-col>
+          <el-col :span="12">
+            <div> 使用项目： {{ outRecordParams.proName }}</div>
+          </el-col>
+        </el-row>
         <div class="dialog-table">
-        <el-table :data="outRecordData" style="width: 100%" border stripe>
-          <el-table-column align="center" show-overflow-tooltip type="index" width="100px" label="序号"/>
-          <el-table-column align="center" show-overflow-tooltip prop="devName" label="装备名称"/>
-          <!-- <el-table-column align="center" show-overflow-tooltip prop="createUser" label="装备系列" /> -->
-          <el-table-column align="center" show-overflow-tooltip prop="devModel" label="规格型号"/>
-          <el-table-column align="center" show-overflow-tooltip prop="devCode" label="装备编码"/>
-        </el-table>
+          <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>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item, index) in outRecordData" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.devName }}</td>
+                <td>{{ item.devModel }}</td>
+                <td>{{ item.devCode }}</td>
+              </tr>
+            </tbody>
+          </table>
         </div>
       </vue-easy-print>
 
-      <el-row class="record-row" style="margin-top: 10px">
+      <!-- <el-row class="record-row" style="margin-top: 10px">
         <el-col :span="24" style="text-align: right">
           <div>
             操作人：
@@ -143,7 +152,7 @@
             {{ outRecordParams.createTime }}
           </div>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-dialog>
   </div>
 </template>
@@ -257,7 +266,7 @@ export default {
 
 <style scoped lang="scss">
 .record-row {
-  margin-bottom: 10px;
+  /* margin-bottom: 10px; */
   font-size: 16px;
   font-weight: 600;
   color: #333;
@@ -419,4 +428,28 @@ export default {
     }
   }
 }
+table {
+  width: 100%;
+  border-collapse: collapse; /* ✅ 连起来的关键 */
+  text-align: center;
+  font-size: 14px;
+}
+
+th, td {
+  border: 1px solid #dcdfe6; /* Element Plus 默认边框色 */
+  padding: 8px 10px;
+}
+
+thead {
+  background-color: #f5f7fa; /* 表头灰背景 */
+  font-weight: 600;
+}
+
+tbody tr:nth-child(even) {
+  background-color: #fafafa; /* 条纹行 */
+}
+
+tbody tr:hover {
+  background-color: #f0f9eb; /* hover 效果 */
+}
 </style>
diff --git a/src/views/EquipmentRoamRecord/returnRecord/index.vue b/src/views/EquipmentRoamRecord/returnRecord/index.vue
index 527a3fdd..ff17e9ba 100644
--- a/src/views/EquipmentRoamRecord/returnRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/returnRecord/index.vue
@@ -80,45 +80,54 @@
       </div>
     </el-card>
     <!-- 出库记录单 -->
-    <el-dialog title="出库记录单" :visible.sync="outRecordVisible" width="80%" append-to-body>
+    <el-dialog title="退库记录单" :visible.sync="outRecordVisible" width="80%" append-to-body>
       <el-row>
         <el-button size="mini" type="primary" @click="onHandleDownload">下载</el-button>
         <el-button size="mini" type="primary" @click="onHandlePrint">打印</el-button>
         <el-button size="mini" type="primary" @click="onHandleClose">关闭</el-button>
       </el-row>
-      <el-row class="record-row">
-        <el-col :span="12">
-          <div> 流转前使用单位：{{ outRecordParams.changeUnit }}</div>
-        </el-col>
-        <el-col :span="8">
-          <div> 流转后使用单位：{{ outRecordParams.useUint }}</div>
-        </el-col>
-        <el-col :span="4">
-          <div> 流转前使用工程：/</div>
-        </el-col>
-      </el-row>
-      <el-row class="record-row">
-        <el-col :span="12">
-          <div> 流转后使用工程： {{ outRecordParams.proName }}</div>
-        </el-col>
-        <el-col :span="8">
-          <div> 装备数量： {{ outRecordParams.devNum }}</div>
-        </el-col>
-      </el-row>
 
       <vue-easy-print ref="recordPrintRef" tableShow style="width: 100%">
+        <h2 style="text-align: center;font-size: 28px;">退库记录单</h2>
+        <el-row class="record-row">
+          <el-col :span="12">
+            <div> 操作人：{{ outRecordParams.createUser }}</div>
+          </el-col>
+          <el-col :span="12">
+            <div> 需求单位：{{ outRecordParams.useUint }}</div>
+          </el-col>
+        </el-row>
+        <el-row class="record-row">
+          <el-col :span="12">
+            <div> 操作时间： {{ outRecordParams.createTime }}</div>
+          </el-col>
+          <el-col :span="12">
+            <div> 使用项目： {{ outRecordParams.proName }}</div>
+          </el-col>
+        </el-row>
         <div class="dialog-table">
-        <el-table :data="outRecordData" style="width: 100%">
-          <el-table-column align="center" show-overflow-tooltip type="index" width="100px" label="序号" />
-          <el-table-column align="center" show-overflow-tooltip prop="devName" label="装备名称" />
-          <!-- <el-table-column align="center" show-overflow-tooltip prop="createUser" label="装备系列" /> -->
-          <el-table-column align="center" show-overflow-tooltip prop="devModel" label="规格型号" />
-          <el-table-column align="center" show-overflow-tooltip prop="devCode" label="装备编码" />
-        </el-table>
+          <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>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item, index) in outRecordData" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ item.devName }}</td>
+                <td>{{ item.devModel }}</td>
+                <td>{{ item.devCode }}</td>
+              </tr>
+            </tbody>
+          </table>
         </div>
       </vue-easy-print>
 
-      <el-row class="record-row" style="margin-top: 10px">
+      <!-- <el-row class="record-row" style="margin-top: 10px">
         <el-col :span="24" style="text-align: right">
           <div>
             操作人：
@@ -127,7 +136,7 @@
             {{ outRecordParams.createTime }}
           </div>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-dialog>
   </div>
 </template>
@@ -241,7 +250,7 @@ export default {
 
 <style scoped lang="scss">
 .record-row {
-  margin-bottom: 10px;
+  /* margin-bottom: 10px; */
   font-size: 16px;
   font-weight: 600;
   color: #333;
@@ -404,4 +413,28 @@ export default {
     }
   }
 }
+table {
+  width: 100%;
+  border-collapse: collapse; /* ✅ 连起来的关键 */
+  text-align: center;
+  font-size: 14px;
+}
+
+th, td {
+  border: 1px solid #dcdfe6; /* Element Plus 默认边框色 */
+  padding: 8px 10px;
+}
+
+thead {
+  background-color: #f5f7fa; /* 表头灰背景 */
+  font-weight: 600;
+}
+
+tbody tr:nth-child(even) {
+  background-color: #fafafa; /* 条纹行 */
+}
+
+tbody tr:hover {
+  background-color: #f0f9eb; /* hover 效果 */
+}
 </style>