Skip to content

D
dsk-cr20g
Commit b975caae authored by caixingbing's avatar caixingbing
Browse files
Options

Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

parents 4fd45f8c 941fa711
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 69 deletions
dsk-operate-ui/src/assets/styles/index.scss
View file @ b975caae
......@@ -344,6 +344,12 @@ ul, li {
background: #F8FBFF;
}
}
tr:hover > td.el-table__cell{
background: #DCEBFF;
}
}
.el-table__body tr.hover-row > td.el-table__cell{
background: #DCEBFF;
}
.el-table__fixed{
tr:nth-child(2n){
......
dsk-operate-ui/src/views/custom/customList/index.vue
View file @ b975caae
......@@ -364,6 +364,7 @@ export default {
},
//获取建设库客户
getCompany(value){
this.queryParam.companyId = null
if (value.length>=2){
let param = {
keyword:value,
......@@ -381,15 +382,21 @@ export default {
}
},
selCompany(item){
console.log(item)
this.queryParam.companyId = item.jskEid
this.queryParam.companyName = item.name.replace(/<[^>]+>/g, '')
this.queryParam.legalPerson = item.legalPerson
this.queryParam.registerCapital = item.registeredCapitalStr
let registeredCapitalStr = ""
if(item.registeredCapitalStr == "0" || item.registeredCapitalStr == 0){
registeredCapitalStr = ''
}else{
registeredCapitalStr = item.registeredCapitalStr
}
this.queryParam.registerCapital = registeredCapitalStr
this.queryParam.creditCode = item.creditCode
this.queryParam.provinceId = item.provinceId
this.queryParam.cityId = item.cityId
this.queryParam.districtId = item.cityId
let list = []
if(item.provinceId != null && item.provinceId != "")
list.push(item.provinceId)
......@@ -403,11 +410,11 @@ export default {
},
//添加客户
submitForm(formName) {
if(this.queryParam.companyId=="" || this.queryParam.companyId == null){
this.$message.error({message:'请选择企业！',showClose:true})
return;
}
// if(this.queryParam.companyId=="" || this.queryParam.companyId == null){
// this.$message.error({message:'请选择企业！',showClose:true})
//
// return;
// }
this.$refs[formName].validate((valid) => {
if (valid) {
addCustomer(this.queryParam).then(result=>{
......
dsk-operate-ui/src/views/custom/trends/index.vue
View file @ b975caae
......@@ -7,7 +7,7 @@
</div>
<div class="app-container">
<gjjl types="gjdt" :data="datas"></gjjl>
<gjjl types="gjdt" :data="datas" isDisabled=false></gjjl>
</div>
</div>
</template>
......
dsk-operate-ui/src/views/detail/party-a/component/Tables.vue
View file @ b975caae
......@@ -62,7 +62,7 @@
</template>
</el-table>
</div>
<div class="pagination-box" v-if="paging">
<div class="pagination-box" v-if="paging && tableDataTotal>queryParams.pageSize">
<el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
</div>
</div>
......
dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue
View file @ b975caae
......@@ -32,6 +32,9 @@
{{ scope.row.projectName }}
</span>
</template>
<template slot="investmentAmount" slot-scope="scope">
{{ numbers(scope.row.investmentAmount) }}
</template>
</tables>
</template>
......@@ -46,7 +49,7 @@
<!-- 弹窗关联项目 -->
<el-drawer
title="添加合作情况"
size="45%"
size="50%"
:visible.sync="drawer"
:direction="direction"
:with-header="false"
......@@ -155,13 +158,13 @@ export default {
forData: [
{label: '项目名称', prop: 'projectName', slot: true},
{label: '项目阶段', prop: 'projectStage', width: '120'},
{label: '投资金额(万元)', prop: 'investmentAmount', width: '140'},
{label: '投资金额(万元)', prop: 'investmentAmount', width: '140', slot: true},
{label: '项目状态', prop: 'status', width: '90'}
],
formData: [
{ type: 1, fieldName: 'projectStage', value: '', placeholder: '项目阶段', options: []},
{ type: 1, fieldName: 'status', value: '', placeholder: '项目状态', options: []},
{ type: 3, fieldName: 'projectName', value: '', placeholder: '输入项目名称关键字搜索'},
{ type: 3, fieldName: 'projectName', width:'200', value: '', placeholder: '输入项目名称关键字搜索'},
],
stageOptions:[],
statusOptions:[],
......@@ -363,6 +366,10 @@ export default {
closeDetail(){
this.isDetailId = false
this.detailId = ''
},
// 转科学计算
numbers(v){
return new Number(v);
}
}
......@@ -494,8 +501,25 @@ export default {
font-size: 14px;
color: rgba(35,35,35,0.4);
margin-left: 28px;
display: flex;
//flex: 1;
span{
color: rgba(35,35,35,0.8);
display: inline-block;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
cursor: pointer;
flex: 1;
}
&:nth-child(1){
max-width: 15%;
}
&:nth-child(2){
max-width: 30%;
}
&:nth-child(3){
max-width: 50%;
}
}
}
......
dsk-operate-ui/src/views/detail/party-a/index.vue
View file @ b975caae
......@@ -50,7 +50,7 @@
<!-- 决策链条 -->
<DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" />
<!-- 跟进记录 -->
<Gjjl v-if="currentPath.pathName=='gjjl'" types="gjdt" :customer-ids="customerId" />
<Gjjl v-if="currentPath.pathName=='gjjl'" :isDisabled='false' types="gjdt" :customer-ids="customerId" />
</template>
</div>
......@@ -172,6 +172,16 @@ export default {
},
mounted() {
},
activated(){
if (this.$route.query.path) { // 获取跳转对应板块
this.currentPath.pathName = this.$route.query.path
}else{
this.currentPath.pathName = 'overview'
}
if (this.$route.query.customerId) { // 判断是否显示
this.customerId = this.$route.query.customerId
}
},
methods: {
showPartPage(e){
this.currentPath = e
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue
View file @ b975caae
......@@ -74,7 +74,7 @@
</template>
</div>
</div>
<div class="item">
<div class="item" v-if="false">
<span class="wrap_label">开发区类别</span>
<div class="item_ckquery">
<span :class="{color_text:queryParams.developmentZone.length == 0}" @click="changeBeCurrent('','developmentZone')">全部</span>
......@@ -427,7 +427,7 @@ export default {
box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.1);
border-radius: 4px;
width: 880px;
height: 337px;
//height: 337px;
padding: 16px;
position: absolute;
top: 25px;
......
dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue
View file @ b975caae
......@@ -786,6 +786,11 @@ export default {
}
.table-item{
margin-top: 22px;
/*::v-deep .el-table {*/
/*td.el-table__cell {*/
/*border-bottom: 0;*/
/*}*/
/*}*/
}
}
</style>
dsk-operate-ui/src/views/project/overview/index.vue
View file @ b975caae
......@@ -249,10 +249,11 @@ export default {
switch (type) {
case 1:
time = time.getDay()
// week.length = time
time = time == 0?7:time
weekdata1.length = time
weekdata2.length = time
weekdata3.length = time
console.log(time)
for(var i=0;i<7;i++){
if(i > time){
weekdata1.push('')
......@@ -303,6 +304,8 @@ export default {
default:
break;
}
console.log(datas)
console.log(labels)
this.initDT(datas,labels)
},
resizeEcharts (){
......
dsk-operate-ui/src/views/project/projectList/component/gjjl.vue
View file @ b975caae
......@@ -100,6 +100,7 @@
<div><strong>{{item.nickName}}</strong> <span v-if="item.visitWay">({{item.visitWay}})</span></div>
<div><span>{{item.recordInfo}}</span></div>
<div class="rec_text">
<span v-if="item.projectName && showtype == 'projectgjdt'">关联项目：{{item.projectName||'--'}}</span>
<span v-if="item.visitPerson">拜访对象：{{item.visitPerson||'--'}}</span>
<span v-if="item.position">职位：{{item.position||'--'}}</span>
<span v-if="item.creatTime">拜访时间：{{item.creatTime}}</span>
......@@ -178,7 +179,6 @@
computed: {
},
created(){
console.log(this.isDisabled)
//获取拜访方式
getDictType('visit_mode_type').then(result=>{
this.bffslist = result.code == 200 ? result.data:[]
......@@ -225,6 +225,7 @@
this.$message.success(result.msg)
this.handleCurrentChange(1)
this.isEdit = false
this.resetForm()
}else{
this.$message.error(result.msg)
}
......@@ -245,12 +246,24 @@
this.$message.success(result.msg)
this.handleCurrentChange(1)
this.isEdit = false
this.resetForm()
}else{
this.$message.error(result.msg)
}
})
}
},
resetForm(){
this.addParam={
customerId:'', //客户id
visitMode:'',//拜访方式
nextVisitTime:'',//下次拜访时间
name:'',//拜访对象姓名
position:'',//拜访对象职务
content:'',//拜访内容
}
},
//删除跟进动态
delRecord(id){
this.isdel = true
......
dsk-operate-ui/src/views/project/projectList/component/jsnr.vue
View file @ b975caae
<template>
<div>
<div id="jsnr">
<el-card class="box-card noborder">
<div class="cardtitles">基本信息</div>
<div class="baseinfo" style="padding-bottom: 8px">
......@@ -208,7 +208,9 @@
type: Number,
default: 0
},
isDisabled:false,
isDisabled:{
default: false
},
},
data(){
return{
......@@ -233,7 +235,7 @@
watch:{
},
mounted(){
document.addEventListener('mouseup',(e) => {
document.getElementById('jsnr').addEventListener('mouseup',(e) => {
if(this.isDisabled == true)
return false
let j = 0
......@@ -305,19 +307,23 @@
})
},
changes(str){
this.nowedit = -1
let param = str
param.id = this.id
if(this.isDisabled == true)
return false
editXMNR(param).then(result=>{
if(result.code == 200)
if(result.code == 200){
this.$message.success('修改成功!')
if(param.investmentAmount){//修改项目阶段
this.$emit('Refrehmoney')
}
}
else{
this.$message.error(res.msg)
this.$message.error(result.msg)
this.getJSNR()
}
})
this.nowedit = -1
},
//输入数字
number(value){
......
dsk-operate-ui/src/views/project/projectList/component/xmsl.vue
View file @ b975caae
<template>
<div>
<div id="xmsl">
<el-card class="box-card noborder">
<div class="cardtitles">基本信息</div>
<div class="baseinfo">
......@@ -204,7 +204,7 @@
this.getXMSL()
},
mounted(){
document.addEventListener('mouseup',(e) => {
document.getElementById('xmsl').addEventListener('mouseup',(e) => {
if(this.isDisabled == true)
return false
let j = 0
......@@ -236,13 +236,16 @@
param = {'constructionPrincipal':this.xmsldata.constructionPrincipal}
break;
case 6 :
param = {'supervisorPhone':this.xmsldata.supervisorPhone}
// param = {'supervisorPhone':this.xmsldata.supervisorPhone}
this.isphone(1,this.xmsldata.supervisorPhone)
break;
case 7 :
param = {'constructionPhone':this.xmsldata.constructionPhone}
// param = {'constructionPhone':this.xmsldata.constructionPhone}
this.isphone(1,this.xmsldata.constructionPhone)
break;
}
this.editXMSL(param)
if(this.nowedit!=6 && this.nowedit!=7)
this.editXMSL(param)
}
this.nowedit = -1
}
......@@ -285,7 +288,7 @@
//验证电话号码
isphone(type,value){
var regPartton = /1[3-9]+\d{9}/;
var regPartton1 = /^(0[0-9]{2,3}[\-]?[2-9][0-9]{6,7}[\-]?[0-9]?)$/;
var regPartton1 = /0\d{2,3}-\d{7,8}|\(?0\d{2,3}[)-]?\d{7,8}|\(?0\d{2,3}[)-]*\d{7,8}/;
if (!regPartton.test(value) && !regPartton1.test(value)) {
this.$message.error("请输入正确的电话");
} else {
......
dsk-operate-ui/src/views/project/projectList/detail.vue
View file @ b975caae
......@@ -58,7 +58,7 @@
</div>
<div class="det-con con" id="inputxt">
<span>投资估算（万元）：</span>
<div class="inputxt i" :class="{'nomar':nowedit != 3}">
<div class="inputxt i" :class="{'nomar':nowedit != 3}" :key="keys2">
<div class="flex" v-if="nowedit == 3 && isDisabled == false">
<el-input v-model="ProjectData.investmentAmount" placeholder="待添加" @input="number"></el-input>
<div class="flex">
......@@ -109,7 +109,7 @@
<!--项目速览-->
<xmsl v-if="thistag == 'xmsl'" :key="keys" @Refreshs="getsl" :detailId="detailId"></xmsl>
<!--建设内容-->
<jsnr v-if="thistag == 'jsnr'" :isDisabled='isDisabled' :detailId="detailId"></jsnr>
<jsnr v-if="thistag == 'jsnr'" :key="keys1" :isDisabled='isDisabled' @Refrehmoney="getXMSL" :detailId="detailId"></jsnr>
<!--联系人-->
<lxr v-if="thistag == 'lxr'" :isDisabled='isDisabled' :detailId="detailId"></lxr>
<!--跟进记录-->
......@@ -177,6 +177,8 @@
ProjectData:{},
isDisabled:false,
keys:1,
keys1:2,
keys2:20,
}
},
created(){
......@@ -247,6 +249,7 @@
}
this.address = list.length>0?list:"待添加"
this.addresstxt = txt == "" ? "待添加":txt
this.keys2 ++;
})
},
locks(isPrivate){
......@@ -263,6 +266,12 @@
editXMNR(JSON.stringify(params)).then(res=>{
if (res.code == 200){
this.$message.success('修改成功！')
if(this.nowedit == 1){
let _this = this
setTimeout(function() {
_this.keys1++;
},1000)
}
}else{
this.$message.error(res.msg)
this.getXMSL()
......
dsk-operate-ui/src/views/project/trends/index.vue
View file @ b975caae
<template>
<div class="app-container">
<gjjl types="projectgjdt"></gjjl>
<gjjl types="projectgjdt" isDisabled=false></gjjl>
</div>
</template>
......
dsk-operate-ui/src/views/radar/BidRecord/details.vue
View file @ b975caae
......@@ -39,7 +39,7 @@
<div class="content main5">
<div class="common-title">立项审批</div>
<div class="common-title">参投列表</div>
<div class="table-item">
<el-table
:data="tableData"
......
dsk-operate-ui/src/views/radar/Bidding/details.vue
View file @ b975caae
......@@ -24,15 +24,18 @@
<div class="list-content">
<p class="list-content-text">
<span>招采单位：</span>
<span>{{textList.Name||'--'}}万元</span>
<span v-if="textList.Name">{{textList.Name}}</span>
<span>--</span>
</p>
<p class="list-content-text">
<span>预算金款：</span>
<span>{{textList.planTenderAmount||'--'}}万元</span>
<span v-if="textList.planTenderAmount">{{textList.planTenderAmount}}</span>
<span>--</span>
</p>
<p class="list-content-text">
<span>资金来源：</span>
<span >{{textList.projecetCapitalSource||'--'}}</span>
</p>
</div>
......@@ -62,7 +65,7 @@
<img v-if="showimg" src="@/assets/images/bxpro/original1.png">
<img v-else src="@/assets/images/bxpro/original.png">
<span>
<a :href="textList.url">原文链接</a>
<a :href="textList.url" target="_blank">原文链接</a>
</span>
</div>
<div class="main3-box" v-html="textList.content">
......
dsk-operate-ui/src/views/radar/Land/details.vue
View file @ b975caae
......@@ -15,11 +15,13 @@
</p>
<p class="list-content-text">
<span>成交金额：</span>
<span>{{textList.transactionPrice||"--"}}</span>
<span v-if="textList.transactionPrice">{{textList.transactionPrice}}万元</span>
<span>--</span>
</p>
<p class="list-content-text">
<span>总面积：</span>
<span>{{textList.acreage||"--"}}</span>
<span v-if="textList.transactionPrice">{{textList.transactionPrice}}平方米</span>
<span>--</span>
</p>
<p class="list-content-text">
<span>合同签订：</span>
......@@ -70,7 +72,7 @@
</p>
<p>
<label class="label">面积</label>
<label class="label">面积（平方米）</label>
<span>{{textList.buildArea||"--"}}</span>
<label class="label">土地来源</label>
<span>{{textList.landSource||"--"}}</span>
......@@ -162,9 +164,9 @@
<span>{{textList.auctionEndTime||"--"}}</span>
</p>
<p>
<label class="label">起始价</label>
<label class="label">起始价（万元）</label>
<span>{{textList.moneyBegin||"--"}}</span>
<label class="label">竞买保证金</label>
<label class="label">竞买保证金（万元）</label>
<span>{{textList.bondmoney||"--"}}</span>
</p>
<p>
......@@ -174,7 +176,7 @@
<span>{{textList.investmentIntensity||"--"}}</span>
</p>
<p>
<label class="label">成交价</label>
<label class="label">成交价（万元）</label>
<span>{{textList.transactionPrice||"--"}}</span>
<label class="label">受让人</label>
<span>{{textList.company||"--"}}</span>
......
dsk-operate-ui/src/views/radar/bxprozbgg/details.vue
View file @ b975caae
......@@ -22,7 +22,7 @@
<img v-if="showimg" src="@/assets/images/bxpro/original1.png">
<img v-else src="@/assets/images/bxpro/original.png">
<span>
<a :href="textList.url">原文链接</a>
<a :href="textList.url" target="_blank">原文链接</a>
</span>
</div>
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ b975caae
......@@ -155,14 +155,14 @@
<router-link :to="'/radar/Bidding/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
<!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> -->
</p>
<div class="content-label" v-if="(item.province||item.city||item.city)||(item.projectType&&item.projectType!='其他'&&item.projectType!='空白')||(item.objectType&&item.objectType!='其他'&&item.objectType!='空白')">
<div class="content-label" v-if="(item.province||item.city||item.area)||(item.projectType&&item.projectType!='其他'&&item.projectType!='空白')||(item.objectType&&item.objectType!='其他'&&item.objectType!='空白')">
<span class="list-label" v-if="item.domicile">
{{item.province}}
<template v-if="item.city">
-{{item.city}}
</template>
<template v-if="item.city">
-{{item.city}}
<template v-if="item.area">
-{{item.area}}
</template>
</span>
<span class="list-label list-label-wl" v-if="item.objectType">{{item.objectType}}</span>
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ b975caae
......@@ -228,14 +228,12 @@
</div>
<div class="list-content" v-if="item.buildScale">
<p class="list-content-text" >
<span>建设规模：</span>
<span>{{item.buildScale}}</span>
<div class="list-content" v-if="item.buildScale">
<p class="list-content-text">
<span class="content-text-gc">建设规模：</span>
<span class="content-text-p">{{item.buildScale||'--'}}</span>
</p>
</div>
......@@ -1309,6 +1307,12 @@
color: rgba(35,35,35,0.8);
line-height: 15px
}
.content-text-gc{
width: 72px;
}
.content-text-p{
width: 1200px;
}
.blue{
color: #0081FF !important;
cursor: pointer;
......@@ -1323,7 +1327,7 @@
width: auto;
background: #F3F4F5;
display: inline-flex;
margin-top: 7px;
margin-top: 12px;
.list-content-text{
margin-top: 0px;
span{
......
dsk-operate-ui/src/views/radar/debtProject/details.vue
View file @ b975caae
......@@ -13,28 +13,40 @@
<div class="list">
<div class="item color1">
<div class="item-left">
<h4>{{textList.projectTotalInvestment||'--'}}<span>万元</span></h4>
<h4 v-if="textList.projectTotalInvestment">{{textList.projectTotalInvestment}}<span>万元</span></h4>
<h4 v-else>
--
</h4>
<p>项目总投资额</p>
</div>
<img class="img" src="@/assets/images/financing/icon1.png" />
</div>
<div class="item color2">
<div class="item-left">
<h4>{{textList.projectCapital||'--'}}<span>万元</span></h4>
<h4 v-if="textList.projectCapital">{{textList.projectCapital}}<span>万元</span></h4>
<h4 v-else>
--
</h4>
<p>项目资本金</p>
</div>
<img class="img" src="@/assets/images/financing/icon2.png" />
</div>
<div class="item color3">
<div class="item-left">
<h4>{{textList.econData_013||'--'}}<span>万元</span></h4>
<h4 v-if="textList.econData_013">{{textList.econData_013}}<span>万元</span></h4>
<h4 v-else>
--
</h4>
<p>专项债融资</p>
</div>
<img class="img" src="@/assets/images/financing/icon3.png" />
</div>
<div class="item color4">
<div class="item-left">
<h4>{{textList.specialBondCapital||'--'}}<span>万元</span></h4>
<h4 v-if="textList.specialBondCapital">{{textList.specialBondCapital}}<span>万元</span></h4>
<h4 v-else>
--
</h4>
<p>专项债用作资本金</p>
</div>
<img class="img" src="@/assets/images/financing/icon4.png" />
......@@ -43,28 +55,40 @@
<div class="list">
<div class="item color4">
<div class="item-left">
<h4>{{textList.otherFunds||'--'}}<span>万元</span></h4>
<h4 v-if="textList.otherFunds">{{textList.otherFunds}}<span>万元</span></h4>
<h4 v-else>
--
</h4>
<p>其他资金</p>
</div>
<img class="img" src="@/assets/images/financing/icon5.png" />
</div>
<div class="item color3">
<div class="item-left">
<h4>{{textList.specialBondIssue_number||'--'}}<span>万元 / 10只</span></h4>
<h4 v-if="textList.specialBondIssue_number">{{textList.specialBondIssue_number}}<span>万元/ 10只</span></h4>
<h4 v-else>
--
</h4>
<p>专项债融资额/专项债只数</p>
</div>
<img class="img" src="@/assets/images/financing/icon6.png" />
</div>
<div class="item color4">
<div class="item-left">
<h4>{{textList.otherFinancing||'--'}}<span>万元</span></h4>
<h4 v-if="textList.otherFinancing">{{textList.otherFinancing}}<span>万元</span></h4>
<h4 v-else>
--
</h4>
<p>其他融资</p>
</div>
<img class="img" src="@/assets/images/financing/icon7.png" />
</div>
<div class="item color2">
<div class="item-left">
<h4>{{textList.govSupportFunds||'--'}}<span>万元</span></h4>
<h4 v-if="textList.govSupportFunds">{{textList.govSupportFunds}}<span>万元</span></h4>
<h4 v-else>
--
</h4>
<p>政府安排资金</p>
</div>
<img class="img" src="@/assets/images/financing/icon8.png" />
......@@ -77,27 +101,33 @@
<div class="main3-box">
<p>
<label class="label">项目总收益/项目总债务融资本息(覆盖倍数)</label>
<span>{{textList.econData_007||'--'}}</span>
<span v-if="textList.econData_007">{{textList.econData_007}}倍</span>
<span>--</span>
</p>
<p>
<label class="label">项目总收益/项目总地方债券融资本息</label>
<span>{{textList.econData_008||'--'}}</span>
<span v-if="textList.econData_008">{{textList.econData_008}}倍</span>
<span>--</span>
</p>
<p>
<label class="label">项目总收益/项目总投资</label>
<span>{{textList.econData_009||'--'}}</span>
<span v-if="textList.econData_009">{{textList.econData_009}}倍</span>
<span>--</span>
</p>
<p>
<label class="label">项目总收益/项目总地方债券融资本金</label>
<span>{{textList.econData_010||'--'}}</span>
<span v-if="textList.econData_010">{{textList.econData_010}}倍</span>
<span>--</span>
</p>
<p>
<label class="label">项目总收益/项目总债务融资本金</label>
<span>{{textList.econData_011||'--'}}</span>
<span v-if="textList.econData_011">{{textList.econData_011}}倍</span>
<span>--</span>
</p>
<p>
<label class="label">项目预测总收益</label>
<span>{{textList.projectForecastTotalRevenue||'--'}}</span>
<span v-if="textList.projectForecastTotalRevenue">{{textList.projectForecastTotalRevenue}}万元</span>
<span>--</span>
</p>
</div>
</div>
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java
View file @ b975caae
......@@ -66,8 +66,8 @@ public class EnterpriseBussinessService {
contentParam.put("strategy_id", mongoContentId);
Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
Map contentData = MapUtils.getMap(contentMap, "data", null);
log.info("contentData:{}", JSONUtil.toJsonStr(contentData));
if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
return BeanUtil.toBean(map, R.class);
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseProjectService.java
View file @ b975caae
......@@ -127,8 +127,8 @@ public class EnterpriseProjectService {
contentParam.put("strategy_id", contentId);
Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
Map contentData = MapUtils.getMap(contentMap, "data", null);
log.info("contentData:{}", JSONUtil.toJsonStr(contentData));
if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
return BeanUtil.toBean(map, R.class);
......
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