From d811eba4b69ed595c50cf5f9805a72df79a976d1 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 3 Apr 2024 13:51:38 +0800
Subject: [PATCH] fix

---
 .env                                |  2 +-
 src/views/product/bank/Add.vue      |  2 +-
 src/views/product/bank/CardList.vue | 13 ++++++-------
 src/views/product/bank/List.vue     |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index 104e2c6..79153fd 100644
--- a/.env
+++ b/.env
@@ -2,7 +2,7 @@ VITE_APP_TITLE=金融产品设计及数字化营销沙盘
 VITE_PORT=9520
 # VITE_PROXY=http://192.168.31.125:8080
 VITE_PUBLIC_PATH=./
-VITE_BASE_API=http://192.168.31.217:9000
+VITE_BASE_API=http://192.168.31.51:9000
 # VITE_BASE_API=http://121.37.12.51
 # VITE_BASE_API=https://www.occupationlab.com
 VITE_I18N_LOCALE=zh-cn
diff --git a/src/views/product/bank/Add.vue b/src/views/product/bank/Add.vue
index 80b128d..33c6e80 100644
--- a/src/views/product/bank/Add.vue
+++ b/src/views/product/bank/Add.vue
@@ -494,7 +494,7 @@ const submit = async (formEl: FormInstance | undefined) => {
         if (isIllegalNum(param.minimumTermOfLoan) || isIllegalNum(param.maximumTermOfLoan) || +param.minimumTermOfLoan > +param.maximumTermOfLoan)
           return ElMessage.error('请输入合理的贷款期限');
 
-        if (param.ageSelectedState !== 795) {
+        if (!param.productType && param.ageSelectedState !== 795) {
           param.minimumAge = '';
           param.maximumAge = '';
         }
diff --git a/src/views/product/bank/CardList.vue b/src/views/product/bank/CardList.vue
index 55c1c38..afc4a9f 100644
--- a/src/views/product/bank/CardList.vue
+++ b/src/views/product/bank/CardList.vue
@@ -43,13 +43,14 @@
       <!-- <component :is="currentSubApp"
                  @getList="getList"></component> -->
       <config v-if="action === 'config'"
-              :key="configKey"
+              :key="actionKey"
               @getList="getList"></config>
       <detail v-if="action === 'detail'"></detail>
       <add v-else-if="action === 'add'"
-           :key="addKey"
+           :key="actionKey"
            @getList="getList"></add>
       <approve v-else-if="action === 'approve'"
+               :key="actionKey"
                @getList="getList"></approve>
     </div>
   </div>
@@ -80,8 +81,7 @@ const loading = ref<boolean>(false);
 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 actionKey = ref<number>(1);
 // 列表
 const getList = async (refresh?: number) => {
   loading.value = true;
@@ -123,12 +123,11 @@ const switchProduct = (row: any, refresh?: number) => {
   const curAction = action.value;
   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;
+  if (toAction === curAction) actionKey.value += 1;
 };
 // 新增
 const toAdd = () => {
-  if (action.value === 'add') addKey.value += 1;
+  if (action.value === 'add') actionKey.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/List.vue b/src/views/product/bank/List.vue
index dcf2e50..55dda39 100644
--- a/src/views/product/bank/List.vue
+++ b/src/views/product/bank/List.vue
@@ -120,7 +120,7 @@
           <el-button v-if="row.showApprovalOrNot"
                      type="text"
                      size="small"
-                     @click="toDetail(`/product/bank/approve`, row.id)">审批</el-button>
+                     @click="toDetail(`/product/bank/approve`, row)">审批</el-button>
         </template></el-table-column>
     </el-table>
     <el-pagination v-model:currentPage="currentPage"