Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

project/xiushan/apps/creditScore/scorePersonal/detail.vue

@@ -11,7 +11,7 @@
         </div>
         <div class="detail-info__item">
           <h2>获取积分</h2>
-          <span style="color: #2266FF;">{{ info.personalIntegral || 0 }}</span>
+          <span style="color: #2266FF;">{{ (info.personalIntegral + info.personalUsedIntegral) || 0 }}</span>
         </div>
         <div class="detail-info__item">
           <h2>已用积分</h2>

project/xiushan/apps/creditScore/scorePersonal/spList.vue

@@ -87,9 +87,10 @@ export default {
           label: '用户账号',
         },
         {
-          prop: 'personalIntegral',
+          // prop: 'personalIntegral',
           align: 'center',
           label: '获取积分',
+          render: (h, {row}) => h('span',null, row.personalIntegral + row.personalUsedIntegral)
         },
         {
           prop: 'personalUsedIntegral',
@@ -97,9 +98,10 @@ export default {
           label: '已用积分',
         },
         {
+          prop: 'personalIntegral',
           align: 'center',
           label: '剩余积分',
-          render: (h, {row}) => h('span', null, row.personalIntegral - row.personalUsedIntegral)
+          // render: (h, {row}) => h('span', null, row.personalIntegral - row.personalUsedIntegral)
         }
       ]
     },

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('financialLoanApplySearchStatus')"
                                v-model="search.status" @change="page.current=1,getTableData()"/>
                     <ai-search label="申请时间">
                       <el-date-picker size="small" v-model="search.applyTime" type="daterange"
@@ -69,22 +69,24 @@ export default {
         {label: "申请时间", prop: "createTime", width: 160},
         {label: "贷款机构", prop: "organizationName"},
         {label: "机构类型", prop: "organizationType", dict: "financialOrganizationType"},
-        {label: "状态", prop: "status", align: "center", dict: "financialLoanApplyStatus"},
+        {label: "状态", prop: "status", align: "center", dict: "financialLoanApplySearchStatus"},
         {slot: "options"}
       ]
     }
   },
   data() {
     return {
-      search: {name: ""},
+      search: {search: ""},
       page: {current: 1, size: 10, total: 0},
-      tableData: []
+      tableData: [],
+      // status: ''
     }
   },
   methods: {
     getTableData() {
+      let status = this.search.status || 999
       this.instance.post("/appfinancialloanapply/list", null, {
-        params: {...this.page, ...this.search}
+        params: {...this.page, ...this.search, status}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data?.records
@@ -103,6 +105,7 @@ export default {
     },
   },
   created() {
+    this.dict.load('financialLoanApplySearchStatus')
     this.getTableData()
   }
 }

project/xiushan/apps/finance/AppLoanAudit/loanSta.vue

@@ -24,13 +24,18 @@
                 <h2 v-text="overviews['累计申请笔数(笔)']"/>
                 <p>总数</p>
               </div>
-              <ai-echart :ops="circleEchart" :data="[{name:'企业融资',value:overviews['累计申请笔数(笔)']}]"/>
+              <ai-echart :ops="circleEchart" :data="[{name:'企业融资',value:applyInfo['企业融资']}, {name:'个人融资',value:applyInfo['个人贷款']}]"/>
             </div>
             <div class="cir-text">
               <el-row type="flex" justify="space-between" align="middle" class="info">
                 <span class="tips-bg" style="background: #2891FF;"/>
                 <p class="fill">企业融资</p>
-                <div v-text="overviews['累计申请笔数']"/>
+                <div v-text="applyInfo['企业融资']"/>
+              </el-row>
+              <el-row type="flex" justify="space-between" align="middle" class="info">
+                <span class="tips-bg" style="background: #FFB865;"/>
+                <p class="fill">个人融资</p>
+                <div v-text="applyInfo['个人贷款']"/>
               </el-row>
             </div>
           </div>
@@ -172,6 +177,7 @@ export default {
       overviews: [],
       productTop10: [],
       tradeTrend: [],
+      applyInfo: {}
     }
   },
   methods: {
@@ -179,6 +185,16 @@ export default {
       this.getOverviews()
       this.getProductTop10()
       this.getTradeTrend()
+      this.getApply()
+    },
+    getApply() {
+      this.instance.post("/appfinancialloanapply/staticFinancialLoanApplyByMainbody", null, {
+        params: {...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.applyInfo = res.data
+        }
+      })
     },
     getOverviews() {
       this.instance.post("/appfinancialloanapply/staticFinancialLoanApplyByOrganization", null, {

project/xiushan/apps/loanStatement/AppLoanSta.vue

@@ -48,7 +48,7 @@ export default {
   },
   data() {
     return {
-      search: {status: 1},
+      search: {status: ''},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       colConfigs: [
@@ -67,8 +67,9 @@ export default {
   },
   methods: {
     getTableData() {
+      let status = this.search.status || 999
       this.instance.post("/appfinancialloanapply/list", null, {
-        params: {...this.page, ...this.search}
+        params: {...this.page, ...this.search, status}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data?.records

project/xiushan/apps/loanStatement/AppNeedSta.vue

@@ -6,7 +6,7 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <ai-select v-model="search.status" placeholder="状态" :selectList="dict.getDict('financingDemandStatus')"
+            <ai-select v-model="search.status" placeholder="状态" :selectList="dict.getDict('financingDemandSearchStatus')"
                        @change="page.current=1,getTableData()"/>
             <ai-search label="申请时间">
               <el-date-picker size="small" placeholder="请选择" type="daterange"
@@ -29,7 +29,7 @@
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict">
           <el-table-column slot="options" label="状态" fixed="right" width="100" align="center">
             <template slot-scope="{row}">
-              <span :class="`status${row.status}`">{{ dict.getLabel('financingDemandStatus', row.status) }}</span>
+              <span :class="`status${row.status}`">{{ dict.getLabel('financingDemandSearchStatus', row.status) }}</span>
             </template>
           </el-table-column>
         </ai-table>
@@ -54,7 +54,7 @@ export default {
   },
   data() {
     return {
-      search: {status: "1"},
+      search: {status: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       colConfigs: [
@@ -74,7 +74,7 @@ export default {
   },
   methods: {
     getTableData() {
-      let status = this.search.status || 999
+      let status = this.search.status || 888
       this.instance.post("/appfinancingdemand/list", null, {
         params: {...this.page, ...this.search, status}
       }).then(res => {
@@ -92,7 +92,7 @@ export default {
     }
   },
   created() {
-    this.dict.load('financingDemandStatus')
+    this.dict.load('financingDemandSearchStatus')
     this.search.areaId = this.user.info.areaId
     this.getTableData()
   }