kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-04-11 14:04:02 +08:00
parent 3dbf097447 def72781e7
commit 58bf9d0050
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/xiushan/apps/AppLandTransfer/components/Add.vue
View File

@@ -251,8 +251,8 @@ export default {
background: #FFF !important; background: #FFF !important;
} }
::v-deep .ai-info-item label { // ::v-deep .ai-info-item label {
width: 130px; // width: 130px;
} // }
} }
</style> </style>

15
project/xiushan/apps/financing/AppGrabLog/needsStatistics.vue
View File

@@ -5,7 +5,7 @@
<ai-area-get :instance="instance" v-model="search.areaId" @change="page.current=1,getTableData()" <ai-area-get :instance="instance" v-model="search.areaId" @change="page.current=1,getTableData()"
:root="user.info.areaId" :clearable="false"/> :root="user.info.areaId" :clearable="false"/>
<ai-select v-model="search.organizationId" placeholder="金融机构" clearable :prop="{label:'organizationName'}" <ai-select v-model="search.organizationId" placeholder="金融机构" clearable :prop="{label:'organizationName'}"
:action='"/appfinancialorganization/list?organizationId="+userOrgId' :action='"/appfinancialorganization/list?id="+userOrgId'
@change="page.current=1,getTableData()" :instance="instance"/> @change="page.current=1,getTableData()" :instance="instance"/>
</template> </template>
</ai-search-bar> </ai-search-bar>
@@ -79,7 +79,7 @@
@getList="getList" :col-configs="colConfigs" :dict="dict" style="padding:0 20px 20px 20px;"> @getList="getList" :col-configs="colConfigs" :dict="dict" style="padding:0 20px 20px 20px;">
<el-table-column slot="options" label="状态" fixed="right" width="100" align="center"> <el-table-column slot="options" label="状态" fixed="right" width="100" align="center">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span :class="`status${row.status}`">{{ $dict.getLabel('financialLoanApplyStatus', row.status) }}</span> <span :class="`status${row.status}`">{{ $dict.getLabel('financingDemandStatus', row.status) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</ai-table> </ai-table>
@@ -335,14 +335,17 @@ export default {
}, },
created() { created() {
this.search.areaId = this.user.info.areaId this.search.areaId = this.user.info.areaId
this.dict.load('financialOrganizationType', 'financialLoanApplyStatus', 'financingDemandStatus')
},
mounted() {
if (this.user.financeUser && this.user.financeUser.id) { //机构 if (this.user.financeUser && this.user.financeUser.id) { //机构
this.search.organizationId = this.user.financeUser.organizationId this.search.organizationId = this.user.financeUser.organizationId
this.userOrgId = this.user.financeUser.organizationId this.userOrgId = this.user.financeUser.organizationId
} }
this.getTableData() this.dict.load('financialOrganizationType', 'financialLoanApplyStatus', 'financingDemandStatus').then(() => {
this.getTableData()
})
},
mounted() {
} }
} }
</script> </script>