From 11d24d2f2c09ee991d4e15af2eb7b1982d5011de Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 15:37:21 +0800
Subject: [PATCH 1/9] BUG 30961

---
 project/xiushan/apps/finance/AppLoanAudit/loanSta.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue b/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
index 54cfb18a..cdd3c61c 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
@@ -228,7 +228,7 @@ export default {
       })
     },
     formatValue(v) {
-      return typeof v == "number" ? (v?.toFixed(1) || v) : v
+      return v?.toString()?.replace(/(\.\d).*/g,'$1') || v
     }
   },
   created() {

From d8db5ef7bbbf3db8156640cebf8aba7a83465d6b Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 15:39:17 +0800
Subject: [PATCH 2/9] BUG 30961

---
 project/xiushan/apps/finance/AppLoanAudit/loanSta.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue b/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
index cdd3c61c..4af2b000 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
@@ -228,7 +228,7 @@ export default {
       })
     },
     formatValue(v) {
-      return v?.toString()?.replace(/(\.\d).*/g,'$1') || v
+      return isNaN(v) ? v : (Number(v)?.toFixed(1) || v)
     }
   },
   created() {

From 2650c69ff7ff21f2dd701f0b52ab804cad0628dc Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 15:40:57 +0800
Subject: [PATCH 3/9] BUG 30969

---
 .../xiushan/apps/finance/AppGuaranteeProduct/productList.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
index b6045cd2..998a7904 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
@@ -64,7 +64,7 @@ export default {
   },
   data() {
     return {
-      search: {productName: ""},
+      search: {productName: "", queryType: 1},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       colConfigs: [

From 07c7c267aaec4baaa9382b674183fcfa18fdfe72 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 15:45:28 +0800
Subject: [PATCH 4/9] BUG 30968

---
 .../apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue  | 2 +-
 .../apps/finance/AppGuaranteeProduct/productDetail.vue        | 4 ++--
 .../xiushan/apps/finance/AppGuaranteeProduct/productList.vue  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue
index 7acd89a8..d31f68ab 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue
@@ -28,7 +28,7 @@ export default {
     }
   },
   created() {
-    this.dict.load("productGuaranteeMode", "productRepaymentMethod", "productRepaymentTimeline", "productStatus", "productFaceUser",
+    this.dict.load("productGuaranteeMode", "productRepaymentMethod", "productRepaymentTimeline", "productStatus2", "productFaceUser",
         "enterpriseAuditStatus", "yesOrNo", "financialOrganizationType", "financialProductChannels")
   }
 }
diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
index 47b60d53..ef9310c7 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
@@ -12,7 +12,7 @@
             <template #content>
               <el-row type="flex" class="flexWrap">
                 <el-form-item class="half" label="产品名称">{{ detail.productName }}</el-form-item>
-                <el-form-item class="half" label="状态">{{ dict.getLabel('productStatus', detail.status) }}</el-form-item>
+                <el-form-item class="half" label="状态">{{ dict.getLabel('productStatus2', detail.status) }}</el-form-item>
               </el-row>
               <el-form-item label="产品简介">{{ detail.productFeatures }}</el-form-item>
               <el-row type="flex" class="flexWrap">
@@ -31,7 +31,7 @@
             <template #content>
               <el-row type="flex" class="flexWrap">
                 <el-form-item class="half" label="审核结果">
-                  {{ dict.getLabel("productStatus", detail.status) }}
+                  {{ dict.getLabel("productStatus2", detail.status) }}
                 </el-form-item>
                 <el-form-item class="half" label="审核人">{{ detail.auditUserName }}</el-form-item>
                 <el-form-item class="half" label="审核时间">{{ detail.auditTime }}</el-form-item>
diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
index 998a7904..f7c5059b 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
@@ -72,7 +72,7 @@ export default {
         {label: "客户经理", prop: "bankCounterpart", align: "center"},
         {label: "联系方式", prop: "consultationTelephone"},
         {label: "操作人", prop: "createUserName", align: "center"},
-        {label: "状态", prop: "status", dict: "productStatus", align: "center"},
+        {label: "状态", prop: "status", dict: "productStatus2", align: "center"},
         {label: "热门推荐", slot: "hot"},
         {slot: "options"}
       ]

From 831faf4a34dfafc5ce96ade428dd62b01047e986 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 15:47:47 +0800
Subject: [PATCH 5/9] BUG 30968

---
 .../apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue  | 2 +-
 .../apps/finance/AppGuaranteeProduct/productDetail.vue        | 4 ++--
 .../xiushan/apps/finance/AppGuaranteeProduct/productList.vue  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue
index d31f68ab..7acd89a8 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue
@@ -28,7 +28,7 @@ export default {
     }
   },
   created() {
-    this.dict.load("productGuaranteeMode", "productRepaymentMethod", "productRepaymentTimeline", "productStatus2", "productFaceUser",
+    this.dict.load("productGuaranteeMode", "productRepaymentMethod", "productRepaymentTimeline", "productStatus", "productFaceUser",
         "enterpriseAuditStatus", "yesOrNo", "financialOrganizationType", "financialProductChannels")
   }
 }
diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
index ef9310c7..47b60d53 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
@@ -12,7 +12,7 @@
             <template #content>
               <el-row type="flex" class="flexWrap">
                 <el-form-item class="half" label="产品名称">{{ detail.productName }}</el-form-item>
-                <el-form-item class="half" label="状态">{{ dict.getLabel('productStatus2', detail.status) }}</el-form-item>
+                <el-form-item class="half" label="状态">{{ dict.getLabel('productStatus', detail.status) }}</el-form-item>
               </el-row>
               <el-form-item label="产品简介">{{ detail.productFeatures }}</el-form-item>
               <el-row type="flex" class="flexWrap">
@@ -31,7 +31,7 @@
             <template #content>
               <el-row type="flex" class="flexWrap">
                 <el-form-item class="half" label="审核结果">
-                  {{ dict.getLabel("productStatus2", detail.status) }}
+                  {{ dict.getLabel("productStatus", detail.status) }}
                 </el-form-item>
                 <el-form-item class="half" label="审核人">{{ detail.auditUserName }}</el-form-item>
                 <el-form-item class="half" label="审核时间">{{ detail.auditTime }}</el-form-item>
diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
index f7c5059b..998a7904 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
@@ -72,7 +72,7 @@ export default {
         {label: "客户经理", prop: "bankCounterpart", align: "center"},
         {label: "联系方式", prop: "consultationTelephone"},
         {label: "操作人", prop: "createUserName", align: "center"},
-        {label: "状态", prop: "status", dict: "productStatus2", align: "center"},
+        {label: "状态", prop: "status", dict: "productStatus", align: "center"},
         {label: "热门推荐", slot: "hot"},
         {slot: "options"}
       ]

From e1bc2c9c2e56661792acf04dc88e2503c0f413b8 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 15:54:03 +0800
Subject: [PATCH 6/9] BUG 30967

---
 project/xiushan/apps/finance/AppLoanAudit/loanList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
index ec7dc38a..2a7ce781 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
@@ -37,7 +37,7 @@
                       </ai-wrapper>
                     </template>
                   </el-table-column>
-                  <el-table-column slot="options" label="操作" fixed="right" align="center">
+                  <el-table-column slot="options" label="操作" align="center">
                     <template slot-scope="{row}">
                       <el-button type="text" @click="showDetail(row.id)">详情</el-button>
                     </template>

From 8bebe9f6618209bf391d538119d9138667edb375 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 16:00:44 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/xiushan/apps/finance/AppLoanAudit/AppLoanAudit.vue | 2 +-
 project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue   | 1 -
 project/xiushan/apps/finance/AppLoanAudit/loanList.vue     | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/project/xiushan/apps/finance/AppLoanAudit/AppLoanAudit.vue b/project/xiushan/apps/finance/AppLoanAudit/AppLoanAudit.vue
index 3f19d859..42f895e8 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/AppLoanAudit.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/AppLoanAudit.vue
@@ -24,7 +24,7 @@ export default {
     }
   },
   created() {
-    this.dict.load("productRepaymentTimeline", "financialFundPurpose", "enterpriseAuditStatus", "financialLoanApplyStatus","financialOrganizationType")
+    this.dict.load("productRepaymentTimeline", "financialFundPurpose", "enterpriseAuditStatus", "financialLoanApplyStatus", "financialOrganizationType", "auditStatus")
   }
 }
 </script>
diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
index 37d5190b..03ea5b3f 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
@@ -244,7 +244,6 @@ export default {
     }
   },
   created() {
-    this.dict.load("auditStatus", "productRepaymentTimeline", "financialFundPurpose", "enterpriseAuditStatus", "financialLoanApplyStatus", "financialOrganizationType")
     this.getDetail()
   }
 }
diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
index 2a7ce781..2e8005d3 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
@@ -140,7 +140,6 @@ export default {
     }
   },
   created() {
-    this.$dict.load('financialLoanApplyStatus')
     this.search.status = this.$route.query.status || "0"
     this.getTableData()
   }

From afa698cf7252f4214daacdf370accc4a65c31a8c Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 16:04:42 +0800
Subject: [PATCH 8/9] BUG 30970

---
 .../finance/AppLoanAudit/AppLoanAudit.vue     |  2 +-
 .../apps/finance/AppLoanAudit/loanDetail.vue  | 26 ++++++++-----------
 .../apps/finance/AppLoanAudit/loanList.vue    |  4 +--
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/project/xiushan/apps/finance/AppLoanAudit/AppLoanAudit.vue b/project/xiushan/apps/finance/AppLoanAudit/AppLoanAudit.vue
index 42f895e8..3b938fe8 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/AppLoanAudit.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/AppLoanAudit.vue
@@ -24,7 +24,7 @@ export default {
     }
   },
   created() {
-    this.dict.load("productRepaymentTimeline", "financialFundPurpose", "enterpriseAuditStatus", "financialLoanApplyStatus", "financialOrganizationType", "auditStatus")
+    this.dict.load("productRepaymentTimeline", "financialFundPurpose", "enterpriseAuditStatus", "financialLoanApplyStatus2", "financialOrganizationType", "auditStatus")
   }
 }
 </script>
diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
index 03ea5b3f..10a164eb 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
@@ -11,17 +11,15 @@
           <template v-if="isGuaranteeProduct">
             <ai-card title="担保贷款申请">
               <template #content>
+                <el-form-item label="产品名称">
+                  <el-row type="flex">
+                    {{ detail.productName }}
+                    <el-link class="mar-l10" type="primary" @click="$router.push({name:'27338cb83e77461dbd44356a6760df84',query:{id:detail.productId}})">
+                      产品详情
+                    </el-link>
+                  </el-row>
+                </el-form-item>
                 <el-row type="flex" class="flexWrap">
-                  <el-form-item label="产品名称">
-                    <el-row type="flex">
-                      {{ detail.productName }}
-                      <el-link type="primary"
-                               @click="$router.push({name:'27338cb83e77461dbd44356a6760df84',query:{id:detail.productId}})">
-                        产品详情
-                      </el-link>
-                    </el-row>
-                  </el-form-item>
-                  <el-form-item label="担保机构">{{ detail.organizationName }}</el-form-item>
                   <el-form-item label="企业主体" v-if="detail.enterpriseId">
                     <el-row type="flex">
                       {{ detail.enterpriseName }}
@@ -42,9 +40,7 @@
                   <el-form-item label="联系方式">{{ detail.phone }}</el-form-item>
                   <el-form-item label="申请时间">{{ detail.createTime }}</el-form-item>
                 </el-row>
-                <el-row>
-                  <el-form-item label="备注">{{ detail.remark }}</el-form-item>
-                </el-row>
+                <el-form-item label="备注">{{ detail.remark }}</el-form-item>
                 <el-form-item label="身份证">
                   <el-image class="thumb" :src="detail.idCardFrontFile.url" :preview-src-list="[detail.idCardFrontFile.url]"/>
                   <el-image class="thumb mar-l16" :src="detail.idCardbackFile.url" :preview-src-list="[detail.idCardbackFile.url]"/>
@@ -57,7 +53,7 @@
             <ai-card title="办理结果" v-if="!isAuthing">
               <template #content>
                 <el-row type="flex" class="flexWrap">
-                  <el-form-item label="审核进度">{{ dict.getLabel('financialLoanApplyStatus', detail.status) }}</el-form-item>
+                  <el-form-item label="审核进度">{{ dict.getLabel('financialLoanApplyStatus2', detail.status) }}</el-form-item>
                   <el-form-item label="担保机构">{{ detail.organizationName }}</el-form-item>
                   <el-form-item label="客户经理">{{ detail.auditUserName }}</el-form-item>
                   <el-form-item label="联系方式 ">{{ detail.auditPhone }}</el-form-item>
@@ -118,7 +114,7 @@
             <ai-card title="办理结果" v-if="!isAuthing">
               <template #content>
                 <el-row type="flex" class="flexWrap">
-                  <el-form-item label="贷款进度">{{ dict.getLabel('financialLoanApplyStatus', detail.status) }}</el-form-item>
+                  <el-form-item label="贷款进度">{{ dict.getLabel('financialLoanApplyStatus2', detail.status) }}</el-form-item>
                   <el-form-item label="贷款银行">{{ detail.organizationName }}</el-form-item>
                   <el-form-item label="贷款经理">{{ detail.auditUserName }}</el-form-item>
                   <el-form-item label="联系方式 ">{{ detail.auditPhone }}</el-form-item>
diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
index 2e8005d3..49003d76 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
@@ -11,7 +11,7 @@
                   <template #left>
                     <ai-select placeholder="机构类型" :selectList="dict.getDict('financialOrganizationType')"
                                v-model="search.organizationType" @change="page.current=1,getTableData()"/>
-                    <ai-select placeholder="审批状态" :selectList="dict.getDict('financialLoanApplyStatus')"
+                    <ai-select placeholder="审批状态" :selectList="dict.getDict('financialLoanApplyStatus2')"
                                v-model="search.status" @change="page.current=1,getTableData()"/>
                     <ai-search label="申请时间">
                       <el-date-picker size="small" v-model="search.applyTime" type="daterange"
@@ -89,7 +89,7 @@ export default {
         {label: "申请时间", prop: "createTime", width: 160},
         {label: "联系人", prop: "name"},
         {label: "联系方式", prop: "phone"},
-        {label: "状态", prop: "status", align: "center", dict: "financialLoanApplyStatus"},
+        {label: "状态", prop: "status", align: "center", dict: "financialLoanApplyStatus2"},
         {slot: "options"}
       ]
     }

From b42d755e9b96edd42063868602d0da6882297027 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 16:57:42 +0800
Subject: [PATCH 9/9] BUG 30974

---
 project/xiushan/apps/creditScore/scorePersonal/detail.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/xiushan/apps/creditScore/scorePersonal/detail.vue b/project/xiushan/apps/creditScore/scorePersonal/detail.vue
index 0e01af4c..65f97dfe 100644
--- a/project/xiushan/apps/creditScore/scorePersonal/detail.vue
+++ b/project/xiushan/apps/creditScore/scorePersonal/detail.vue
@@ -95,6 +95,7 @@ export default {
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data.records
+          this.page.total = res.data.total
         }
       })
     }