From f77902ad2cc0ac69043bf401a9807eaea950321a Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Tue, 27 Feb 2024 10:33:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B3=E8=AF=B7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/claimAndRefund/receive.js                | 9 +++++++++
 .../src/views/claimAndRefund/receive/receiveApplyAdd.vue | 5 +++--
 .../src/views/claimAndRefund/receive/receiveManage.vue   | 8 ++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/sgzb-ui/src/api/claimAndRefund/receive.js b/sgzb-ui/src/api/claimAndRefund/receive.js
index 4109f991..549aa092 100644
--- a/sgzb-ui/src/api/claimAndRefund/receive.js
+++ b/sgzb-ui/src/api/claimAndRefund/receive.js
@@ -176,6 +176,15 @@ export function getUseTypeTreee(params = {}){
   })
 }
 
+// 机具领料申请-详情
+export function getLeaseApplyListAll(query) {
+  return request({
+    url: '/base/tm_task/getLeaseApplyListAll',
+    method: 'get',
+    params: query
+  })
+}
+
 
 
 
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
index 5893f1a4..454f522f 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
@@ -164,7 +164,8 @@ import {
   getAgreementInfoById,
   submitLeaseApply,
   getTaskDetail,
-  editLeaseApply
+  editLeaseApply,
+  getLeaseApplyListAll
 } from '@/api/claimAndRefund/receive'
 import { getInfo } from '@/api/login'
 export default {
@@ -412,7 +413,7 @@ export default {
 
     // 获取 任务详情数据
     async GetTaskDetail(taskId){
-      const res = await getTaskDetail({taskId})
+      const res = await getLeaseApplyListAll({taskId})
 
       const data = res.rows[0]
 
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
index 18893966..658fca90 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container" id="receiveManage">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="申请日期" prop="dictName">
+      <el-form-item label="申请日期" prop="time">
         <el-date-picker
           v-model="queryParams.time"
           type="daterange"
@@ -11,7 +11,7 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="往来单位" prop="dictName">
+      <el-form-item label="往来单位" prop="unitId">
         <el-select  v-model="queryParams.unitId" filterable clearable @change="GetProData" style="width: 240px" placeholder="请选择">
           <el-option
             v-for="item in unitList"
@@ -21,7 +21,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="工程名称" prop="dictName">
+      <el-form-item label="工程名称" prop="proId">
         <el-select  v-model="queryParams.proId" filterable clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
           <el-option
             v-for="item in proList"
@@ -31,7 +31,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="关键字" prop="dictName">
+      <el-form-item label="关键字" prop="keyword">
         <el-input
           v-model="queryParams.keyword"
           placeholder="请输入关键字"