diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
index 9a0cafd9..06dee23e 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue
@@ -84,7 +84,7 @@ export default {
       return this.detail.status == "0"
     },
     isAdmin() {
-      return this.user.financeUser.type == 1
+      return this.user.financeUser.userRole == 1
     }
   },
   data() {
diff --git a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
index f217c97d..c8c13844 100644
--- a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
+++ b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
@@ -50,7 +50,7 @@ export default {
   computed: {
     ...mapState(['user']),
     isFinanceUser() {
-      return this.user.financeUser?.type != null
+      return !!this.user.financeUser?.id
     }
   },
   data() {
diff --git a/project/xiushan/apps/financing/AppGrabLog/AppGrabLog.vue b/project/xiushan/apps/financing/AppGrabLog/AppGrabLog.vue
index 06f3508d..b7b41ced 100644
--- a/project/xiushan/apps/financing/AppGrabLog/AppGrabLog.vue
+++ b/project/xiushan/apps/financing/AppGrabLog/AppGrabLog.vue
@@ -23,11 +23,8 @@ export default {
       return !!this.$route.query.id ? GrabDetail : GrabList
     }
   },
-  data() {
-    return {}
-  },
   created() {
-    this.dict.load("enterpriseName")
+    this.dict.load("financingDemandStatus", "productRepaymentTimeline", "financialFundPurpose")
   }
 }
 </script>
diff --git a/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue b/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue
index be056713..972b1752 100644
--- a/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue
+++ b/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue
@@ -1,8 +1,8 @@
 <template>
   <section class="grabDetail">
     <ai-detail>
-      <ai-title slot="title" title="融资详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
-        <template #rightBtn>
+      <ai-title slot="title" title="融资详情" isShowBottomBorder isShowBack @onBackClick="back">
+        <template v-if="isFinanceUser" #rightBtn>
           <el-button type="danger" @click="handleCancel">回退订单</el-button>
           <el-button type="primary" @click="dialog=true">放款</el-button>
         </template>
@@ -12,29 +12,37 @@
           <ai-card title="融资需求">
             <template #content>
               <el-row type="flex" class="flexWrap">
-                <el-form-item label="意向金额">{{ detail.enterpriseName }}</el-form-item>
-                <el-form-item label="期望使用期限">{{ detail.enterpriseName }}</el-form-item>
-                <el-form-item label="资金用途">{{ detail.unifiedCode }}</el-form-item>
+                <el-form-item label="意向金额">{{ detail.loanAmount }}</el-form-item>
+                <el-form-item label="期望使用期限">
+                  {{ dict.getLabel('productRepaymentTimeline', detail.hopeLifespan) }}
+                </el-form-item>
+                <el-form-item label="资金用途">
+                  {{ dict.getLabel('financialFundPurpose', detail.fundPurpose) }}
+                </el-form-item>
                 <el-form-item label="企业主体">{{ detail.enterpriseName }}</el-form-item>
-                <el-form-item label="联系人">{{ dict.getLabel('enterpriseType', detail.enterpriseType) }}</el-form-item>
-                <el-form-item label="所在地区">{{ detail.address }}</el-form-item>
+                <el-form-item label="联系人">{{ detail.createUserName }}</el-form-item>
+                <el-form-item label="所在地区">{{ detail.areaName }}</el-form-item>
                 <el-form-item label="联系方式">{{ detail.phone }}</el-form-item>
                 <el-form-item label="身份证号">{{ detail.idNumber }}</el-form-item>
-                <el-form-item label="发布时间">{{ detail.address }}</el-form-item>
+                <el-form-item label="发布时间">{{ detail.createTime }}</el-form-item>
               </el-row>
-              <el-form-item label="备注">{{ detail.operationPeriod }}</el-form-item>
+              <el-form-item label="备注">{{ detail.remark }}</el-form-item>
             </template>
           </ai-card>
           <ai-card title="融资进度">
             <template #content>
               <el-row type="flex" class="flexWrap">
-                <el-form-item label="融资进度">{{ detail.enterpriseName }}</el-form-item>
-                <el-form-item label="贷款银行">{{ detail.enterpriseName }}</el-form-item>
-                <el-form-item label="贷款经理">{{ detail.unifiedCode }}</el-form-item>
+                <el-form-item label="融资进度">{{ dict.getLabel('financingDemandStatus', detail.status) }}</el-form-item>
+                <el-form-item label="贷款银行">{{ detail.organizationName }}</el-form-item>
+                <el-form-item label="贷款经理">{{ detail.auditUserName }}</el-form-item>
                 <el-form-item label="联系方式">{{ detail.phone }}</el-form-item>
-                <el-form-item label="放款金额">{{ detail.enterpriseName }}</el-form-item>
-                <el-form-item label="放款日期">{{ dict.getLabel('enterpriseType', detail.enterpriseType) }}</el-form-item>
-                <el-form-item label="使用期限">{{ detail.address }}</el-form-item>
+                <template v-if="detail.status==2">
+                  <el-form-item label="放款金额">{{ detail.auditAmount }}</el-form-item>
+                  <el-form-item label="放款日期">{{ detail.loanDate }}</el-form-item>
+                  <el-form-item label="使用期限">
+                    {{ dict.getLabel('productRepaymentTimeline', detail.auditLifespan) }}
+                  </el-form-item>
+                </template>
               </el-row>
             </template>
           </ai-card>
@@ -43,14 +51,14 @@
     </ai-detail>
     <ai-dialog :visible.sync="dialog" title="放款" @closed="form={}" @onConfirm="submitAudit" width="560px">
       <el-form :model="form" :rules="rules" ref="AuditForm" size="small" label-width="120px">
-        <el-form-item label="放款金额(万)" prop="auditStatus">
-          <el-input v-model="form.auditDescription" placeholder="请输入"/>
+        <el-form-item label="放款金额(万)" prop="auditAmount">
+          <el-input v-model="form.auditAmount" placeholder="请输入"/>
         </el-form-item>
-        <el-form-item label="使用期限(月)" prop="auditStatus">
-          <ai-select v-model="form.auditStatus" :selectList="dict.getDict('auditStatus')"/>
+        <el-form-item label="使用期限" prop="auditLifespan">
+          <ai-select v-model="form.auditLifespan" :selectList="dict.getDict('productRepaymentTimeline')"/>
         </el-form-item>
-        <el-form-item label="放款日期" prop="auditStatus">
-          <el-date-picker v-model="form.time" placeholder="请选择"/>
+        <el-form-item label="放款日期" prop="loanDate">
+          <el-date-picker v-model="form.loanDate" placeholder="请选择"/>
         </el-form-item>
       </el-form>
     </ai-dialog>
@@ -58,6 +66,8 @@
 </template>
 
 <script>
+import {mapState} from "vuex";
+
 export default {
   name: "grabDetail",
   props: {
@@ -65,20 +75,28 @@ export default {
     dict: Object,
     permissions: Function
   },
+  computed: {
+    ...mapState(['user']),
+    isFinanceUser() {
+      return !!this.user.financeUser?.id
+    }
+  },
   data() {
     return {
       dialog: false,
       detail: {},
       form: {},
       rules: {
-        auditStatus: [{required: true, message: "请选择审批结果"}]
+        auditAmount: [{required: true, message: "请输入 放款金额"}],
+        auditLifespan: [{required: true, message: "请选择 使用期限"}],
+        loanDate: [{required: true, message: "请选择 放款日期"}],
       }
     }
   },
   methods: {
     getDetail() {
       let {id} = this.$route.query
-      this.instance.post("/appportaluserenterprise/queryDetailById", null, {
+      this.instance.post("/appfinancingdemand/queryDetailById", null, {
         params: {id}
       }).then(res => {
         if (res?.data) {
@@ -88,14 +106,21 @@ export default {
     },
     handleCancel() {
       this.$confirm("是否要回退本次融资需求订单?").then(() => {
-
+        this.instance.post("/appfinancingdemand/cancelObtain", null, {
+          params: {id: this.detail.id}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("回退成功")
+            this.back()
+          }
+        })
       }).catch(() => 0)
     },
     submitAudit() {
       this.$refs.AuditForm.validate(v => {
         if (v) {
           let {id} = this.detail
-          this.instance.post("/appportaluserenterprise/auditEnterprise", null, {
+          this.instance.post("/appfinancingdemand/confirmLoan", null, {
             params: {id, ...this.form}
           }).then(res => {
             if (res?.code == 0) {
@@ -106,10 +131,12 @@ export default {
           })
         }
       })
+    },
+    back() {
+      this.$router.push({})
     }
   },
   created() {
-    this.dict.load("auditStatus")
     this.getDetail()
   }
 }
diff --git a/project/xiushan/apps/financing/AppGrabLog/grabList.vue b/project/xiushan/apps/financing/AppGrabLog/grabList.vue
index d4bc00c6..4df35fe9 100644
--- a/project/xiushan/apps/financing/AppGrabLog/grabList.vue
+++ b/project/xiushan/apps/financing/AppGrabLog/grabList.vue
@@ -5,14 +5,14 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <ai-select placeholder="订单状态" v-model="search.status" @change="page.current=1,getTableData()"/>
+            <ai-select placeholder="订单状态" v-model="search.status" @change="page.current=1,getTableData()"
+                       :selectList="dict.getDict('financingDemandStatus')"/>
             <ai-search label="申请时间">
-              <el-date-picker size="small" v-model="search.applyTime" type="daterange"
-                              @change="page.current=1,getTableData()"/>
+              <el-date-picker size="small" v-model="search.applyTime" type="daterange" @change="handleFilterApplyTime"/>
             </ai-search>
           </template>
           <template #right>
-            <el-input size="small" placeholder="搜索产品名称、企业主体、贷款银行" v-model="search.name" clearable
+            <el-input size="small" placeholder="搜索企业主体、客户经理、贷款银行" v-model="search.name" clearable
                       @change="page.current=1,getTableData()"/>
           </template>
         </ai-search-bar>
@@ -49,23 +49,23 @@ export default {
       tableData: [],
       colConfigs: [
         {label: "企业名称", prop: "enterpriseName"},
-        {label: "意向金额(万)", prop: "legalPersonName"},
-        {label: "申请时间", prop: "legalPersonName"},
-        {label: "联系人", prop: "phone"},
+        {label: "意向金额(万)", prop: "loanAmount"},
+        {label: "申请时间", prop: "createTime"},
+        {label: "联系人", prop: "name"},
         {label: "联系方式", prop: "phone"},
-        {label: "客户经理", prop: "phone"},
-        {label: "贷款银行", prop: "phone"},
-        {label: "放款金额", prop: "phone"},
-        {label: "状态", prop: "status"},
-        {label: "备注", prop: "loginAccount"},
+        {label: "客户经理", prop: "auditUserName"},
+        {label: "贷款银行", prop: "organizationName"},
+        {label: "放款金额", prop: "auditAmount"},
+        {label: "状态", prop: "status", dict: "financingDemandStatus"},
+        {label: "备注", prop: "remark"},
         {slot: "options"}
       ]
     }
   },
   methods: {
     getTableData() {
-      this.instance.post("/appportaluserenterprise/list", null, {
-        params: {...this.page, ...this.search, status: 1}
+      this.instance.post("/appfinancingdemand/list", null, {
+        params: {...this.page, ...this.search, organizationId: this.user.financeUser?.organizationId}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data?.records
@@ -75,12 +75,16 @@ export default {
     },
     showDetail(id) {
       this.$router.push({query: {id}})
+    },
+    handleFilterApplyTime() {
+      this.page.current = 1
+      this.search.createTimeStart = this.search.applyTime?.[0]
+      this.search.createTimeEnd = this.search.applyTime?.[1]
+      this.getTableData()
     }
   },
   created() {
-    this.dict.load("enterpriseName")
     this.getTableData()
-    this.search.areaId = this.user.info.areaId
   }
 }
 </script>