diff --git a/src/api/EquipmentRetireApply/index.js b/src/api/EquipmentRetireApply/index.js
index cd4a60dd..240d3fac 100644
--- a/src/api/EquipmentRetireApply/index.js
+++ b/src/api/EquipmentRetireApply/index.js
@@ -17,6 +17,14 @@ export const getRetireApplyDetailAPI = (id) => {
     })
 }
 
+// 根据maIds获取设备信息
+export const getDeviceByMaIdsAPI = (maIds) => {
+    return request({
+        url: `/material-mall/deviceRetireApply/getDetail/${maIds}`,
+        method: 'GET',
+    })
+}
+
 // 获取在修装备和工具列表（统一接口）
 export const getScrapItemListAPI = (data) => {
     return request({
diff --git a/src/views/EquipmentRetire/index.vue b/src/views/EquipmentRetire/index.vue
index 8e899e5d..07fee993 100644
--- a/src/views/EquipmentRetire/index.vue
+++ b/src/views/EquipmentRetire/index.vue
@@ -136,14 +136,11 @@
             </span>
               </template>
             </el-table-column>
-            <!--        <el-table-column align="center" show-overflow-tooltip prop="address" label="操作">
-                      <template slot-scope="scope">
-                        <el-button type="primary" size="mini" @click="onHandleRetire(scope.row)">退役</el-button>
-                        &lt;!&ndash; <el-button type="primary" size="mini" @click="onHandleRetireEquipment(scope.row)">
-                          退役装备
-                        </el-button> &ndash;&gt;
-                      </template>
-                    </el-table-column>-->
+            <el-table-column align="center" show-overflow-tooltip prop="address" label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" size="mini" @click="onHandleRetire(scope.row)">退役</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
         <div class="pagination-wrapper">
@@ -219,9 +216,15 @@ export default {
     },
 
     // 退役按钮
-    onHandleRetire() {
+    onHandleRetire(row) {
       console.log('退役按钮')
-      this.$router.push('/equipment/equ-retire')
+      // this.$router.push('/equipment/equ-retire')
+      this.$router.push({
+        path: '/equipment/retire-apply/detail/new',
+        query: {
+          maId: row.maId,
+        }
+      })
     },
     // 重置
     onHandleReset() {
diff --git a/src/views/EquipmentRetireApply/detail.vue b/src/views/EquipmentRetireApply/detail.vue
index c373f728..d4fd7def 100644
--- a/src/views/EquipmentRetireApply/detail.vue
+++ b/src/views/EquipmentRetireApply/detail.vue
@@ -120,7 +120,7 @@
 </template>
 
 <script>
-import { getRetireApplyDetailAPI, submitRetireApplyTaskAPI } from '@/api/EquipmentRetireApply/index.js'
+import { getRetireApplyDetailAPI, submitRetireApplyTaskAPI, getDeviceByMaIdsAPI } from '@/api/EquipmentRetireApply/index.js'
 import AddItemDialog from './components/AddItemDialog'
 import { getToken } from '@/utils/auth'
 
@@ -159,6 +159,20 @@ export default {
     }
   },
   methods: {
+    async getInfo(){
+      try {
+        const res = await getDeviceByMaIdsAPI(this.$route.query.maId)
+        if (!res.data || res.data.length === 0) return
+        this.detailList = res.data.map(item => ({
+          ...item,
+          scrapQuantity: item.scrapNum,
+          retireReason: item.reasonVal,
+          bmFileInfos: item.bmFileInfos || [],
+        }))
+      } catch (error) {
+        console.log('🚀 ~ error:', error)
+      }
+    },
     async getDetail() {
       const id = this.$route.params.id
       if (id === 'new') {
@@ -349,7 +363,12 @@ export default {
   },
 
   created() {
-    this.getDetail()
+    if (this.$route.params.id) {
+      this.getDetail()
+    }
+    if (this.$route.query.maId) {
+      this.getInfo()
+    }
   }
 }
 </script>