From 5c2a578f6783cc1d1deb9d11c44c87373d486dbd Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 20 Nov 2023 10:49:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E6=9C=9F=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                       |   2 +-
 src/api/config.ts                          |   6 ++
 src/assets/images/date.png                 | Bin 0 -> 321 bytes
 src/layout/components/AppSidebar/index.vue |  62 ++++++++++++---
 src/views/Role.vue                         |  30 +++++--
 src/views/product/bank/Approve.vue         |  86 ++++++++++++---------
 src/views/product/bank/CardList.vue        |   4 +-
 src/views/product/bank/Info.vue            |   6 +-
 src/views/product/interestRate/772.vue     |  10 ++-
 src/views/product/interestRate/773.vue     |  10 ++-
 src/views/product/interestRate/935.vue     |  11 ++-
 src/views/product/interestRate/936.vue     |  10 ++-
 src/views/product/strategy/150.vue         |  18 +++--
 src/views/product/strategy/156.vue         |   2 +-
 src/views/product/strategy/CardList.vue    |  28 +++++--
 src/views/product/strategy/Credit.vue      |   8 +-
 src/views/product/strategy/Risk1.vue       |  10 ++-
 src/views/product/strategy/Risk2.vue       |  11 ++-
 src/views/product/strategy/Risk3.vue       |  11 ++-
 19 files changed, 226 insertions(+), 99 deletions(-)
 create mode 100644 src/assets/images/date.png

diff --git a/.env b/.env
index cd851a2..783e5c0 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.51:9000
+# VITE_BASE_API=http://192.168.31.217:9000
 VITE_BASE_API=http://121.37.12.51
 VITE_I18N_LOCALE=zh-cn
 VITE_I18N_FALLBACK_LOCALE=zh-cn
diff --git a/src/api/config.ts b/src/api/config.ts
index a23e931..7e55504 100644
--- a/src/api/config.ts
+++ b/src/api/config.ts
@@ -15,3 +15,9 @@ export const savePass = async (data: Record<string, any>): Promise<any> => (awai
 export const updatePass = async (data: Record<string, any>[]): Promise<any> => (await axios.post(`/nakadai/nakadai/customsPass/update`, data)).data;
 export const checkPointListByStu = async (projectId: number, displayCollection?: number | string = ''): Promise<any> =>
   (await axios.post(`/nakadai/nakadai/customsPass/checkPointListByStu?projectId=${projectId}&displayCollection=${displayCollection}`)).data;
+export const getTheCurrentUserName = async (): Promise<any> => (await axios.post('/product/product/bank/products/getTheCurrentUserName')).data;
+
+export const getOperationTime = async (checkpointId: number, projectId: number): Promise<any> =>
+  (await axios.post(`/product/product/bank/products/getOperationTime?checkPointId=${checkpointId}&projectId=${projectId}`)).data;
+export const saveOperationTime = async (checkpointId: number, projectId: number, operationTime: string): Promise<any> =>
+  (await axios.post(`/product/product/bank/products/saveOperationTime?checkPointId=${checkpointId}&projectId=${projectId}&operationTime=${operationTime}`)).data;
diff --git a/src/assets/images/date.png b/src/assets/images/date.png
new file mode 100644
index 0000000000000000000000000000000000000000..87d2173b3a868f82e7c3b0fccc7d7c5ad7dfc1f8
GIT binary patch
literal 321
zcmV-H0lxl;P)<h;3K|Lk000e1NJLTq000dD000aK1^@s6xwkjj00001b5ch_0Itp)
z=>Px#`$<GWR47xG(LXE3Q5eSY&pnt;1~F6K0VSD{Hy{(mz@{FGfx*9xfnwqn2s6oh
zkY}YN1{RCq*3s|Lj|FEsU7hba-|If1wleb!(-HB|iZinl2N5ya$|5tD&{hSLIKgY}
zu6B&$sLI|8^oS`W*06)88q|S#EF*AOpxcP(Er&954=WMz1!ZP|RwH7zI&)i~XYAIy
z{j#4c&^>1U0quY3W#$GJP;>@xiZNVPgV~OV#%G;Yr_3C}AhytjGRZQrJ2Y?|5trYf
zzv}&bX}zY`k8_OR3NI*ni!G=b5j~kXT<LA18xuJGp?8s)&C=-&H`V9<#j@`Mbbf&>
TD@yb500000NkvXXu0mjf-sX!y

literal 0
HcmV?d00001

diff --git a/src/layout/components/AppSidebar/index.vue b/src/layout/components/AppSidebar/index.vue
index d49de8d..d807dfa 100644
--- a/src/layout/components/AppSidebar/index.vue
+++ b/src/layout/components/AppSidebar/index.vue
@@ -7,23 +7,54 @@
              alt="" />
         <p class="text-white text-md">{{roleName}}</p>
         <p class="my-2 text-white text-sm">产品部门</p>
-        <p class="text-white text-xs">操作日期：2018-02-06</p>
+        <div class="flex justify-center items-center text-white text-xs">
+          操作日期：{{ date }}
+          <img class="ml-2 cursor-pointer"
+               src="@/assets/images/date.png"
+               alt=""
+               @click="dateVisible = true">
+        </div>
       </div>
       <menus></menus>
     </el-scrollbar>
+
+    <el-dialog v-model="dateVisible"
+               title="选择交易日期"
+               width="400px"
+               center>
+      <div class="text-center">
+        <el-date-picker v-model="diaDate"
+                        type="date" />
+      </div>
+      <template #footer>
+        <span class="flex justify-center">
+          <div class="dia-btn mr-3 cancel"
+               @click="dateVisible = false">取消</div>
+          <div class="dia-btn"
+               @click="submitDate">确定</div>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import Menus from './Menu.vue';
 import Settings from '@/settings';
-import { isShowMenu } from '@/store/useCurrentUser';
+import { getOperationTime, saveOperationTime } from '@/api/config';
 import { appState } from '@/store/useAppState';
+import Cookies from 'js-cookie';
+import dayjs from 'dayjs';
 
 const router = useRouter();
 const route = useRoute();
+const projectId = +Cookies.get('sand-projectId');
+const levelId = +Cookies.get('sand-level');
+const date = ref<string>(dayjs(new Date()).format('YYYY-M-D'));
+const diaDate = ref<string>(dayjs(new Date()).format('YYYY-M-D'));
+const dateVisible = ref<boolean>(false);
 
 const roleName = computed(() => {
   if (route.query.role) {
@@ -32,14 +63,23 @@ const roleName = computed(() => {
     return '保险产品经理';
   }
 });
-
-// Cool Gray 700
-const sidebarBg = '#374151';
-// Cool Gray 400
-const textColor = '#9CA3AF';
-const activeTextColor = '#FFF';
-const { routes } = router.options;
-const collapse = computed(() => !appState.sidebar);
+// 获取操作日期
+const getDate = async () => {
+  const res = await getOperationTime(levelId, projectId);
+  if (res.operationTime) {
+    date.value = res.operationTime;
+    diaDate.value = res.operationTime;
+  }
+};
+// 日期提交
+const submitDate = async () => {
+  await saveOperationTime(levelId, projectId, dayjs(new Date(diaDate.value)).format('YYYY-M-D'));
+  getDate();
+  dateVisible.value = false;
+};
+onMounted(() => {
+  getDate();
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/Role.vue b/src/views/Role.vue
index c9bcabf..9214f02 100644
--- a/src/views/Role.vue
+++ b/src/views/Role.vue
@@ -64,7 +64,7 @@
 
     <div class="date absolute top-[70px] left-[54%] w-[198px] h-[46px] pt-[10px] pl-[56px] text-base text-white bg-[url('@/assets/images/role/date.png')] bg-no-repeat cursor-pointer transition hover:bg-[url('@/assets/images/role/date1.png')]"
          @click="dateVisible = true">
-      2023-10-12
+      {{ date }}
     </div>
     <div class="role top-[310px] left-[340px] bg-[url('@/assets/images/role/product.png')] hover:bg-[url('@/assets/images/role/product1.png')]"
          @click="selecRole(41)"></div>
@@ -121,7 +121,7 @@
              width="400px"
              center>
     <div class="text-center">
-      <el-date-picker v-model="date"
+      <el-date-picker v-model="diaDate"
                       type="date" />
     </div>
     <template #footer>
@@ -129,7 +129,7 @@
         <div class="dia-btn mr-3 cancel"
              @click="dateVisible = false">取消</div>
         <div class="dia-btn"
-             @click="dateVisible = false">确定</div>
+             @click="submitDate">确定</div>
       </span>
     </template>
   </el-dialog>
@@ -138,16 +138,22 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
 import { checkPointList } from '@/api/judgment';
+import { getOperationTime, saveOperationTime } from '@/api/config';
 import Panel from '@/components/Panel/index.vue';
 import { useRouter, useRoute } from 'vue-router';
 import { logout } from '@/store/useCurrentUser';
+import Cookies from 'js-cookie';
+import dayjs from 'dayjs';
 
 const router = useRouter();
 const route = useRoute();
+const projectId = +Cookies.get('sand-projectId');
+const levelId = +Cookies.get('sand-level');
 const collected = ref<boolean>(false);
 const curLevel = ref<number | string>('');
 const dateVisible = ref<boolean>(false);
-const date = ref<any>(new Date());
+const date = ref<string>(dayjs(new Date()).format('YYYY-M-D'));
+const diaDate = ref<string>(dayjs(new Date()).format('YYYY-M-D'));
 const levels = ref<Record<string, any>[]>([]);
 const ranges = ref<Record<string, any>[]>([
   {
@@ -226,8 +232,22 @@ const selecRole = (id: number) => {
 const toLevel = () => {
   router.push('/');
 };
+// 获取操作日期
+const getDate = async () => {
+  const res = await getOperationTime(levelId, projectId);
+  if (res.operationTime) {
+    date.value = res.operationTime;
+    diaDate.value = res.operationTime;
+  }
+};
+// 日期提交
+const submitDate = async () => {
+  await saveOperationTime(levelId, projectId, dayjs(new Date(diaDate.value)).format('YYYY-M-D'));
+  getDate();
+  dateVisible.value = false;
+};
 onMounted(() => {
-  // getLevel();
+  getDate();
 });
 </script>
 
diff --git a/src/views/product/bank/Approve.vue b/src/views/product/bank/Approve.vue
index a401846..e341514 100644
--- a/src/views/product/bank/Approve.vue
+++ b/src/views/product/bank/Approve.vue
@@ -1,10 +1,9 @@
 <template>
   <div>
-    <el-tabs v-model="curTab"
-             @tab-click="tabChange">
+    <el-tabs v-model="curTab">
       <el-tab-pane label="产品审批"
                    name="tab1">
-        <info />
+        <info ref="infoRef" />
         <el-form ref="formRef"
                  :model="form"
                  :rules="rules"
@@ -32,11 +31,15 @@
           <div class="flex flex-col items-end">
             <div class="mb-[18px] text-sm leading-[1.6]">
               <span class="text-sm font-semibold">审批日期：</span>
-              <span>2022年10月18日</span>
+              <span>{{ date }}</span>
             </div>
             <div class="inline-flex items-center mb-[18px] text-sm leading-[1.6]">
               <span class="text-sm font-semibold">审批员：</span>
-              <span class="py-2 px-5 ml-1 text-sm text-white bg-[#006BFF] cursor-pointer">签章</span>
+              <span v-if="signed"
+                    class="text-lg text-[#f00]">{{ signed }}</span>
+              <span v-else
+                    class="py-2 px-5 ml-1 text-sm text-white bg-[#006BFF] cursor-pointer"
+                    @click="sign">签章</span>
             </div>
           </div>
           <div class="flex justify-end">
@@ -50,14 +53,17 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, reactive, watch, onMounted } from 'vue';
+import { ref, computed, reactive, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
 import type { TabsPaneContext, FormInstance, FormRules } from 'element-plus';
 import { useRouter, useRoute } from 'vue-router';
 import Info from './Info.vue';
+import { handleId } from '@/utils/common';
 import { findById, examineAndApprove } from '@/api/bank';
+import { getTheCurrentUserName, getOperationTime } from '@/api/config';
 import { getProcessInformationBasedOnRoles, addOperation } from '@/api/judgment';
 import dayjs from 'dayjs';
+import Cookies from 'js-cookie';
 
 const emit = defineEmits(['getList']);
 interface RuleForm {
@@ -67,10 +73,14 @@ interface RuleForm {
 }
 const router = useRouter();
 const route = useRoute();
+const projectId = +Cookies.get('sand-projectId');
+const levelId = +Cookies.get('sand-level');
 const curTab = ref<string>('tab1');
+const date = ref<string>(dayjs(new Date()).format('YYYY-M-D'));
 const info = ref<any>({});
 const config = ref<any[]>([]);
 const formRef = ref<FormInstance>();
+const infoRef = ref<any>(null);
 const form = reactive<RuleForm>({
   id: computed(() => +route.query.id),
   status: '',
@@ -80,25 +90,41 @@ const rules = reactive<FormRules<RuleForm>>({
   status: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
   opinionDescription: [{ required: true, message: '请输入意见描述', trigger: 'blur' }],
 });
+const signed = ref<string>();
 
-// tab切换回调
-const tabChange = (tab: TabsPaneContext, event: Event) => {
-  console.log(tab, event);
-};
 // 配置项
 const getConfig = async () => {
   const { process } = await getProcessInformationBasedOnRoles(43); // 专家委员会43
   config.value = process;
 };
-watch(
-  () => route.query,
-  () => {
-    // getDetail();
-  },
-  {
-    immediate: true,
-  },
-);
+// 获取操作日期
+const getDate = async () => {
+  const res = await getOperationTime(levelId, projectId);
+  if (res.operationTime) {
+    date.value = res.operationTime;
+  }
+};
+// 签章
+const sign = async () => {
+  const res = await getTheCurrentUserName();
+  signed.value = res.userName;
+};
+// 新增判分记录
+const addRecord = async (data: Record<string, any>) => {
+  const preIds = `1,${levelId},43`; // 1，关卡id，角色（这个页面是专家委员会审批）
+  const approved = !!infoRef.value.info.approvalTime; // 有审批时间则表示审批过了，判分点要用第二次审批的id
+  const lcRule = [
+    handleId(approved ? 1215 : 145, 69, data.status, preIds + ',' + (approved ? 1215 : 145), 1),
+    handleId(approved ? 1216 : 146, 70, data.opinionDescription, preIds + ',' + (approved ? 1216 : 146), 3),
+    handleId(approved ? 1217 : 758, 233, signed.value ? 514 : 515, preIds + ',' + (approved ? 1217 : 758), 1),
+  ];
+  await addOperation({
+    checkpointId: levelId,
+    parentId: preIds,
+    lcJudgmentRuleReq: lcRule,
+    projectId,
+  });
+};
 // 提交
 const submit = async (formEl: FormInstance | undefined) => {
   if (!formEl) return;
@@ -106,34 +132,20 @@ const submit = async (formEl: FormInstance | undefined) => {
     if (valid) {
       try {
         const param = JSON.parse(JSON.stringify(form));
-        param.approvalTime = dayjs(new Date()).format('YYYY年-M月-D日');
+        param.approvalTime = dayjs(new Date()).format('YYYY-M-D');
 
-        // const { message } = await examineAndApprove(param);
-        const { message } = await examineAndApprove(param.id, param.opinionDescription, param.status, param.approvalTime);
-        // addRecord(param, message);
+        await examineAndApprove(param.id, param.opinionDescription, param.status, param.approvalTime);
+        addRecord(param);
         ElMessage.success('提交成功！');
         emit('getList', 1);
       } finally {
       }
-    } else {
-      console.log('error submit!', fields);
     }
   });
 };
-// 新增判分记录
-const addRecord = async (data: Record<string, any>, newId: number) => {
-  const preIds = `1,2,43,${data.productType ? 45 : 44},${newId}`; // 1，关卡id，角色（这个页面是专家委员会审批），个人/企业（44/45）
-  const lcRule: Array<Record<string, any>> = [handleId(145, 69, data.status, preIds + ',145', 1), handleId(146, 70, data.opinionDescription, preIds + ',146', 3)];
-
-  await addOperation({
-    checkpointId: +Cookies.get('sand-level'),
-    parentId: preIds,
-    lcJudgmentRuleReq: lcRule,
-    projectId: +Cookies.get('sand-projectId'),
-  });
-};
 onMounted(() => {
   getConfig();
+  getDate();
 });
 </script>
 
diff --git a/src/views/product/bank/CardList.vue b/src/views/product/bank/CardList.vue
index ae6cdff..c41602b 100644
--- a/src/views/product/bank/CardList.vue
+++ b/src/views/product/bank/CardList.vue
@@ -81,7 +81,7 @@ const productType = computed(() => route.query.type); // 个人/企业
 const role = computed(() => +route.query.role || 41);
 const id = computed(() => +route.query.id);
 // 列表
-const getList = async () => {
+const getList = async (refresh?: number) => {
   loading.value = true;
   try {
     const { data } = await bankingProductsList({
@@ -94,7 +94,7 @@ const getList = async () => {
       keyWord: name,
     });
     list.value = data.message.records;
-    route.path !== '/product/bank/add' && list.value.length && !id.value && switchProduct(route.path, list.value[0].id);
+    ((route.path !== '/product/bank/add' && list.value.length && !id.value) || refresh) && switchProduct(refresh ? '/product/bank/detail' : route.path, list.value[0].id);
   } finally {
     loading.value = false;
   }
diff --git a/src/views/product/bank/Info.vue b/src/views/product/bank/Info.vue
index 85328e4..70253f3 100644
--- a/src/views/product/bank/Info.vue
+++ b/src/views/product/bank/Info.vue
@@ -121,7 +121,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch, onMounted } from 'vue';
+import { ref, computed, watch, defineExpose } from 'vue';
 import { findById } from '@/api/bank';
 import { useRouter, useRoute } from 'vue-router';
 import { getStatus } from '@/store/useProduct';
@@ -152,6 +152,10 @@ watch(
     immediate: true,
   },
 );
+
+defineExpose({
+  info,
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/interestRate/772.vue b/src/views/product/interestRate/772.vue
index f137ddf..093c196 100644
--- a/src/views/product/interestRate/772.vue
+++ b/src/views/product/interestRate/772.vue
@@ -83,7 +83,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElLoading } from 'element-plus';
 import { personalCreditModelDetails, personalCreditModelSaveOrUpdate } from '@/api/model';
 import { getProcessInformationBasedOnRoles, addOperation } from '@/api/judgment';
 import type { TableColumnCtx } from 'element-plus';
@@ -95,6 +95,7 @@ const router = useRouter();
 const route = useRoute();
 const projectId = +Cookies.get('sand-projectId');
 const levelId = +Cookies.get('sand-level');
+let loading = null;
 const form = ref<Record<string, any>>({
   projectId,
   checkpointId: levelId,
@@ -166,9 +167,11 @@ const getConfig = async () => {
     });
   }
   form.value.individualCreditModels = result;
+  loading.close();
 };
 // 详情
-const getDetail = async () => {
+const getDetail = async (load?: number) => {
+  if (load) loading = ElLoading.service();
   try {
     const { data } = await personalCreditModelDetails(levelId, projectId);
     if (data) {
@@ -180,7 +183,7 @@ const getDetail = async () => {
   }
 };
 onMounted(() => {
-  getDetail();
+  getDetail(1);
 });
 
 interface SpanMethodProps {
@@ -285,6 +288,7 @@ const submit = async () => {
     delete e.recordChildren;
     delete e.subject;
   });
+  loading = ElLoading.service();
   await personalCreditModelSaveOrUpdate(param);
   addRecord(param);
   getDetail();
diff --git a/src/views/product/interestRate/773.vue b/src/views/product/interestRate/773.vue
index 18ef1fb..65e98c7 100644
--- a/src/views/product/interestRate/773.vue
+++ b/src/views/product/interestRate/773.vue
@@ -86,7 +86,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElLoading } from 'element-plus';
 import { businessQuotaModelDetails, businessQuotaModelSaveOrUpdate } from '@/api/model';
 import { getProcessInformationBasedOnRoles, addOperation } from '@/api/judgment';
 import { useRouter, useRoute } from 'vue-router';
@@ -97,6 +97,7 @@ const router = useRouter();
 const route = useRoute();
 const projectId = +Cookies.get('sand-projectId');
 const levelId = +Cookies.get('sand-level');
+let loading = null;
 const form = ref<Record<string, any>>({
   projectId,
   checkpointId: levelId,
@@ -116,9 +117,11 @@ const info = ref<Record<string, any>[]>([]);
 const getConfig = async () => {
   const { process } = await getProcessInformationBasedOnRoles(773);
   info.value = process;
+  loading.close();
 };
 // 详情
-const getDetail = async () => {
+const getDetail = async (load?: number) => {
+  if (load) loading = ElLoading.service();
   try {
     const { data } = await businessQuotaModelDetails(levelId, projectId);
     if (data) {
@@ -129,7 +132,7 @@ const getDetail = async () => {
   }
 };
 onMounted(() => {
-  getDetail();
+  getDetail(1);
 });
 
 const getItemId = (name: string): number | string => {
@@ -158,6 +161,7 @@ const addRecord = async (data: Record<string, any>) => {
 };
 // 提交
 const submit = async () => {
+  loading = ElLoading.service();
   await businessQuotaModelSaveOrUpdate(form.value);
   addRecord(form.value);
   getDetail();
diff --git a/src/views/product/interestRate/935.vue b/src/views/product/interestRate/935.vue
index 0a98c74..c00722c 100644
--- a/src/views/product/interestRate/935.vue
+++ b/src/views/product/interestRate/935.vue
@@ -86,7 +86,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElLoading } from 'element-plus';
 import { personalInterestRateDetails, personalInterestRateSaveOrUpdate } from '@/api/model';
 import { getProcessInformationBasedOnRoles, addOperation } from '@/api/judgment';
 import type { TableColumnCtx } from 'element-plus';
@@ -98,6 +98,7 @@ const router = useRouter();
 const route = useRoute();
 const projectId = +Cookies.get('sand-projectId');
 const levelId = +Cookies.get('sand-level');
+let loading = null;
 const form = ref<Record<string, any>>({
   projectId,
   checkpointId: levelId,
@@ -148,10 +149,11 @@ const getConfig = async () => {
     });
   }
   form.value.individualInterestRateModels = result;
-  console.log('🚀 ~ file: 935.vue:173 ~ getConfig ~ result:', result);
+  loading.close();
 };
 // 详情
-const getDetail = async () => {
+const getDetail = async (load?: number) => {
+  if (load) loading = ElLoading.service();
   try {
     const { data } = await personalInterestRateDetails(levelId, projectId);
     if (data) {
@@ -163,7 +165,7 @@ const getDetail = async () => {
   }
 };
 onMounted(() => {
-  getDetail();
+  getDetail(1);
 });
 
 interface SpanMethodProps {
@@ -241,6 +243,7 @@ const submit = async () => {
     delete e.recordChildren;
     delete e.subject;
   });
+  loading = ElLoading.service();
   await personalInterestRateSaveOrUpdate(param);
   addRecord(param);
   getDetail();
diff --git a/src/views/product/interestRate/936.vue b/src/views/product/interestRate/936.vue
index 7aa3efa..c491654 100644
--- a/src/views/product/interestRate/936.vue
+++ b/src/views/product/interestRate/936.vue
@@ -91,7 +91,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElLoading } from 'element-plus';
 import { businessInterestRateDetails, businessInterestRateSaveOrUpdate } from '@/api/model';
 import { getProcessInformationBasedOnRoles, addOperation } from '@/api/judgment';
 import type { TableColumnCtx } from 'element-plus';
@@ -103,6 +103,7 @@ const router = useRouter();
 const route = useRoute();
 const projectId = +Cookies.get('sand-projectId');
 const levelId = +Cookies.get('sand-level');
+let loading = null;
 const form = ref<Record<string, any>>({
   projectId,
   checkpointId: levelId,
@@ -154,9 +155,11 @@ const getConfig = async () => {
     });
   });
   form.value.corporateInterestRateModelIndicators = result;
+  loading.close();
 };
 // 详情
-const getDetail = async () => {
+const getDetail = async (load?: number) => {
+  if (load) loading = ElLoading.service();
   try {
     const { data } = await businessInterestRateDetails(levelId, projectId);
     if (data) {
@@ -168,7 +171,7 @@ const getDetail = async () => {
   }
 };
 onMounted(() => {
-  getDetail();
+  getDetail(1);
 });
 
 interface SpanMethodProps {
@@ -266,6 +269,7 @@ const addRecord = async (data: Record<string, any>) => {
 };
 // 提交
 const submit = async () => {
+  loading = ElLoading.service();
   const param = JSON.parse(JSON.stringify(form.value));
   const list = [];
   param.corporateInterestRateModelIndicators.forEach((e, i) => {
diff --git a/src/views/product/strategy/150.vue b/src/views/product/strategy/150.vue
index 83cb851..5fcbb8a 100644
--- a/src/views/product/strategy/150.vue
+++ b/src/views/product/strategy/150.vue
@@ -4,14 +4,16 @@
             :data="form"
             :max-height="height"
             :span-method="span"
+            style="width: 100%"
             border>
     <el-table-column prop="name"
+                     fixed
                      label="指标"
-                     min-width="150"
+                     width="150"
                      align="center">
     </el-table-column>
     <el-table-column label="规则"
-                     min-width="350"
+                     width="350"
                      align="center">
       <template #default="{ row }">
         <!-- 大病报销 || 贫困户 -->
@@ -71,42 +73,42 @@
       </template>
     </el-table-column>
     <el-table-column label="本人命中进黑名单"
-                     min-width="140"
+                     width="150"
                      align="center">
       <template #default="{ row }">
         <el-checkbox v-model="row.personalHitBlacklist"></el-checkbox>
       </template>
     </el-table-column>
     <el-table-column label="配偶命中拒入"
-                     min-width="140"
+                     width="150"
                      align="center">
       <template #default="{ row }">
         <el-checkbox v-model="row.mateHitRejected"></el-checkbox>
       </template>
     </el-table-column>
     <el-table-column label="父母/子女命中拒入"
-                     min-width="140"
+                     width="140"
                      align="center">
       <template #default="{ row }">
         <el-checkbox v-model="row.parentsHitRejected"></el-checkbox>
       </template>
     </el-table-column>
     <el-table-column label="其他家庭成员命中拒入"
-                     min-width="140"
+                     width="160"
                      align="center">
       <template #default="{ row }">
         <el-checkbox v-model="row.otherFamilyMembersHitRejected"></el-checkbox>
       </template>
     </el-table-column>
     <el-table-column label="企业大股东命中拒入"
-                     min-width="140"
+                     width="160"
                      align="center">
       <template #default="{ row }">
         <el-checkbox v-model="row.corporateMajorityHitRejected"></el-checkbox>
       </template>
     </el-table-column>
     <el-table-column label="本人及亲属企业命中准入"
-                     min-width="140"
+                     width="180"
                      align="center">
       <template #default="{ row }">
         <el-checkbox v-model="row.hitAccess"
diff --git a/src/views/product/strategy/156.vue b/src/views/product/strategy/156.vue
index 4a329c7..2ef4ec6 100644
--- a/src/views/product/strategy/156.vue
+++ b/src/views/product/strategy/156.vue
@@ -62,7 +62,7 @@ import { accessStrategyNegativeIndustryStrategyFind, accessStrategyNegativeIndus
 import { getProcessInformationBasedOnRoles, addOperation } from '@/api/judgment';
 import type { TableColumnCtx } from 'element-plus';
 import { useRouter, useRoute } from 'vue-router';
-import { handleId, getNum, getChinese } from '@/utils/common';
+import { handleId } from '@/utils/common';
 import Cookies from 'js-cookie';
 
 const router = useRouter();
diff --git a/src/views/product/strategy/CardList.vue b/src/views/product/strategy/CardList.vue
index 73b8b03..8d3948c 100644
--- a/src/views/product/strategy/CardList.vue
+++ b/src/views/product/strategy/CardList.vue
@@ -18,13 +18,27 @@
             </ul>
           </div>
           <div class="right flex-1 px-5 pt-2">
-            <Com1 v-if="id == 150" />
-            <Com2 v-else-if="id == 151" />
-            <Com3 v-else-if="id == 152" />
-            <Com4 v-else-if="id == 153" />
-            <Com5 v-else-if="id == 154" />
-            <Com6 v-else-if="id == 155" />
-            <Com7 v-else-if="id == 156" />
+            <div v-show="id == 150">
+              <Com1 />
+            </div>
+            <div v-show="id == 151">
+              <Com2 />
+            </div>
+            <div v-show="id == 152">
+              <Com3 />
+            </div>
+            <div v-show="id == 153">
+              <Com4 />
+            </div>
+            <div v-show="id == 154">
+              <Com5 />
+            </div>
+            <div v-show="id == 155">
+              <Com6 />
+            </div>
+            <div v-show="id == 156">
+              <Com7 />
+            </div>
           </div>
         </div>
       </el-tab-pane>
diff --git a/src/views/product/strategy/Credit.vue b/src/views/product/strategy/Credit.vue
index 386f1e4..41550f9 100644
--- a/src/views/product/strategy/Credit.vue
+++ b/src/views/product/strategy/Credit.vue
@@ -175,7 +175,7 @@ const route = useRoute();
 const id = computed(() => +route.query.creditId);
 const projectId = +Cookies.get('sand-projectId');
 const levelId = +Cookies.get('sand-level');
-let loading: boolean = true;
+let loading = null;
 const list = ref<Record<string, any>[]>([]);
 const list1 = ref<Record<string, any>[]>([]);
 const detail = ref<Record<string, any>>({});
@@ -605,8 +605,8 @@ const getConfig = async () => {
   loading.close();
 };
 // 详情
-const getDetail = async () => {
-  loading = ElLoading.service();
+const getDetail = async (load?: number) => {
+  if (load) loading = ElLoading.service();
   if (id.value) {
     try {
       const res = await findCredit(id.value);
@@ -635,7 +635,7 @@ const getDetail = async () => {
 watch(
   () => route.query,
   () => {
-    getDetail();
+    getDetail(1);
   },
   {
     immediate: true,
diff --git a/src/views/product/strategy/Risk1.vue b/src/views/product/strategy/Risk1.vue
index a0473bd..85ccf65 100644
--- a/src/views/product/strategy/Risk1.vue
+++ b/src/views/product/strategy/Risk1.vue
@@ -54,7 +54,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElLoading } from 'element-plus';
 import { detailRick, saveRick } from '@/api/model';
 import { getProcessInformationBasedOnRoles, addOperation } from '@/api/judgment';
 import { useRouter, useRoute } from 'vue-router';
@@ -65,6 +65,7 @@ const router = useRouter();
 const route = useRoute();
 const projectId = +Cookies.get('sand-projectId');
 const levelId = +Cookies.get('sand-level');
+let loading = null;
 const form = ref<Record<string, any>[]>([]);
 const info = ref<Record<string, any>[]>([]);
 // 配置项
@@ -87,9 +88,11 @@ const getConfig = async () => {
     });
   });
   form.value = result;
+  loading.close();
 };
 // 详情
-const getDetail = async () => {
+const getDetail = async (load?: number) => {
+  if (load) loading = ElLoading.service();
   try {
     const { data } = await detailRick({
       checkpointId: levelId,
@@ -102,11 +105,12 @@ const getDetail = async () => {
   }
 };
 onMounted(() => {
-  getDetail();
+  getDetail(1);
 });
 
 // 提交
 const submit = async () => {
+  loading = ElLoading.service();
   await saveRick({ riskDegreeStrategyList: form.value });
   addRecord();
   getDetail();
diff --git a/src/views/product/strategy/Risk2.vue b/src/views/product/strategy/Risk2.vue
index 5c6e026..5dc57a9 100644
--- a/src/views/product/strategy/Risk2.vue
+++ b/src/views/product/strategy/Risk2.vue
@@ -39,7 +39,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElLoading } from 'element-plus';
 import { detailRick, saveRick } from '@/api/model';
 import { getProcessInformationBasedOnRoles, addOperation } from '@/api/judgment';
 import { useRouter, useRoute } from 'vue-router';
@@ -50,6 +50,7 @@ const router = useRouter();
 const route = useRoute();
 const projectId = +Cookies.get('sand-projectId');
 const levelId = +Cookies.get('sand-level');
+let loading = null;
 const form = ref<Record<string, any>[]>([]);
 const info = ref<Record<string, any>[]>([]);
 // 配置项
@@ -83,9 +84,11 @@ const getConfig = async () => {
     });
   });
   form.value = result;
+  loading.close();
 };
 // 详情
-const getDetail = async () => {
+const getDetail = async (load?: number) => {
+  if (load) loading = ElLoading.service();
   try {
     const { data } = await detailRick({
       checkpointId: levelId,
@@ -95,6 +98,7 @@ const getDetail = async () => {
     info.value = data;
     if (data.length) {
       form.value = data;
+      loading.close();
     } else {
       getConfig();
     }
@@ -102,11 +106,12 @@ const getDetail = async () => {
   }
 };
 onMounted(() => {
-  getDetail();
+  getDetail(1);
 });
 
 // 提交
 const submit = async () => {
+  loading = ElLoading.service();
   await saveRick({ riskDegreeStrategyList: form.value });
   addRecord();
   getDetail();
diff --git a/src/views/product/strategy/Risk3.vue b/src/views/product/strategy/Risk3.vue
index 8f14f2c..4facf9d 100644
--- a/src/views/product/strategy/Risk3.vue
+++ b/src/views/product/strategy/Risk3.vue
@@ -39,7 +39,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElLoading } from 'element-plus';
 import { detailRick, saveRick } from '@/api/model';
 import { getProcessInformationBasedOnRoles, addOperation } from '@/api/judgment';
 import { useRouter, useRoute } from 'vue-router';
@@ -50,6 +50,7 @@ const router = useRouter();
 const route = useRoute();
 const projectId = +Cookies.get('sand-projectId');
 const levelId = +Cookies.get('sand-level');
+let loading = null;
 const form = ref<Record<string, any>[]>([]);
 const info = ref<Record<string, any>[]>([]);
 // 配置项
@@ -76,9 +77,11 @@ const getConfig = async () => {
     });
   });
   form.value = result;
+  loading.close();
 };
 // 详情
-const getDetail = async () => {
+const getDetail = async (load?: number) => {
+  if (load) loading = ElLoading.service();
   try {
     const { data } = await detailRick({
       checkpointId: levelId,
@@ -88,6 +91,7 @@ const getDetail = async () => {
     info.value = data;
     if (data.length) {
       form.value = data;
+      loading.close();
     } else {
       getConfig();
     }
@@ -95,11 +99,12 @@ const getDetail = async () => {
   }
 };
 onMounted(() => {
-  getDetail();
+  getDetail(1);
 });
 
 // 提交
 const submit = async () => {
+  loading = ElLoading.service();
   await saveRick({ riskDegreeStrategyList: form.value });
   addRecord();
   getDetail();