Skip to content

D
dsk-cr20g
Commit 337aa807 authored by zhangyi's avatar zhangyi
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 955b9af0 73d93455
Hide whitespace changes
Inline Side-by-side
Showing with 250 additions and 68 deletions
dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java
View file @ 337aa807
......@@ -83,7 +83,7 @@ public class CustomerController extends BaseController {
return AjaxResult.success(baseService.add(customer));
}
private void dealWithcustomerData(Customer customer){
private void dealWithcustomerData(Customer customer) {
if (ObjectUtils.isEmpty(customer.getCompanyName())) throw new BeanException("企业名称不能为空");
if (ObjectUtils.isEmpty(customer.getCompanyId())) {
try {
......@@ -131,6 +131,7 @@ public class CustomerController extends BaseController {
public AjaxResult importData(@RequestPart("file") MultipartFile file) throws Exception {
List<Customer> customerList = new ExcelUtil<>(Customer.class).importExcel(file.getInputStream(), 2);
List<String> resultList = new ArrayList<>();
int successCount = 0;
for (Customer customer : customerList) {
if (ObjectUtils.isEmpty(customer.getCompanyName())) {
continue;
......@@ -152,10 +153,13 @@ public class CustomerController extends BaseController {
customer.setCreditCode(MapUtil.getStr(obj, "creditCode"));
}
baseService.add(customer);
successCount++;
} catch (Exception e) {
resultList.add(customer.getCompanyName().concat(":").concat(e.getMessage()));
}
}
return AjaxResult.success(resultList);
AjaxResult success = AjaxResult.success(resultList);
success.put("successCount", successCount);
return success;
}
}
dsk-operate-ui/src/api/enterpriseData/enterpriseData.js
View file @ 337aa807
......@@ -42,6 +42,15 @@ let uipSerach= function uipSerach(param) {
data: param
})
}
// 认领用户
let claim= function claim(param) {
return request({
url: '/customer/claim',
method: 'post',
data: param
})
}
export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach}
\ No newline at end of file
export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim}
\ No newline at end of file
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ 337aa807
......@@ -138,257 +138,296 @@
</div>
</div>
<div class=" table-item-jf">
<div class=" table-item-jf table-item-jf1"v-if="tableData.length==0">
<div class="item-jf-text">暂无数据！</div>
</div>
<div class=" table-item-jf" v-if="tableData.length>0">
<el-table :data="tableData" :header-cell-style="{ background:'#F0F3FA'}" element-loading-text="Loading" border highlight-current-row>
<el-table-column label="序号" width="60">
<template slot-scope="scope">
1
</template>
<el-table-column type="index" label="序号" width="60">
<template slot-scope="scope">
<span>{{(pageNum - 1) *10 + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="公司名称" width="430" >
<template slot-scope="scope">
<router-link :to="'/radar/bxprozbgg/details/'+ 1" tag="a" class="list-titel-a" >绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)</router-link>
</template>
<div class="renling">
<router-link :to="'/radar/bxprozbgg/details/'+ 1" tag="a" class="list-titel-a" >{{scope.row.companyName}}</router-link>
<div class="renling-btn">
<img src="@/assets/images/owner/renling1.png" alt="">
<span v-if="scope.row.claimStatus" class="renling-hui">
已认领
</span>
<span v-else class="renling-hei" @click="claimbtn(scope.row)" >
认领
</span>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="区域" width="60" >
<el-table-column label="区域" width="120">
<template slot-scope="scope">
<router-link :to="'/radar/bxprozbgg/details/'+ 1" tag="a" class="list-titel-a" >
{{scope.row.province}}
<template v-if="scope.row.city">
-
</template>
{{scope.row.city}}
<template v-if="scope.row.area">
-
</template>
{{scope.row.area}}
</router-link>
</template>
</el-table-column>
<el-table-column label="招标数量" width="72" >
<template slot-scope="scope">
--
{{scope.row.biddingCount||"--"}}
</template>
</el-table-column>
<el-table-column label="城投拿地" width="72" >
<template slot-scope="scope">
28
{{scope.row.landInfoCount||"--"}}
</template>
</el-table-column>
<el-table-column label="供应商" width="72" >
<template slot-scope="scope">
28
{{scope.row.supplierCount||"--"}}
</template>
</el-table-column>
<el-table-column label="主体评级" width="72" >
<template slot-scope="scope">
28
{{scope.row.bratingSubjectLevel||"--"}}
</template>
</el-table-column>
<el-table-column label="债券余额（亿元）" width="124" >
<template slot-scope="scope">
28
{{scope.row.bondBalance||"--"}}
</template>
</el-table-column>
<el-table-column label="行政级别" width="72" >
<template slot-scope="scope">
28
{{scope.row.uipExecutiveLevel||"--"}}
</template>
</el-table-column>
<el-table-column label="股东背景" width="84" >
<template slot-scope="scope">
28
{{scope.row.shareholderBg||"--"}}
</template>
</el-table-column>
<el-table-column label="股权关系" width="84" >
<template slot-scope="scope">
28
{{scope.row.equityRelationship||"--"}}
</template>
</el-table-column>
<el-table-column label="平台重要性" width="84" >
<template slot-scope="scope">
28
{{scope.row.platformImportance||"--"}}
</template>
</el-table-column>
<el-table-column label="城投业务类型" width="94" >
<template slot-scope="scope">
28
{{scope.row.uipBusinessType||"--"}}
</template>
</el-table-column>
<el-table-column label="实控人" width="290" >
<template slot-scope="scope">
28
<router-link v-if="scope.row.actualController" :to="'/radar/bxprozbgg/details/'+ 1" tag="a" class="list-titel-a" >
{{scope.row.actualController}}
</router-link>
<template v-else>
{{scope.row.actualController||"--"}}
</template>
</template>
</el-table-column>
<el-table-column label="最新报告期" width="92" >
<template slot-scope="scope">
2021-12-13
{{scope.row.latestReportPeriod||"--"}}
</template>
</el-table-column>
<el-table-column label="总资产（亿元）" width="112" >
<template slot-scope="scope">
2021-12-13
{{scope.row.totalAssets||"--"}}
</template>
</el-table-column>
<el-table-column label="归母净资产（亿元）" width="132" >
<template slot-scope="scope">
2021-12-13
</template>
<template slot-scope="scope">
{{scope.row.belongNetAssets||"--"}}
</template>
</el-table-column>
<el-table-column label="货币资金（亿元）" width="120" >
<template slot-scope="scope">
2021-12-13
{{scope.row.monetaryFunds||"--"}}
</template>
</el-table-column>
<el-table-column label="土地资产（亿元）" width="120" >
<template slot-scope="scope">
2021-12-13
{{scope.row.landAssets||"--"}}
</template>
</el-table-column>
<el-table-column label="受限资产（亿元）" width="120" >
<template slot-scope="scope">
2021-12-13
{{scope.row.restrictedAssets||"--"}}
</template>
</el-table-column>
<el-table-column label="应收账款（亿元）" width="120" >
<template slot-scope="scope">
2021-12-13
{{scope.row.accountsReceivable||"--"}}
</template>
</el-table-column>
<el-table-column label="公益性&准公益性主营占比" width="168" >
<template slot-scope="scope">
2021-12-13
{{scope.row.econData_001||"--"}}
</template>
</el-table-column>
<el-table-column label="政府补助（亿元）" width="120" >
<template slot-scope="scope">
2021-12-13
{{scope.row.govSubsidy||"--"}}
</template>
</el-table-column>
<el-table-column label="专项应付款（亿元）" width="132" >
<template slot-scope="scope">
2021-12-13
{{scope.row.specialPayable||"--"}}
</template>
</el-table-column>
<el-table-column label="营业收入（亿元）" width="120" >
<template slot-scope="scope">
2021-12-13
{{scope.row.operatingIncome||"--"}}
</template>
</el-table-column>
<el-table-column label="归母净利润（亿元）" width="132" >
<template slot-scope="scope">
2021-12-13
{{scope.row.belongNetProfit||"--"}}
</template>
</el-table-column>
<el-table-column label="净资产收益率" width="96" >
<template slot-scope="scope">
2021-12-13
{{scope.row.roe||"--"}}
</template>
</el-table-column>
<el-table-column label="经营现金流量净额（亿元）" width="168" >
<template slot-scope="scope">
2021-12-13
{{scope.row.netOperatingCashFlow||"--"}}
</template>
</el-table-column>
<el-table-column label="筹资现金流量净额（亿元）" width="168" >
<template slot-scope="scope">
2021-12-13
</template>
<template slot-scope="scope">
{{scope.row.netFinancingCashFlow||"--"}}
</template>
</el-table-column>
<el-table-column label="投资现金流量净额（亿元）" width="168" >
<template slot-scope="scope">
2021-12-13
{{scope.row.netInvestmentCashFlow||"--"}}
</template>
</el-table-column>
<el-table-column label="总负债 （亿元）" width="112" >
<template slot-scope="scope">
2021-12-13
{{scope.row.totalLiabilities||"--"}}
</template>
</el-table-column>
<el-table-column label="有息债务 （亿元）" width="124" >
<template slot-scope="scope">
2021-12-13
{{scope.row.uipInterestBearingDebt||"--"}}
</template>
</el-table-column>
<el-table-column label="有息债务/总负债" width="114" >
<template slot-scope="scope">
2021-12-13
{{scope.row.econData_002||"--"}}
</template>
</el-table-column>
<el-table-column label="综合融资成本" width="96" >
<template slot-scope="scope">
2021-12-13
{{scope.row.ofcb||"--"}}
</template>
</el-table-column>
<el-table-column label="现金比率" width="72" >
<template slot-scope="scope">
2021-12-13
{{scope.row.cashRatio||"--"}}
</template>
</el-table-column>
<el-table-column label="现金流量比率" width="96" >
<template slot-scope="scope">
2021-12-13
{{scope.row.cashFlowRatio||"--"}}
</template>
</el-table-column>
<el-table-column label="现金到期债务比" width="112" >
<template slot-scope="scope">
{{scope.row.cashDebtRatio||"--"}}
</template>
</el-table-column>
<el-table-column label="授信余额（亿元）" width="124" >
<template slot-scope="scope">
2021-12-13
{{scope.row.creditBalance||"--"}}
</template>
</el-table-column>
<el-table-column label="授信余额/全部债务" width="126" >
<template slot-scope="scope">
2021-12-13
{{scope.row.econData_003||"--"}}
</template>
</el-table-column>
<el-table-column label="EBITDA保障倍数" width="116" >
<template slot-scope="scope">
2021-12-13
{{scope.row.ebitdaIcr||"--"}}
</template>
</el-table-column>
<el-table-column label="私募债余额占比" width="108" >
<template slot-scope="scope">
2021-12-13
{{scope.row.ppnBalanceProp||"--"}}
</template>
</el-table-column>
<el-table-column label="一年内到期债权占比" width="132" >
<template slot-scope="scope">
2021-12-13
{{scope.row.econData_004||"--"}}
</template>
</el-table-column>
<el-table-column label="债券余额/有息债务" width="132" >
<template slot-scope="scope">
2021-12-13
{{scope.row.econData_005||"--"}}
</template>
</el-table-column>
<el-table-column label="借款余额（亿元）" width="124" >
<template slot-scope="scope">
2021-12-13
{{scope.row.loan||"--"}}
</template>
</el-table-column>
<el-table-column label="借款/有息债务" width="102" >
<template slot-scope="scope">
2021-12-13
{{scope.row.econData_006||"--"}}
</template>
</el-table-column>
<el-table-column label="非标余额（亿元）" width="124" >
<template slot-scope="scope">
2021-12-13
{{scope.row.nonStandardBalance||"--"}}
</template>
</el-table-column>
<el-table-column label="非标余额/有息债务" width="132" >
<template slot-scope="scope">
2021-12-13
{{scope.row.nonStandardRatio||"--"}}
</template>
</el-table-column>
<el-table-column label="对外担保金额（亿元）" width="144" >
<template slot-scope="scope">
2021-12-13
{{scope.row.guaranteeAmount||"--"}}
</template>
</el-table-column>
<el-table-column label="对外担保比例" width="96" >
<template slot-scope="scope">
2021-12-13
{{scope.row.guaranteeAmount||"--"}}
</template>
</el-table-column>
<el-table-column label="所属开发区" width="84" >
<template slot-scope="scope">
2021-12-13
{{scope.row.developmentZone||"--"}}
</template>
</el-table-column>
<el-table-column label="开发区类别" width="84" >
<template slot-scope="scope">
2021-12-13
{{scope.row.developmentZone||"--"}}
</template>
</el-table-column>
</el-table>
......@@ -405,6 +444,19 @@
</div>
</div>
<el-dialog
title=""
:visible.sync="dialogVisible"
:modal="false"
custom-class='dialog-renlin'
:show-close="false"
width="244px">
<span>认领成功，是否完善客户信息？</span>
<div slot="footer" class="dialog-footer">
<span class="dialog-footer-btn1" type="primary" @click="renlin()">立即完善</span>
<span class="dialog-footer-btn2" @click="search(pageNum, pageSize)">稍后</span>
</div>
</el-dialog>
</div>
</template>
......@@ -480,9 +532,10 @@ export default {
},
],
dialogVisible: false,
tableData:[],
total:6000,
total:0,
pageNum:1,
pageSize:20
};
......@@ -720,7 +773,33 @@ export default {
this.pageFlag = true;
});
},
claimbtn(item){
var params={
companyId:item.companyId,
uipId:item.uipId,
companyName:item.companyName,
// creditLevel:item.bratingSubjectLevel,
// legalPerson:item.legalPerson,
// registerCapital:item.registerCapital,
// provinceId:item.provinceId,
// cityId:item.cityId,
// districtId:item.districtId,
// registerAddress:item.registerAddress,
// creditCode:item.creditCode,
}
api.claim(params).then(res=>{
// console.log(res)
if (res.code==200) {
this.dialogVisible=true;
}
}).catch(error=>{
});
},
search(pageNum, pageSize,exportFlag) {
this.dialogVisible=false;
if (!pageNum) {
this.pageNum = 1;
}
......@@ -783,9 +862,10 @@ export default {
delete params.equityRelationship
}
api.uipSerach(params).then(res=>{
console.log(res)
// console.log(res)
if (res.code==200) {
// 行政等级
this.tableData=res.rows;
this.total=res.total;
}
}).catch(error=>{
......@@ -793,12 +873,59 @@ export default {
});
},
renlin(){
this.dialogVisible=false;
// 跳转地址
},
},
};
</script>
<style lang="scss" scoped>
::v-deep .dialog-renlin{
margin-top:40vh !important;
.el-dialog__body{
padding: 0;
text-align: center;
padding-bottom: 24px;
}
.el-dialog__footer{
padding: 0px;
padding-bottom: 24px;
.dialog-footer{
display: inline-flex;
align-items: center;
justify-content: center;
width: 100%;
.dialog-footer-btn1{
cursor: pointer;
width: 72px;
height: 28px;
background: #0081FF;
border-radius: 2px 2px 2px 2px;
font-size: 12px;
font-weight: 400;
color: #FFFFFF;
line-height: 28px;
text-align: center;
margin-right: 8px;
}
.dialog-footer-btn2{
cursor: pointer;
width: 72px;
height: 28px;
border-radius: 2px 2px 2px 2px;
border: 1px solid #CCCCCC;
line-height: 28px;
text-align: center;
font-size: 12px;
font-weight: 400;
color: rgba(35,35,35,0.8);
}
}
}
}
.content{
padding: 0px 16px;
border-radius: 4px 4px 4px 4px;
......@@ -1079,12 +1206,54 @@ export default {
::v-deep .el-table--border .el-table__cell{
border-right:1px solid #E6EAF1;
}
.item-jf-text{
width: 100%;
text-align: center;
padding: 56px 0px;
font-size: 18px;
font-weight: 400;
color: rgba(35,35,35,0.8);
}
.renling{
display: flex;
align-items: center;
.list-titel-a{
width: 264px;
margin-right: 12px;
}
.renling-btn{
display: flex;
align-items: center;
img{
width: 16px;
height: 16px;
margin-right: 8px;
}
.renling-hui{
font-size: 12px;
font-weight: 400;
color: rgba(35,35,35,0.4);
}
.renling-hei{
cursor: pointer;
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
}
.renling-hei:hover{
color: #0081FF;
}
}
}
}
.table-item-jf1{
border-top:1px solid #EFEFEF;
}
.pagination{
padding: 14px ;
.el-pagination{
float: right;
float: right ;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment