diff --git a/src/api/equipment/index.js b/src/api/equipment/index.js
index ae1319d6..73af42bf 100644
--- a/src/api/equipment/index.js
+++ b/src/api/equipment/index.js
@@ -133,4 +133,31 @@ export const getOutDetailsByIdApi = data => {
     method: 'get',
     params: data
   })
+}
+
+// 工器具领料记录-列表
+export const getLeaseInfoDetailsApi = data => {
+  return request({
+    url: '/material/lease_apply_info/getLeaseInfoDetails',
+    method: 'get',
+    params: data
+  })
+}
+
+// 工器具领料记录-合计
+export const getLeaseInfoDetailsNoPageListApi = data => {
+  return request({
+    url: '/material/lease_apply_info/getLeaseInfoDetailsNoPageList',
+    method: 'get',
+    params: data
+  })
+}
+
+// 工器具退料记录-详情
+export const getSecondLeaseInfoApi = data => {
+  return request({
+    url: '/material/lease_apply_info/getSecondLeaseInfo',
+    method: 'get',
+    params: data
+  })
 }
\ No newline at end of file
diff --git a/src/views/material/lease/apply/leaseRecord.vue b/src/views/material/lease/apply/leaseRecord.vue
index 3d1fb2cb..a97c8c35 100644
--- a/src/views/material/lease/apply/leaseRecord.vue
+++ b/src/views/material/lease/apply/leaseRecord.vue
@@ -41,27 +41,27 @@
           <span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="工器具名称" align="center" prop="constructionType" :show-overflow-tooltip="true" />
-      <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
-      <el-table-column label="领料数量" align="center" prop="leaseNum" :show-overflow-tooltip="true" />
-      <el-table-column label="出库数量" align="center" prop="storeNum" :show-overflow-tooltip="true">
+      <el-table-column label="工器具名称" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
+      <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
+      <el-table-column label="领料数量" align="center" prop="preNum" :show-overflow-tooltip="true" />
+      <el-table-column label="出库数量" align="center" prop="outNum" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
-          <span class="clickText" v-if="scope.row.manageType == '编码'" @click="openRecords(scope.row)">
-            {{ scope.row.storeNum }}
+          <span class="clickText" v-if="scope.row.manageType == '0'" @click="openRecords(scope.row)">
+            {{ scope.row.outNum }}
           </span>
           <!-- 否则，直接显示数字 -->
           <span v-else>
-            {{ scope.row.storeNum }}
+            {{ scope.row.outNum }}
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="待出库数量" align="center" prop="usNum" :show-overflow-tooltip="true" />
-      <el-table-column label="领料日期" align="center" prop="leaseTime" :show-overflow-tooltip="true" />
-      <el-table-column label="领料班组" align="center" prop="leasePer" :show-overflow-tooltip="true" />
-      <el-table-column label="领料工程" align="center" prop="leasePro" :show-overflow-tooltip="true" />
-      <el-table-column label="领料人" align="center" prop="leasePeo" :show-overflow-tooltip="true" />
-      <el-table-column label="出库人" align="center" prop="out" :show-overflow-tooltip="true" />
+      <el-table-column label="待出库数量" align="center" prop="pendingNum" :show-overflow-tooltip="true" />
+      <el-table-column label="领料日期" align="center" prop="leaseDate" :show-overflow-tooltip="true" />
+      <el-table-column label="领料班组" align="center" prop="teamName" :show-overflow-tooltip="true" />
+      <el-table-column label="领料工程" align="center" prop="projectName" :show-overflow-tooltip="true" />
+      <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" />
+      <el-table-column label="出库人" align="center" prop="outPerson" :show-overflow-tooltip="true" />
       <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
     </el-table>
     <pagination
@@ -88,6 +88,9 @@
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="handleDialogReset">重置</el-button>
+        </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-download" size="mini" @click="handleDialogStoreExport">导出</el-button>
         </el-form-item>
@@ -101,15 +104,11 @@
           type="index"
           :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)"
         ></el-table-column>
-        <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
-        <el-table-column label="入库数量" align="center" prop="storeNum" :show-overflow-tooltip="true" />
-        <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true" />
+        <el-table-column label="机具名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
+        <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
         <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
-        <el-table-column label="库管员" align="center" prop="maKeeper" :show-overflow-tooltip="true" />
-        <el-table-column label="操作人" align="center" prop="inputUser" :show-overflow-tooltip="true" />
-        <el-table-column label="入库时间" align="center" prop="inputTime" :show-overflow-tooltip="true" />
-        <el-table-column label="入库方式" align="center" prop="inputType" :show-overflow-tooltip="true" />
+        <el-table-column label="出库人员" align="center" prop="outPerson" :show-overflow-tooltip="true" />
+        <el-table-column label="入库时间" align="center" prop="outTime" :show-overflow-tooltip="true" />
       </el-table>
       <pagination
         v-show="dialogTotal > 0"
@@ -123,11 +122,8 @@
 </template>
 
 <script>
-import {
-  getRetainedEquipmentListApi,
-  getRetainedEquipmentListNoPageApi,
-  getStorageInfoListApi
-} from '@/api/stquery/stquery'
+import { getLeaseInfoDetailsApi, getLeaseInfoDetailsNoPageListApi, getSecondLeaseInfoApi } from '@/api/equipment'
+
 export default {
   name: '',
   dicts: [],
@@ -177,12 +173,12 @@ export default {
       this.loading = true
       const params = {
         keyWord: this.queryParams.keyWord,
-        typeName: this.queryParams.typeName,
-        typeModelName: this.queryParams.typeModelName,
         pageSize: this.queryParams.pageSize,
-        pageNum: this.queryParams.pageNum
+        pageNum: this.queryParams.pageNum,
+        startTime: this.queryParams.timeRange && this.queryParams.timeRange[0],
+        endTime: this.queryParams.timeRange && this.queryParams.timeRange[1]
       }
-      const res = await getRetainedEquipmentListApi(params)
+      const res = await getLeaseInfoDetailsApi(params)
       if (res.data.rows.length > 0) {
         this.tableList = res.data.rows
       } else {
@@ -195,22 +191,11 @@ export default {
         typeName: this.queryParams.typeName,
         typeModelName: this.queryParams.typeModelName
       }
-      const response = await getRetainedEquipmentListNoPageApi(param)
+      const response = await getLeaseInfoDetailsNoPageListApi(param)
       let obj = {
-        // storeNum manageType usNum  repairNum inputNum repairInputNum allNum
-        storeNum: response.data.storeNum || 0,
-        usNum: response.data.usNum || 0,
-        repairNum: response.data.repairNum || 0,
-        inputNum: response.data.inputNum || 0,
-        repairInputNum: response.data.repairInputNum || 0,
-        pendingScrapNum: response.data.pendingScrapNum || 0,
-        scrapNum: response.data.scrapNum || 0,
-        allNum: response.data.allNum || 0,
-        totalPrice: response.data.totalPrice || 0,
-        fiveReplacementRate: response.data.fiveReplacementRate || 0,
-        tenReplacementRate: response.data.tenReplacementRate || 0,
-        tenPlusReplacementRate: response.data.tenPlusReplacementRate || 0,
-        manageType: response.data.manageType || ''
+        outNum: response.data.outNum || 0,
+        preNum: response.data.preNum || 0,
+        pendingNum: response.data.pendingNum || 0,
       }
       this.tableList.unshift(obj)
       console.log(this.tableList)
@@ -231,13 +216,13 @@ export default {
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (rowIndex === 0 && columnIndex == 0) {
         let rowspan = 1
-        let colspan = 7
+        let colspan = 3
         return { rowspan, colspan }
       }
       // 解决偏移的重要代码
       // 重点在 else if 判断必须加因为合并单元格数据会出现偏移、
       // 否则如果是 第二行 的 第二列 那么隐藏原有第二行 的 第二列的数据使他隐藏
-      else if (rowIndex === 0 && columnIndex < 7) {
+      else if (rowIndex === 0 && columnIndex < 3) {
         return {
           rowspan: 0,
           colspan: 0
@@ -257,11 +242,11 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        'material/complex_query/exportRetainedEquipmentList',
+        'material/lease_apply_info/exportLeaseInfoDetails',
         {
           ...this.queryParams
         },
-        `综合查询_保有设备总量_${new Date().getTime()}.xlsx`
+        `工器具领料记录_${new Date().getTime()}.xlsx`
       )
     },
     //查看在库编码数据
@@ -269,11 +254,12 @@ export default {
       this.openRecord = true
       this.dialogQuery.keyWord = ''
       this.dialogQuery.typeId = row.typeId
+      this.dialogQuery.parentId = row.parentId
       this.getStoreCodeList()
     },
     /** 查询在库编码列表 */
     getStoreCodeList() {
-      getStorageInfoListApi(this.dialogQuery).then(response => {
+      getSecondLeaseInfoApi(this.dialogQuery).then(response => {
         this.dialogList = response.data.rows
         this.dialogTotal = response.data.total
       })
@@ -283,11 +269,16 @@ export default {
       this.dialogQuery.pageNum = 1
       this.getStoreCodeList()
     },
+    handleDialogReset() {
+      this.dialogQuery.pageNum = 1
+      this.dialogQuery.keyWord = ''
+      this.getStoreCodeList()
+    },
     handleDialogStoreExport() {
       this.download(
-        'material/complex_query/exportStorageInfoList',
+        'material/lease_apply_info/exportSecondLeaseInfo',
         { ...this.dialogQuery },
-        `综合查询_在库设备_${new Date().getTime()}.xlsx`
+        `出库数量_${new Date().getTime()}.xlsx`
       )
     }
   }
diff --git a/src/views/material/lease/outBound/component/queryToolsApply.vue b/src/views/material/lease/outBound/component/queryToolsApply.vue
index b1d2e090..1b447cbd 100644
--- a/src/views/material/lease/outBound/component/queryToolsApply.vue
+++ b/src/views/material/lease/outBound/component/queryToolsApply.vue
@@ -235,7 +235,7 @@ export default {
       this.download(
         "/material/lease_apply_info/exportOutDetails",
         { id: this.id },
-        `领料申请详情_${new Date().getTime()}.xlsx`
+        `领料详情_${new Date().getTime()}.xlsx`
       );
     },
   },