Merge branch 'dev' into build

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
         }
       })
     }

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: [

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", "financialLoanApplyStatus2", "financialOrganizationType", "auditStatus")
   }
 }
 </script>

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-form-item label="备注">{{ detail.remark }}</el-form-item>
-                </el-row>
                 <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>
@@ -244,7 +240,6 @@ export default {
     }
   },
   created() {
-    this.dict.load("auditStatus", "productRepaymentTimeline", "financialFundPurpose", "enterpriseAuditStatus", "financialLoanApplyStatus", "financialOrganizationType")
     this.getDetail()
   }
 }

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"
@@ -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>
@@ -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"}
       ]
     }
@@ -140,7 +140,6 @@ export default {
     }
   },
   created() {
-    this.$dict.load('financialLoanApplyStatus')
     this.search.status = this.$route.query.status || "0"
     this.getTableData()
   }

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 isNaN(v) ? v : (Number(v)?.toFixed(1) || v)
     }
   },
   created() {