From 829f03e68c68f43f69046dbf923741b17296902c Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 25 Feb 2022 09:36:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B7=E6=AC=BE=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finance/AppLoadAudit/AppLoadAudit.vue     |  2 +-
 .../apps/finance/AppLoadAudit/loanDetail.vue  | 52 ++++++++++++++-----
 .../apps/finance/AppLoadAudit/loanList.vue    | 17 +++---
 3 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/project/xiushan/apps/finance/AppLoadAudit/AppLoadAudit.vue b/project/xiushan/apps/finance/AppLoadAudit/AppLoadAudit.vue
index e3dd18b0..fed5723e 100644
--- a/project/xiushan/apps/finance/AppLoadAudit/AppLoadAudit.vue
+++ b/project/xiushan/apps/finance/AppLoadAudit/AppLoadAudit.vue
@@ -24,7 +24,7 @@ export default {
     }
   },
   created() {
-    this.dict.load("productRepaymentTimeline","financialFundPurpose")
+    this.dict.load("productRepaymentTimeline", "financialFundPurpose", "enterpriseAuditStatus", "financialLoanApplyStatus")
   }
 }
 </script>
diff --git a/project/xiushan/apps/finance/AppLoadAudit/loanDetail.vue b/project/xiushan/apps/finance/AppLoadAudit/loanDetail.vue
index 1063b32e..f87ab59b 100644
--- a/project/xiushan/apps/finance/AppLoadAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoadAudit/loanDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="loanDetail">
     <ai-detail>
-      <ai-title slot="title" title="经营主体详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
+      <ai-title slot="title" title="贷款审核详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
         <template #rightBtn>
           <el-button v-if="isAuthing" type="primary" @click="dialog=true">审核</el-button>
         </template>
@@ -11,15 +11,27 @@
           <ai-card title="贷款申请">
             <template #content>
               <el-row type="flex" class="flexWrap">
-                <el-form-item label="产品名称">{{ detail.productName }}
-                  <el-link @click="$router.push({name:'',query:{id:detail.productId}})"> 产品详情</el-link>
+                <el-form-item label="产品名称">
+                  <el-row type="flex">
+                    {{ detail.productName }}
+                    <el-link type="primary"
+                             @click="$router.push({name:'ef73672d0ea6427ab770ee9a31100a3b',query:{id:detail.productId}})">
+                      产品详情
+                    </el-link>
+                  </el-row>
                 </el-form-item>
                 <el-form-item label="贷款银行">{{ detail.organizationName }}</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="企业主体">{{ detail.enterpriseName }}
-                  <el-link @click="$router.push({name:'',query:{id:detail.enterpriseId}})">企业详情</el-link>
+                <el-form-item label="企业主体">
+                  <el-row type="flex">
+                    {{ detail.enterpriseName }}
+                    <el-link type="primary"
+                             @click="$router.push({name:'27338cb83e77461dbd44356a6760df84',query:{id:detail.enterpriseId}})">
+                      企业详情
+                    </el-link>
+                  </el-row>
                 </el-form-item>
                 <el-form-item label="资金用途">{{ dict.getLabel('financialFundPurpose', detail.fundPurpose) }}
                 </el-form-item>
@@ -55,11 +67,11 @@
     <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">
-          <ai-select v-model="form.auditStatus" :selectList="dict.getDict('auditStatus')"/>
+          <ai-select v-model="form.auditStatus" :selectList="dict.getDict('enterpriseAuditStatus')"/>
         </el-form-item>
-        <template>
-          <el-form-item label="放款金额(万)" prop="auditDescription">
-            <el-input v-model="form.auditDescription" placeholder="请输入"/>
+        <template v-if="form.auditStatus==1">
+          <el-form-item label="放款金额(万)" prop="amount">
+            <el-input v-model="form.amount" placeholder="请输入"/>
           </el-form-item>
           <el-form-item label="使用期限" prop="auditLifespan">
             <ai-select v-model="form.auditLifespan" placeholder="请选择"
@@ -69,8 +81,8 @@
             <el-date-picker v-model="form.loanDate" placeholder="请选择" clearable/>
           </el-form-item>
         </template>
-        <el-form-item label="审批意见" prop="auditDescription">
-          <el-input type="textarea" v-model="form.auditDescription" placeholder="请输入"/>
+        <el-form-item v-else-if="form.auditStatus==0" label="审批意见" prop="remark">
+          <el-input type="textarea" v-model="form.remark" placeholder="请输入"/>
         </el-form-item>
       </el-form>
     </ai-dialog>
@@ -96,7 +108,13 @@ export default {
       detail: {},
       form: {},
       rules: {
-        auditStatus: [{required: true, message: "请选择审批结果"}]
+        auditStatus: [{required: true, message: "请选择 审批结果"}],
+        amount: [
+          {required: true, message: "请输入 放款金额"},
+          {pattern: /\d+/, message: "请输入 正确的放款金额"},
+        ],
+        auditLifespan: [{required: true, message: "请选择 使用期限"}],
+        loanDate: [{required: true, message: "请选择 放款日期"}],
       }
     }
   },
@@ -115,7 +133,7 @@ export default {
       this.$refs.AuditForm.validate(v => {
         if (v) {
           let {id} = this.detail
-          this.instance.post("/appfinancialloanapply/auditEnterprise", null, {
+          this.instance.post("/appfinancialloanapply/auditLoanApply", null, {
             params: {id, ...this.form}
           }).then(res => {
             if (res?.code == 0) {
@@ -144,7 +162,15 @@ export default {
 
     .el-form-item {
       width: 50%;
+
+      .el-link {
+        margin-left: 16px;
+      }
     }
   }
+
+  .el-date-editor {
+    width: 100%;
+  }
 }
 </style>
diff --git a/project/xiushan/apps/finance/AppLoadAudit/loanList.vue b/project/xiushan/apps/finance/AppLoadAudit/loanList.vue
index 5520deda..2d14d47c 100644
--- a/project/xiushan/apps/finance/AppLoadAudit/loanList.vue
+++ b/project/xiushan/apps/finance/AppLoadAudit/loanList.vue
@@ -5,15 +5,14 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <ai-select v-model="search.status" :selectList="dict.getDict('status')" placeholder="审批状态"
+            <ai-select v-model="search.status" :selectList="dict.getDict('financialLoanApplyStatus')" placeholder="审批状态"
                        @change="page.current=1,getTableData()"/>
             <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.enterpriseName" clearable
                       @change="page.current=1,getTableData()"/>
           </template>
         </ai-search-bar>
@@ -50,13 +49,13 @@ export default {
       tableData: [],
       colConfigs: [
         {label: "产品名称", prop: "productName"},
-        {label: "企业名称", prop: "enterpriseName"},
+        {label: "企业主体", prop: "enterpriseName"},
         {label: "贷款金额(万)", prop: "loanAmount"},
         {label: "申请时间", prop: "createTime"},
         {label: "联系人", prop: "name"},
         {label: "联系方式", prop: "phone"},
         {label: "贷款银行", prop: "organizationName"},
-        {label: "状态", prop: "status"},
+        {label: "状态", prop: "status", align: "center", dict: "financialLoanApplyStatus"},
         {slot: "options"}
       ]
     }
@@ -74,6 +73,12 @@ export default {
     },
     showDetail(id) {
       this.$router.push({query: {id}})
+    },
+    handleFilterApplyTime() {
+      this.page.current = 1
+      this.search.applyStartDate = this.search.applyTime?.[0]
+      this.search.applyEndDate = this.search.applyTime?.[1]
+      this.getTableData()
     }
   },
   created() {