From f855d54174e7baa563727009ae1e0c79c7aa40ef Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 1 Apr 2024 15:38:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E7=9B=B8=E5=85=B3=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/bank/Add.vue      | 10 ++++++
 src/views/product/bank/CardList.vue |  4 +++
 src/views/product/bank/Info.vue     | 55 +++++++++++++++--------------
 src/views/product/bank/List.vue     |  2 +-
 4 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/src/views/product/bank/Add.vue b/src/views/product/bank/Add.vue
index 0f96c63..80b128d 100644
--- a/src/views/product/bank/Add.vue
+++ b/src/views/product/bank/Add.vue
@@ -425,6 +425,7 @@ const getConfig = async () => {
 };
 // 详情
 const getDetail = async () => {
+  if (!route.query.show) curTab.value = 'tab1';
   userName.value = await getUsername();
 
   info.value = null;
@@ -492,6 +493,15 @@ const submit = async (formEl: FormInstance | undefined) => {
           return ElMessage.error('请输入合理的贷款利率');
         if (isIllegalNum(param.minimumTermOfLoan) || isIllegalNum(param.maximumTermOfLoan) || +param.minimumTermOfLoan > +param.maximumTermOfLoan)
           return ElMessage.error('请输入合理的贷款期限');
+
+        if (param.ageSelectedState !== 795) {
+          param.minimumAge = '';
+          param.maximumAge = '';
+        }
+
+        if (param.degreeSelectedStatus !== 795) param.educationalRequirements = [];
+        if (param.workingLifeSelectedState !== 795) param.currentWorkingLife = [];
+
         param.currentWorkingLife = param.currentWorkingLife.join();
         param.educationalRequirements = param.educationalRequirements.join();
         param.modeRepayment = param.modeRepayment.join();
diff --git a/src/views/product/bank/CardList.vue b/src/views/product/bank/CardList.vue
index 126c17f..55c1c38 100644
--- a/src/views/product/bank/CardList.vue
+++ b/src/views/product/bank/CardList.vue
@@ -47,6 +47,7 @@
               @getList="getList"></config>
       <detail v-if="action === 'detail'"></detail>
       <add v-else-if="action === 'add'"
+           :key="addKey"
            @getList="getList"></add>
       <approve v-else-if="action === 'approve'"
                @getList="getList"></approve>
@@ -80,6 +81,7 @@ const productType = computed(() => route.query.type); // 个人/企业
 const role = computed(() => +route.query.role || 41);
 const id = computed(() => +route.query.id);
 const configKey = ref<number>(1);
+const addKey = ref<number>(1);
 // 列表
 const getList = async (refresh?: number) => {
   loading.value = true;
@@ -122,9 +124,11 @@ const switchProduct = (row: any, refresh?: number) => {
   const path = `/product/bank/${toAction}`;
   router.push(`${path}?type=${route.query.type || ''}&i=${route.query.i}&role=${route.query.role}&id=${row.id}&name=${route.query.name ?? ''}`);
   if (toAction === 'config' && curAction === 'config') configKey.value += 1;
+  if (toAction === 'add' && curAction === 'add') addKey.value += 1;
 };
 // 新增
 const toAdd = () => {
+  if (action.value === 'add') addKey.value += 1;
   router.push(`/product/bank/add?type=${route.query.type || ''}&i=${route.query.i}&role=${route.query.role}`);
 };
 // 返回列表
diff --git a/src/views/product/bank/Info.vue b/src/views/product/bank/Info.vue
index 862876f..a93fbae 100644
--- a/src/views/product/bank/Info.vue
+++ b/src/views/product/bank/Info.vue
@@ -1,14 +1,15 @@
 <template>
   <div class="info my-2">
-    <template v-if="route.params.action !== 'add'">
-      <h6 class="step-name">{{ route.params.action !== 'config' ? '一、' : '' }}产品定义</h6>
-      <p class="text">{{ info.productDefinition }}</p>
-      <h6 class="step-name mt-5">{{ route.params.action !== 'config' ? '二、' : '' }}产品要素</h6>
-      <p class="text">产品名称：{{ info.productName }}</p>
-      <p class="text">贷款币种：人民币</p>
-      <p v-if="info.loanPurpose"
-         class="text">
-        贷款用途：{{
+    <h1 v-if="riskInfo"
+        class="mb-3 text-xl font-semibold text-center">{{ info.productName }}产品手册</h1>
+    <h6 class="step-name">{{ route.params.action !== 'config' ? '一、' : '' }}产品定义</h6>
+    <p class="text">{{ info.productDefinition }}</p>
+    <h6 class="step-name mt-5">{{ route.params.action !== 'config' ? '二、' : '' }}产品要素</h6>
+    <p class="text">产品名称：{{ info.productName }}</p>
+    <p class="text">贷款币种：人民币</p>
+    <p v-if="info.loanPurpose"
+       class="text">
+      贷款用途：{{
         info.loanPurpose === '购房'
           ? '可用于住房按揭贷款、二手房住房按揭贷款。'
           : info.loanPurpose === '消费'
@@ -21,27 +22,27 @@
           ? '用于短期生产经营周转的可循环的人民币信用贷款业务。'
           : info.otherPurposesOfLoan
       }}
-      </p>
-      <div class="flex my-2">
-        <p class="text whitespace-nowrap">担保方式：</p>
-        <p v-html="info.guarantyStyle"
-           class="text"></p>
-      </div>
+    </p>
+    <div v-if="info.guarantyStyle"
+         class="flex my-2">
+      <p class="text whitespace-nowrap">担保方式：</p>
+      <p v-html="info.guarantyStyle"
+         class="text"></p>
+    </div>
 
-      <p class="text">贷款期限：{{ info.minimumTermOfLoan }}月 - {{ info.maximumTermOfLoan }}月</p>
-      <p class="text">贷款限额：{{ info.minimumLoan }}万元 - {{ info.loanCeiling }}万元</p>
-      <p class="text">贷款利率：{{ info.minimumAprOnLoan }}% - {{ info.maximumAnnualInterestRate }}%</p>
-      <p class="text">还款方式：{{ info.modeRepayment }}</p>
+    <p class="text">贷款期限：{{ info.minimumTermOfLoan }}月 - {{ info.maximumTermOfLoan }}月</p>
+    <p class="text">贷款限额：{{ info.minimumLoan }}万元 - {{ info.loanCeiling }}万元</p>
+    <p class="text">贷款利率：{{ info.minimumAprOnLoan }}% - {{ info.maximumAnnualInterestRate }}%</p>
+    <p class="text">还款方式：{{ info.modeRepayment }}</p>
 
-      <div v-if="info.prospectiveBorrowerText"
-           class="flex my-2">
-        <p class="text whitespace-nowrap">贷款对象：</p>
-        <div class="text"
-             v-html="info.prospectiveBorrowerText"></div>
-      </div>
-    </template>
+    <div v-if="info.prospectiveBorrowerText"
+         class="flex my-2">
+      <p class="text whitespace-nowrap">贷款对象：</p>
+      <div class="text"
+           v-html="info.prospectiveBorrowerText"></div>
+    </div>
 
-    <template v-if="riskInfo && route.params.action !== 'config'">
+    <template v-if="riskInfo">
       <h6 class="step-name mt-5">{{ route.params.action !== 'add' ? '三、' : '' }}材料要求</h6>
       <p v-if="riskInfo?.accountMaterials"
          class="text">办理账户-提供材料：{{ riskInfo?.accountMaterials }}</p>
diff --git a/src/views/product/bank/List.vue b/src/views/product/bank/List.vue
index c43bee6..dcf2e50 100644
--- a/src/views/product/bank/List.vue
+++ b/src/views/product/bank/List.vue
@@ -99,7 +99,7 @@
           <el-button v-if="row.showDetailsOrNot"
                      type="text"
                      @click="toDetail(`/product/bank/detail`, row)"
-                     size="small">{{ params.roleId == 43 ? '审批结果' : '产品详情' }}</el-button>
+                     size="small">产品详情</el-button>
           <el-button v-if="row.showElementsOrNot"
                      type="text"
                      size="small"