From 092e66ac0b910b5b5dd0695ea3c08ee0b7946159 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 16 May 2024 14:00:04 +0800
Subject: [PATCH] fix

---
 src/components/Panel/index.vue            | 11 ++--
 src/views/product/bank/Config.vue         |  4 +-
 src/views/product/bank/Info.vue           |  3 +-
 src/views/product/strategy/150/Detail.vue | 28 ++++-----
 src/views/product/strategy/151/Detail.vue | 28 ++++-----
 src/views/product/strategy/152/Detail.vue | 70 +++++++++--------------
 src/views/product/strategy/153/Detail.vue |  4 +-
 src/views/product/strategy/155/Detail.vue |  8 +--
 src/views/product/strategy/Risk1.vue      |  2 +-
 9 files changed, 63 insertions(+), 95 deletions(-)

diff --git a/src/components/Panel/index.vue b/src/components/Panel/index.vue
index 873cdbc..038159d 100644
--- a/src/components/Panel/index.vue
+++ b/src/components/Panel/index.vue
@@ -62,10 +62,10 @@
                       <el-table-column prop="score" label="分值" width="60" align="center"></el-table-column>
                       <template v-if="!param.competitionId">
                         <el-table-column label="结果" width="60" align="center">
-                          <template v-slot="scope">
+                          <template #default="{ row }">
                             <template v-if="isSubmit">
                               <div v-if="!param.competitionId" class="flex justify-center items-center">
-                                <el-icon v-if="scope.row.finishedResult" color="#15d500" :size="16">
+                                <el-icon v-if="row.finishedResult" color="#15d500" :size="16">
                                   <Check />
                                 </el-icon>
                                 <el-icon v-else color="#f00" :size="16">
@@ -76,9 +76,9 @@
                             </template>
                           </template>
                         </el-table-column>
-                        <el-table-column prop="score" label="得分" width="60" align="center">
-                          <template v-slot="scope">
-                            <template v-if="isSubmit">{{ param.competitionId ? '-' : scope.row.examScore }}</template>
+                        <el-table-column label="得分" width="60" align="center">
+                          <template #default="{ row }">
+                            <template v-if="isSubmit">{{ param.competitionId ? '-' : row.examScore }}</template>
                           </template>
                         </el-table-column>
                       </template>
@@ -614,7 +614,6 @@ let getProDetail = async () => {
         projectName: project.projectName,
       },
     ];
-    // Cookies.set('sand-projectName', project.projectName);
   }
   curReq.value = pointsList.map((e) => e.judgmentId); // 实验要求默认全部展开，通过judgmentId来选中item
   points.value = pointsList;
diff --git a/src/views/product/bank/Config.vue b/src/views/product/bank/Config.vue
index 606bb4a..5c49ee9 100644
--- a/src/views/product/bank/Config.vue
+++ b/src/views/product/bank/Config.vue
@@ -510,7 +510,7 @@ import {
   collectionAfterLoan,
 } from '@/api/model';
 import { useRouter, useRoute } from 'vue-router';
-import { handleId, getIds, getUsername } from '@/utils/common';
+import { handleId, getIds } from '@/utils/common';
 import Cookies from 'js-cookie';
 import { getStat } from '@/store/useProduct';
 import Info from './Info.vue';
@@ -590,7 +590,6 @@ const whethers1 = ref<Record<string, any>>([
   },
 ]);
 const formRef = ref<FormInstance>();
-const userName = ref<string>();
 const curRow = ref<Record<string, any>>();
 const strategyParams = { pageNum: 1, pageSize: 100, keyWord: '', ...getIds() };
 const visible = ref<boolean>(false);
@@ -845,7 +844,6 @@ const getConfig = async () => {
 };
 // 详情
 const getDetail = async () => {
-  userName.value = await getUsername();
   if (id.value) {
     try {
       // 查询产品要素详情
diff --git a/src/views/product/bank/Info.vue b/src/views/product/bank/Info.vue
index 3dfe024..c3c0c96 100644
--- a/src/views/product/bank/Info.vue
+++ b/src/views/product/bank/Info.vue
@@ -140,7 +140,7 @@
         {{ item.opinionDescription }}
       </div>
       <p class="mb-2 text-sm text-[#333] text-right">审查日期：{{ item.approvalTime }}</p>
-      <p class="mb-2 text-sm text-[#333] text-right">审查员：{{ item.examinationApprovalOfficer }}</p>
+      <p class="mb-2 text-sm text-[#333] text-right">{{ i === 10 ? '' : '审查员：' }}{{ item.examinationApprovalOfficer }}</p>
     </div>
   </div>
 
@@ -205,6 +205,7 @@ const loadComponent = async (componentName: string) => {
 
 // 详情
 const getDetail = async () => {
+  console.log(111);
   userName.value = await getUsername();
 
   if (id.value) {
diff --git a/src/views/product/strategy/150/Detail.vue b/src/views/product/strategy/150/Detail.vue
index 1612669..5410cbe 100644
--- a/src/views/product/strategy/150/Detail.vue
+++ b/src/views/product/strategy/150/Detail.vue
@@ -14,11 +14,9 @@
             <!-- 大病报销 || 贫困户 -->
             <div v-if="row.stRecordId == 161 || row.stRecordId == 164" class="flex items-center">
               <span v-if="row.recordChildren" class="whitespace-nowrap">{{ row?.recordChildren[row.span ? 1 : 0]?.name }}</span>
-              <div class="w-[95px]">
-                <el-select class="mx-2" clearable v-model="row.symbol">
-                  <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
-                </el-select>
-              </div>
+              <el-select class="w-[95px] mx-2" clearable v-model="row.symbol">
+                <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
+              </el-select>
               <el-input class="w-[80px]" placeholder="请输入" v-model="row.num"></el-input>
               <span class="ml-2 whitespace-nowrap">万元</span>
             </div>
@@ -26,24 +24,20 @@
             <div v-else-if="row.stRecordId == 167" class="flex items-center">
               <template v-if="row.span">
                 <span class="whitespace-nowrap">且近一年</span>
-                <div class="w-[90px]">
-                  <el-select class="mx-2" v-model="row.had">
-                    <el-option value="有" />
-                    <el-option value="无" />
-                  </el-select>
-                </div>
+                <el-select class="w-[95px] mx-2" clearable v-model="row.had">
+                  <el-option value="有" />
+                  <el-option value="无" />
+                </el-select>
                 <span class="ml-2 whitespace-nowrap">缴纳过社保或公积金</span>
               </template>
               <template v-else>
                 <span class="whitespace-nowrap">未婚，且年龄</span>
-                <div class="w-[90px]">
-                  <el-select class="mx-2" v-model="row.symbol">
-                    <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
-                  </el-select>
-                </div>
+                <el-select class="w-[95px] mx-2" clearable v-model="row.symbol">
+                  <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
+                </el-select>
                 <el-input class="w-[80px]" placeholder="请输入" v-model="row.num"></el-input>
                 <span class="ml-2 whitespace-nowrap">,</span>
-                <el-select class="w-[80px] ml-2" v-model="row.had">
+                <el-select class="w-[80px] ml-2" clearable v-model="row.had">
                   <el-option value="有" />
                   <el-option value="无" />
                 </el-select>
diff --git a/src/views/product/strategy/151/Detail.vue b/src/views/product/strategy/151/Detail.vue
index 674057f..3885eae 100644
--- a/src/views/product/strategy/151/Detail.vue
+++ b/src/views/product/strategy/151/Detail.vue
@@ -9,7 +9,7 @@
     <el-form-item label="策略规则">
       <el-table class="c-table" :data="form" :cell-style="{ background: '#fff' }" max-height="calc(100vh - 230px)" border>
         <el-table-column prop="name" label="征信黑名单指标" min-width="220" align="center"> </el-table-column>
-        <el-table-column label="进黑名单条件" width="700" align="center">
+        <el-table-column label="进黑名单条件" width="800" align="center">
           <template #default="{ row }">
             <!-- 贷记卡账户状态 -->
             <div v-if="row.stRecordId == 204" class="flex items-center">
@@ -20,34 +20,28 @@
             <!-- 贷记卡审批通过率 -->
             <div v-else-if="isRule(row.stRecordId)" class="flex items-center">
               <span v-if="row.recordChildren" class="whitespace-nowrap">{{ row?.recordChildren[0]?.name }}</span>
-              <div class="w-[95px]">
-                <el-select class="mx-2" clearable v-model="row.symbol">
-                  <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
-                </el-select>
-              </div>
+              <el-select class="w-[95px] mx-2" clearable v-model="row.symbol">
+                <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
+              </el-select>
               <el-input class="w-[80px]" placeholder="请输入" v-model="row.num"></el-input>
               <span v-if="row.recordChildren" class="ml-2 whitespace-nowrap">，{{ row?.recordChildren[1]?.name }}</span>
-              <div class="w-[95px]">
-                <el-select class="mx-2" clearable v-model="row.symbol1">
-                  <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
-                </el-select>
-              </div>
+              <el-select class="w-[95px] mx-2" clearable v-model="row.symbol1">
+                <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
+              </el-select>
               <el-input class="w-[80px]" placeholder="请输入" v-model="row.num1"></el-input>
               <span class="ml-2 whitespace-nowrap">。</span>
             </div>
             <div v-else-if="row.stRecordId == 230 || row.stRecordId == 231" class="flex">
-              <el-select class="w-[85px] ml-2" clearable v-model="row.ruleOne">
+              <el-select class="w-[95px] ml-2" clearable v-model="row.ruleOne">
                 <el-option value="有" />
                 <el-option value="无" />
               </el-select>
             </div>
             <div v-else class="flex items-center">
               <span v-if="row.recordChildren" class="whitespace-nowrap">{{ row?.recordChildren[0]?.name }}</span>
-              <div class="w-[95px]">
-                <el-select class="mx-2" clearable v-model="row.symbol">
-                  <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
-                </el-select>
-              </div>
+              <el-select class="w-[95px] mx-2" clearable v-model="row.symbol">
+                <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
+              </el-select>
               <el-input class="w-[80px]" placeholder="请输入" v-model="row.num"></el-input>
               <span class="ml-2 whitespace-nowrap"
                 >{{ row.stRecordId === 203 || row.stRecordId === 205 ? '元' : row.stRecordId === 207 || row.stRecordId === 229 ? '万元' : ' ' }}。</span
diff --git a/src/views/product/strategy/152/Detail.vue b/src/views/product/strategy/152/Detail.vue
index 543e690..bd63cf9 100644
--- a/src/views/product/strategy/152/Detail.vue
+++ b/src/views/product/strategy/152/Detail.vue
@@ -10,15 +10,13 @@
       <el-table class="c-table" :data="form" max-height="calc(100vh - 230px)" :cell-style="{ background: '#fff' }" :span-method="span" border>
         <el-table-column prop="name" label="数据源" min-width="100" align="center"> </el-table-column>
         <el-table-column prop="rule" label="商采黑名单指标" min-width="150"> </el-table-column>
-        <el-table-column label="进黑名单条件" width="540">
+        <el-table-column label="进黑名单条件" width="700">
           <template #default="{ row, $index }">
             <div v-if="$index < 4" class="flex items-center">
               <span class="whitespace-nowrap">{{ row.rule }}</span>
-              <div class="w-[95px]">
-                <el-select class="mx-2" clearable v-model="row.symbol">
-                  <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
-                </el-select>
-              </div>
+              <el-select class="w-[95px] mx-2" clearable v-model="row.symbol">
+                <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
+              </el-select>
               <el-input class="w-[80px]" placeholder="请输入" v-model="row.num"></el-input>
               <span class="ml-2 whitespace-nowrap">。</span>
             </div>
@@ -26,61 +24,47 @@
             <!-- 腾讯 -->
             <div v-else-if="$index === 14" class="flex items-center">
               <span v-if="row.recordChildren" class="whitespace-nowrap">{{ row?.recordChildren[0]?.recordChildren[0]?.name }}</span>
-              <div class="w-[95px]">
-                <el-select class="mx-2" clearable v-model="row.symbol">
-                  <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
-                </el-select>
-              </div>
+              <el-select class="w-[95px] mx-2" clearable v-model="row.symbol">
+                <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
+              </el-select>
               <el-input class="w-[80px]" placeholder="请输入" v-model="row.num"></el-input>
               <span class="ml-2 whitespace-nowrap">，且</span>
-              <div class="w-[120px]">
-                <el-select class="mx-2" clearable v-model="row.had">
-                  <el-option v-for="item in house" :key="item" :label="item.name" :value="item.name" />
-                </el-select>
-              </div>
+              <el-select class="w-[120px] mx-2" clearable v-model="row.had">
+                <el-option v-for="item in house" :key="item" :label="item.name" :value="item.name" />
+              </el-select>
               <span class="ml-2 whitespace-nowrap">。</span>
             </div>
             <div v-else-if="$index === 15" class="flex items-center">
               <el-input class="w-[80px]" placeholder="请输入" v-model="row.num"></el-input>
-              <div class="w-[95px]">
-                <el-select class="mx-2" clearable v-model="row.symbol">
-                  <el-option v-for="item in units" :key="item" :label="item.name" :value="item.name" />
-                </el-select>
-              </div>
+              <el-select class="w-[95px] mx-2" clearable v-model="row.symbol">
+                <el-option v-for="item in units" :key="item" :label="item.name" :value="item.name" />
+              </el-select>
               <span class="ml-2 whitespace-nowrap">内申请次数</span>
-              <div class="w-[95px]">
-                <el-select class="mx-2" clearable v-model="row.symbol1">
-                  <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
-                </el-select>
-              </div>
+              <el-select class="w-[95px] mx-2" clearable v-model="row.symbol1">
+                <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
+              </el-select>
               <el-input class="w-[80px]" placeholder="请输入" v-model="row.num1"></el-input>
               <span class="ml-2 whitespace-nowrap">，且</span>
-              <div class="w-[120px]">
-                <el-select class="mx-2" clearable v-model="row.had">
-                  <el-option v-for="item in house" :key="item" :label="item.name" :value="item.name" />
-                </el-select>
-              </div>
+              <el-select class="w-[120px] mx-2" clearable v-model="row.had">
+                <el-option v-for="item in house" :key="item" :label="item.name" :value="item.name" />
+              </el-select>
               <span class="ml-2 whitespace-nowrap">。</span>
             </div>
-            <div v-else-if="$index === 18" class="w-[95px]">
-              <el-select v-if="row.recordChildren" clearable v-model="row.symbol">
+            <div v-else-if="$index === 18">
+              <el-select v-if="row.recordChildren" class="w-[95px]" clearable v-model="row.symbol">
                 <el-option v-for="item in row?.recordChildren[0]?.subject?.itemList" :key="item" :label="item.options" :value="item.options" />
               </el-select>
             </div>
             <div v-else-if="$index > 19 && $index < 28" class="flex items-center">
               <el-input class="w-[80px]" placeholder="请输入" v-model="row.num"></el-input>
-              <div class="w-[95px]">
-                <el-select class="mx-2" clearable v-model="row.symbol">
-                  <el-option v-for="item in units" :key="item" :label="item.name" :value="item.name" />
-                </el-select>
-              </div>
+              <el-select class="w-[95px] mx-2" clearable v-model="row.symbol">
+                <el-option v-for="item in units" :key="item" :label="item.name" :value="item.name" />
+              </el-select>
               <span class="ml-2 whitespace-nowrap">{{ tdNames[row.ruleId] }}</span>
               <template v-if="row.ruleId === 350">
-                <div class="w-[95px]">
-                  <el-select class="mx-2" clearable v-model="row.symbol1">
-                    <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
-                  </el-select>
-                </div>
+                <el-select class="w-[95px] mx-2" clearable v-model="row.symbol1">
+                  <el-option v-for="item in symbols" :key="item" :label="item.name" :value="item.name" />
+                </el-select>
                 <el-input class="w-[80px]" placeholder="请输入" v-model="row.num1"></el-input>
                 <span class="ml-2 whitespace-nowrap">。</span>
               </template>
diff --git a/src/views/product/strategy/153/Detail.vue b/src/views/product/strategy/153/Detail.vue
index 350663f..239c653 100644
--- a/src/views/product/strategy/153/Detail.vue
+++ b/src/views/product/strategy/153/Detail.vue
@@ -17,7 +17,7 @@
             </el-radio-group>
           </template>
         </el-table-column>
-        <el-table-column label="进黑名单条件" width="330" align="center">
+        <el-table-column label="进黑名单条件" width="450" align="center">
           <template #default="{ row }">
             <div class="flex items-center">
               <span v-if="row.recordChildren" class="whitespace-nowrap">{{ row?.recordChildren[1]?.recordChildren[0]?.name }}：认定{{ row.name }}</span>
@@ -46,7 +46,7 @@
             </el-radio-group>
           </template>
         </el-table-column>
-        <el-table-column label="出黑名单条件" width="380" align="center">
+        <el-table-column label="出黑名单条件" width="450" align="center">
           <template #default="{ row }">
             <div class="flex items-center">
               <span v-if="row.recordChildren" class="whitespace-nowrap">{{ row?.recordChildren[1]?.recordChildren[0]?.name }}：结清后，</span>
diff --git a/src/views/product/strategy/155/Detail.vue b/src/views/product/strategy/155/Detail.vue
index ab644ac..b7ccd50 100644
--- a/src/views/product/strategy/155/Detail.vue
+++ b/src/views/product/strategy/155/Detail.vue
@@ -53,11 +53,9 @@
               </template>
               <template v-else-if="row.stRecordId === 385">
                 <span class="whitespace-nowrap">命中：</span>
-                <div class="flex-1">
-                  <el-select v-if="row.recordChildren" clearable v-model="row.select">
-                    <el-option v-for="item in row?.recordChildren[0]?.subject?.itemList" :key="item" :value="item.options" />
-                  </el-select>
-                </div>
+                <el-select v-if="row.recordChildren" class="w-[300px]" clearable v-model="row.select">
+                  <el-option v-for="item in row?.recordChildren[0]?.subject?.itemList" :key="item" :value="item.options" />
+                </el-select>
               </template>
               <template v-else-if="$index > 13 && $index < 19">
                 <span class="whitespace-nowrap">关联人数</span>
diff --git a/src/views/product/strategy/Risk1.vue b/src/views/product/strategy/Risk1.vue
index d141401..20f7471 100644
--- a/src/views/product/strategy/Risk1.vue
+++ b/src/views/product/strategy/Risk1.vue
@@ -53,7 +53,7 @@ const getConfig = async () => {
   const result = [];
   process.forEach((e, i) => {
     e.recordChildren[0]?.recordChildren?.forEach((n, j) => {
-      const cur = info.value.length ? info.value[i ? 10 + j : j] : {};
+      const cur = info.value.length ? info.value[i ? 5 + j : j] : {};
       result.push({
         ...getIds(),
         coefficient: cur?.coefficient || '',