Skip to content

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

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

parents a408ba2c 3d60151f
Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 110 deletions
dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseController.java
View file @ 580745ce
......@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
......@@ -125,8 +126,14 @@ public class EnterpriseController {
@ApiOperation(value = "企业主体信用评级")
@PostMapping(value = "bondCreditRating")
public R remark(@RequestBody @Valid EnterpriseBondCreditRatingBody vo) throws Exception {
public R bondCreditRating(@RequestBody @Valid EnterpriseBondCreditRatingBody vo) throws Exception {
return enterpriseService.bondCreditRating(vo);
}
@ApiOperation(value = "通过建设库企业id批量获取城投企业id")
@PostMapping(value = "getUipIdByCid")
public R getUipIdByCid(@RequestBody List<Integer> vo) throws Exception {
return enterpriseService.getUipIdByCid(vo);
}
}
dsk-operate-ui/src/assets/styles/public.css
View file @ 580745ce
......@@ -442,7 +442,7 @@ select {
font-weight: 400;
color: #232323;
background: #FFFFFF;
border-radius: 5px 5px 5px 5px;
border-radius: 2px;
border: 1px solid #D9D9D9;
text-align: center;
font-size: 14px;
......
dsk-operate-ui/src/views/custom/trends/index.vue
View file @ 580745ce
<template>
<div>
<div class="miantitle">
<span>客户管理</span>
<span> / 客户列表</span>
<span> / 跟进动态</span>
</div>
<!--<div class="miantitle">-->
<!--<span>客户管理</span>-->
<!--<span> / 客户列表</span>-->
<!--<span> / 跟进动态</span>-->
<!--</div>-->
<div class="app-container">
<gjjl types="gjdt" :data="datas" isDisabled=true></gjjl>
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/businessAnomaly.vue
View file @ 580745ce
......@@ -42,7 +42,7 @@ export default {
pageSize: 20
},
forData: [
{label: '列入原因', prop: 'inReason', width: '508'},
{label: '列入原因', prop: 'inReason'},
{label: '列入日期', prop: 'inDate', width: '95'},
{label: '做出决定机关（移入）', prop: 'department', width: '264'},
{label: '移出经营异常名录原因', prop: 'outReason', width: '320'},
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/dishonesty.vue
View file @ 580745ce
......@@ -42,7 +42,7 @@ export default {
pageSize: 20
},
forData: [
{label: '失信被执行人行为具体情形', prop: 'executionDesc', width: '508', fixed: true},
{label: '失信被执行人行为具体情形', prop: 'executionDesc', fixed: true},
{label: '立案日期', prop: 'date', width: '95'},
{label: '履行情况', prop: 'executionStatus', width: '120'},
{label: '立案文号', prop: 'caseNumber', width: '210'},
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/judgment.vue
View file @ 580745ce
......@@ -50,7 +50,7 @@ export default {
pageSize: 20
},
forData: [
{label: '案由', prop: 'causeAction', width: '240'},
{label: '案由', prop: 'causeAction'},
{label: '执行案号', prop: 'causeNo', width: '210'},
{label: '身份', prop: 'role', width: '120'},
{label: '当事人', prop: 'relatedCompanies', width: '240', slot: true},
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/openacourtsessionNotice.vue
View file @ 580745ce
......@@ -50,7 +50,7 @@ export default {
pageSize: 20
},
forData: [
{label: '案由', prop: 'causeAction', width: '240', fixed: true},
{label: '案由', prop: 'causeAction', fixed: true},
{label: '开庭日期', prop: 'hearingDate', width: '95'},
{label: '当事人', prop: 'relatedCompanies', width: '428', slot: true},
{label: '身份', prop: 'pureRole', width: '120'},
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/punish.vue
View file @ 580745ce
......@@ -50,12 +50,12 @@ export default {
pageSize: 20
},
forData: [
{label: '处罚原因', prop: 'punishReason', width: '508', slot: true, fixed: true},
{label: '处罚原因', prop: 'punishReason', slot: true, fixed: true},
{label: '决定日期', prop: 'punishBegin', width: '105'},
{label: '处罚结果', prop: 'punishResult', width: '264'},
{label: '处罚文书号', prop: 'fileNum', width: '240'},
{label: '处罚机关', prop: 'office', width: '264'},
{label: '处罚结束日期', prop: 'punishEnd', width: '100'},
{label: '处罚结束日期', prop: 'punishEnd', width: '110'},
],
formData: [
{ type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '处罚类别', options: []},
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/landAcquisition.vue
View file @ 580745ce
......@@ -48,7 +48,7 @@ export default {
pageSize: 20
},
forData: [
{label: '项目名称', prop: 'projectName', width: '508', slot: true},
{label: '项目名称', prop: 'projectName', slot: true},
{label: '土地用途', prop: 'landUse', width: '120'},
{label: '行业分类', prop: 'industry', width: '120'},
{label: '供地方式', prop: 'supplyLandWay', width: '120'},
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/regionalEconomies.vue
View file @ 580745ce
......@@ -12,11 +12,13 @@
:data="getValues"
:show-header="false"
border
:cell-style="rowStyle"
>
<el-table-column
v-for="(item, index) in getHeaders"
:key="index"
:prop="item"
:formatter="formatStatus"
>
</el-table-column>
</el-table>
......@@ -252,6 +254,22 @@ export default {
}
this.addressList = str.join(' - ');
},
formatStatus: function(row, column, cellValue) {
if(row.title === '经济'||row.title === '财政'||row.title === '债务'){
return cellValue
}else {
return cellValue? cellValue : '--'
}
},
rowStyle(row){
if (row.row.title === '经济'||row.row.title === '财政'||row.row.title === '债务'){
return {
// background: '#FAF5EB',
color:'#232323',
fontWeight: 'bold'
}
}
},
}
}
</script>
......@@ -298,8 +316,8 @@ export default {
::v-deep .el-table__body-wrapper tr:nth-child(2) td,
::v-deep .el-table__body-wrapper tr:nth-child(17) td,
::v-deep .el-table__body-wrapper tr:nth-child(29) td{
font-weight: bold;
color: #232323;
//font-weight: bold;
//color: #232323;
}
</style>
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ 580745ce
......@@ -452,7 +452,9 @@
width="244px">
<span>认领成功，是否完善客户信息？</span>
<div slot="footer" class="dialog-footer">
<span class="dialog-footer-btn1" type="primary" @click="renlin()">立即完善</span>
<span class="dialog-footer-btn1" type="primary" >
<router-link :to="'/enterprise/'+encodeStr(companyId)+'?customerId='+customerId+'&path=business' " tag="a" class="list-titel-a">立即完善</router-link>
</span>
<span class="dialog-footer-btn2" @click="search(pageNum, pageSize)">稍后</span>
</div>
</el-dialog>
......@@ -533,6 +535,8 @@ export default {
},
],
companyId:'',
customerId:'',
dialogVisible: false,
tableData:[],
......@@ -771,7 +775,7 @@ export default {
});
},
claimbtn(item){
console.log(item.companyName);
this.companyId=item.companyId;
var params={
companyId:item.companyId,
uipId:item.uipId,
......@@ -791,6 +795,7 @@ export default {
// console.log(res)
if (res.code==200) {
this.dialogVisible=true;
this.customerId=res.data.customerId;
}
}).catch(error=>{
......
dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue
View file @ 580745ce
......@@ -23,6 +23,7 @@
border
highlight-current-row
@sort-change="sortChange"
:default-sort = "{prop: 'gdp', order: 'descending'}"
>
<el-table-column prop="province" label="下辖区" width="170" :formatter="formatStatus" fixed>
<!--<template slot-scope="scope">-->
......
dsk-operate-ui/src/views/macro/enterprises/index.vue
View file @ 580745ce
......@@ -33,11 +33,12 @@
@sort-change="sortChange"
highlight-current-row
v-if="tableDataTotal > 0"
:default-sort = "{prop: 'skyCount', order: 'descending'}"
>
<el-table-column label="序号" width="60" align="left" fixed>
<template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
</el-table-column>
<el-table-column label="公司名称" align="left" fixed width="300">
<el-table-column label="公司名称" align="left" fixed width="350">
<template slot-scope="scope">
<router-link v-if="scope.row.jskEid" :to="`/company/${encodeStr(scope.row.jskEid)}`" tag="a" class="a-link" v-html="scope.row.name" ></router-link>
<span v-else v-html="scope.row.name" ></span>
......@@ -54,8 +55,8 @@
<el-table-column label="水利业绩" prop="waterConservancy" sortable="custom" width="100" :formatter="formatStatus"/>
<el-table-column label="常合作业主" prop="topCustomer" width="150" :formatter="formatStatus"/>
<el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="120" :formatter="formatStatus"/>
<el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" :formatter="formatStatus"/>
<el-table-column label="常合作供应商" prop="topSupplier" width="150" :formatter="formatStatus"/>
<el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" width="150" :formatter="formatStatus"/>
<el-table-column label="常合作供应商" prop="topSupplier" width="200" :formatter="formatStatus"/>
</el-table>
<div class="empty" v-if="tableDataTotal === 0">
<img class="img" src="@/assets/images/project/empty.png">
......
dsk-operate-ui/src/views/macro/financing/index.vue
View file @ 580745ce
......@@ -17,11 +17,12 @@
fit
@sort-change="sortChange"
highlight-current-row
:default-sort = "{prop: 'value', order: 'descending'}"
>
<el-table-column prop="name" label="项目类型" width="150" />
<el-table-column prop="number" label="项目个数" sortable="custom" width="140" />
<el-table-column prop="value" label="投资额（亿元）" sortable="custom" width="140" />
<el-table-column prop="proportion" label="比例（%）" width="140" sortable="custom" />
<el-table-column prop="name" label="项目类型" width="160"/>
<el-table-column prop="number" label="项目个数" align="right" sortable="custom" width="160" />
<el-table-column prop="value" label="投资额（亿元）" align="right" sortable="custom" width="160" />
<el-table-column prop="proportion" label="比例（%）" align="right" width="160" sortable="custom" />
</el-table>
</div>
</div>
......@@ -43,6 +44,7 @@
border
fit
highlight-current-row
:default-sort = "{prop: 'projectTotalInvestment', order: 'descending'}"
>
<el-table-column label="序号" width="55" align="left" fixed>
<template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
......@@ -311,6 +313,43 @@ export default {
.box-right{
float: right;
::v-deep .el-table{
.sort-caret.ascending{
border-bottom-color: rgba(0,129,255,0.5);
}
.ascending .sort-caret.ascending{
border-bottom-color: #0081FF;
}
.sort-caret.descending{
border-top-color: rgba(0,129,255,0.5);
}
.descending .sort-caret.descending{
border-top-color: #0081FF;
}
.el-table__header-wrapper{
background: #F0F3FA;
th{
background: #F0F3FA;
/*text-align: left;*/
}
}
.el-table__footer-wrapper{
background: #F0F3FA;
}
th {
font-size: 13px !important;
font-weight: 400 !important;
}
.cell {
padding-right: 12px !important;
padding-left: 12px !important;
line-height: 18px;
}
.el-table__fixed-header-wrapper{
th{
background: #F0F3FA;
}
}
td.el-table__cell{
border-bottom: 0;
}
......@@ -351,8 +390,22 @@ export default {
background: #566380;
}
}
.gutter{
background: #f8f8f9;
.has-gutter{
tr{
th:nth-child(4){
border-right:0;
}
}
}
.el-table__cell.gutter{
background: #F0F3FA;
}
.el-table__row{
td:last-child{
.cell{
padding-right: 12px !important;
}
}
}
}
}
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue
View file @ 580745ce
......@@ -38,6 +38,7 @@
fit
highlight-current-row
v-if="tableDataTotal > 0"
:default-sort = "{prop: 'gdp', order: 'descending'}"
>
<el-table-column label="序号" width="60" align="left" fixed>
<template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ 580745ce
......@@ -152,6 +152,7 @@
border
fit
highlight-current-row
:default-sort = "{prop: 'bratingSubjectLevel', order: 'descending'}"
>
<el-table-column label="序号" width="60" align="left" fixed>
<template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
......@@ -259,6 +260,7 @@
import {encodeStr} from "@/assets/js/common.js"
import dataRegion from '@/assets/json/dataRegion'
import { uipGroupData,urbanInvestmentPage,urbanInvestmentStatistics,claim } from '@/api/macro/macro'
import { infoHeader } from '@/api/detail/party-a/index'
export default {
name: 'Urban',
data() {
......@@ -278,7 +280,7 @@ export default {
tableData:[],
tableLoading: false,
pageIndex: 1,
pageSize: 10,
pageSize: 20,
tableDataTotal: null,
selected:[],
xzdjCalss:'',
......@@ -587,12 +589,36 @@ export default {
});
},
handleClick(item){
this.companyId=item.companyId
claim({uipId:item.uipId,companyName:item.companyName}).then(res => {
this.companyId=item.companyId;
infoHeader({companyId:this.companyId}).then(res => {
if(res.code === 200){
this.claimVisible=true;
this.customerId=res.data.customerId;
this.querySubmit()
let registerAddress=res.data.provinceName
if(res.data.cityName){
registerAddress=registerAddress+'-'+res.data.cityName
if(res.data.districtName){
registerAddress=registerAddress+'-'+res.data.districtName
}
}
let params={
uipId:item.uipId,
companyName:item.companyName,
companyId:item.companyId,
creditLevel:item.bratingSubjectLevel,
legalPerson:res.data.corporatePerson,
registerCapital:res.data.regCapital,
provinceId:res.data.provinceId || '',
cityId:res.data.cityId || '',
districtId:res.data.districtCode || '',
registerAddress:registerAddress,
creditCode:res.data.creditCode,
}
claim(params).then(res => {
if(res.code === 200){
this.claimVisible=true;
this.customerId=res.data.customerId;
this.querySubmit()
}
})
}
})
},
......
dsk-operate-ui/src/views/project/projectList/component/addProject.vue
View file @ 580745ce
......@@ -147,7 +147,8 @@
//添加客户
submitForm(formName) {
this.queryParam.userId = this.$store.state.user.userId
this.queryParam.investmentAmount = parseFloat(this.queryParam.investmentAmount)
if(this.queryParam.investmentAmount!="")
this.queryParam.investmentAmount = parseFloat(this.queryParam.investmentAmount)
this.$refs[formName].validate((valid) => {
if (valid) {
addProject(this.queryParam).then(result=>{
......
dsk-operate-ui/src/views/radar/BidRecord/details.vue
View file @ 580745ce
......@@ -39,14 +39,12 @@
<div class="content main5">
<div class="common-title">参投列表</div>
<div class="common-title">投标人列表</div>
<div class="table-item">
<el-table
:data="tableData"
element-loading-text="Loading"
border
highlight-current-row
>
<el-table-column label="序号" width="80">
<template slot-scope="scope">
......@@ -54,9 +52,9 @@
</template>
</el-table-column>
<el-table-column label="项目名称" >
<el-table-column label="企业名称" >
<template slot-scope="scope">
<router-link v-if="scope.row.id" :to="'/company/' + encodeStr(scope.row.id) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="scope.row.name"></router-link>
<router-link :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.companyId) " tag="a" class="list-titel-a blue" v-html="scope.row.companyName"></router-link>
</template>
</el-table-column>
......@@ -66,13 +64,19 @@
</template>
</el-table-column>
<!-- <el-table-column label="工期" width="182" >
<template slot-scope="scope">
{{ scope.row.tenderOffer||'--'}}
</template>
</el-table-column> -->
</el-table>
<div class="pagination clearfix" v-show="total>10">`
<!-- <div class="pagination clearfix" v-show="total>10">`
<el-pagination background :page-size="pageSize" :current-page="pageNum"
@current-change="handleCurrentChange" layout="prev, pager, next" :total="total">
</el-pagination>
</div>
</div> -->
</div>
</div>
......@@ -82,7 +86,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>
......@@ -129,7 +133,10 @@
}).then(res => {
// console.log(res);
this.textList = res.data;
console.log(this.textList);
if(this.textList.companys){
this.textList.companys=JSON.parse(this.textList.companys);
this.tableData = this.textList.companys;
}
}).catch(error => {
......@@ -151,15 +158,15 @@
pageNum: this.pageNum,
pageSize: this.pageSize
}
api.tenderPage(data).then(res => {
// console.log(res);
this.tableData = res.rows;
this.total = res.total;
console.log(this.tableData);
// api.tenderPage(data).then(res => {
// // console.log(res);
// this.tableData = res.rows;
// this.total = res.total;
// console.log(this.tableData);
}).catch(error => {
// }).catch(error => {
});
// });
}
}
......
dsk-operate-ui/src/views/radar/Bidding/details.vue
View file @ 580745ce
......@@ -25,8 +25,7 @@
<p class="list-content-text">
<span>招采单位：</span>
<span v-if="textList.tenderee">
<router-link v-if="textList.uipId" :to="'/enterprise/' + encodeStr(textList.uipId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
<router-link v-else :to="'/company/' + encodeStr(textList.tendereeId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
<router-link :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.tendereeId) " tag="a" class="list-titel-a blue" v-html="scope.row.tenderee"></router-link>
</span>
<span v-else>--</span>
</p>
......
dsk-operate-ui/src/views/radar/Establishment/details.vue
View file @ 580745ce
......@@ -48,7 +48,10 @@
<div class="main3-box">
<p>
<label class="label">项目法人</label>
<span>{{textList.companyName||'--'}}</span>
<span>
<router-link v-if="textList.companyName" :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.companyId) " tag="a" class="list-titel-a blue" v-html="scope.row.companyName"></router-link>
<span v-else>--</span>
</span>
<label class="label">总投资（万元）</label>
<span>{{textList.money||'--'}}</span>
</p>
......
dsk-operate-ui/src/views/radar/Tender/details.vue
View file @ 580745ce
......@@ -42,28 +42,28 @@
</p>
</div>
<div class="list-content">
<p class="list-content-text">
<div class="list-content" v-if="textList.projectAmount||textList.contact">
<p class="list-content-text" v-if="textList.projectAmount">
<span>预算金款：</span>
<span v-if="textList.projectAmount">{{textList.projectAmount}}万元</span>
<span v-else>--</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="textList.contact">
<span>联系方式：</span>
<span >招采单位 {{textList.contact}}{{textList.contactTel}}</span>
</p>
</div>
<div class="list-content">
<p class="list-content-text">
<div class="list-content" v-if="textList.issueTime||textList.overTime||textList.dataSource">
<p class="list-content-text" v-if="textList.issueTime">
<span>发布时间：</span>
<span >{{textList.issueTime||'--'}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="textList.overTime">
<span>报名截止日期：</span>
<span >{{textList.overTime||'--'}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="textList.dataSource">
<span>来源网站：</span>
<span >{{textList.dataSource||'--'}}</span>
</p>
......
dsk-operate-ui/src/views/radar/bxprozbgg/details.vue
View file @ 580745ce
......@@ -178,8 +178,7 @@
<div class="main3-box">
<p>
<label class="label">招标人</label>
<router-link v-if="textList.tendereeId" :to="'/company/' + encodeStr(textList.tendereeId) + '/?index=true'" tag="a" class="list-titel-a color2" v-html="textList.tenderee"></router-link>
<span v-else class="color2">{{textList.tenderee||'--'}}</span>
<router-link :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.tendereeId) " tag="a" class="list-titel-a blue" v-html="scope.row.tenderee"></router-link>
<label class="label">代理机构</label>
<router-link v-if="textList.agencyId" :to="'/company/' + encodeStr(textList.agencyId) + '/?index=true'" tag="a" class="list-titel-a color2" v-html="textList.agency"></router-link>
<span v-else class="color2">{{textList.agency||'--'}}</span>
......
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue
View file @ 580745ce
<template>
<div>
<div class="content">
<div class="content_item">
<div class="content_item content_item_padding0">
<div class="label">项目名称</div>
<div class="content_right">
<el-input class="ename_input"
......@@ -35,7 +35,7 @@
></el-cascader>
</div>
<el-dropdown @command="punishDatehandleCommand" trigger="click" class="el-dropdown-land" ref="punishDateShowPopper" :hide-on-click="false" >
<el-dropdown @command="punishDatehandleCommand" trigger="click" placement="bottom-start" class="el-dropdown-land" ref="punishDateShowPopper" :hide-on-click="false" >
<span class="el-dropdown-link" :class="punishDateValue ? 'color_text' : ''" >
发布时间{{ punishDateValue ? " 1项" : ""}}
<i class="el-icon-caret-bottom"></i>
......@@ -69,7 +69,7 @@
</div>
</el-dropdown>
<el-dropdown @command="tenderDatehandleCommand" class="el-dropdown-land" trigger="click" ref="tenderDateShowPopper" :hide-on-click="false" >
<el-dropdown @command="tenderDatehandleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="tenderDateShowPopper" :hide-on-click="false" >
<span class="el-dropdown-link" :class="tenderDateValue ? 'color_text' : ''" >开标时间{{ tenderDateValue ? " 1项" : ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -145,7 +145,7 @@
</span>
</div>
<div class="list-content" v-if="item.tenderTime||item.source||item.punishDate">
<div class="list-content list-content1" v-if="item.tenderTime||item.source||item.punishDate">
<p class="list-content-text" v-if="item.tenderTime">
<span>开标时间：</span>
......@@ -853,10 +853,11 @@ export default {
.content{
padding: 0px 16px;
padding-top: 16px;
border-radius: 4px 4px 4px 4px;
background: #FFFFFF;
.content_item{
padding-top: 12px;
padding-top: 20px;
display: flex;
align-items: center;
.label{
......@@ -991,7 +992,7 @@ export default {
}
}
.content-label{
margin-top: 12px;
margin-top: 8px;
.list-label{
background: #F3F3FF;
color: #8491E8;
......@@ -1011,11 +1012,10 @@ export default {
align-items: center;
.list-content-text{
margin-top: 7px;
display: flex;
justify-content: start;
align-items: center;
margin-right: 27px;
margin-right: 32px;
font-size: 14px;
span:first-child{
......@@ -1055,6 +1055,9 @@ export default {
}
}
.list-content1{
margin-top: 12px;
}
}
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ 580745ce
<template>
<div>
<div class="content">
<div class="content_item">
<div class="content_item content_item_padding0">
<div class="label">项目名称</div>
<div class="content_right">
<el-input class="ename_input"
......@@ -71,7 +71,7 @@
</el-option>
</el-select>
</div>
<el-dropdown @command="planTenderAmounthandleCommand" class="el-dropdown-land" trigger="click" ref="planTenderAmountShowPopper" :hide-on-click="false">
<el-dropdown @command="planTenderAmounthandleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="planTenderAmountShowPopper" :hide-on-click="false">
<span class="el-dropdown-link" :class="jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount ? 'color_text': ''">
合同预估金额{{jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -192,7 +192,7 @@
</div>
<div class="list-content" v-if="item.issueTime||item.planTenderDateStart||item.sourceName">
<div class="list-content list-content1" v-if="item.issueTime||item.planTenderDateStart||item.sourceName">
<p class="list-content-text" v-if="item.issueTime">
<span>发布时间：</span>
<span >{{item.issueTime||'--'}}</span>
......@@ -208,7 +208,7 @@
</div>
<div class="list-content list-addree" v-if="item.projectScale">
<div class="list-content list-addree" v-if="item.projectScale">
<p class="list-content-text">
<span class="content-text-gc">工程规模：</span>
<span class="content-text-p" v-html="item.projectScale"></span>
......@@ -599,10 +599,11 @@ export default {
<style lang="scss" scoped>
.content{
padding: 0px 16px;
padding-top: 16px;
border-radius: 4px 4px 4px 4px;
background: #FFFFFF;
.content_item{
padding-top: 12px;
padding-top: 20px;
display: flex;
align-items: center;
.label{
......@@ -737,14 +738,14 @@ export default {
}
}
.content-label{
margin-top: 12px;
margin-top: 8px;
.list-label{
background: #F3F3FF;
color: #8491E8;
border-radius: 1px 1px 1px 1px;
padding: 3px 7px;
font-size: 12px;
margin-right: 16px;
margin-right: 8px;
}
.list-label-wl{
......@@ -760,17 +761,16 @@ export default {
.list-content{
margin-top: 8px;
margin-top: 12px;
display: flex;
justify-content: start;
align-items: center;
.list-content-text{
margin-top: 7px;
display: flex;
justify-content: start;
align-items:flex-start ;
margin-right: 27px;
margin-right: 32px;
font-size: 14px;
span:first-child{
......@@ -803,9 +803,9 @@ export default {
width: auto;
background: #F3F4F5;
display: inline-flex;
margin-top: 12px;
margin-top: 16px;
.list-content-text{
margin-top: 0px;
margin-left: 16px;
span{
line-height: 30px!important;
}
......@@ -817,6 +817,9 @@ export default {
}
}
.list-content1{
margin-top: 8px;
}
}
.bottomlist-list:hover{
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ 580745ce
<template>
<div>
<div class="content">
<div class="content_item">
<div class="content_item content_item_padding0">
<div class="label">项目名称</div>
<div class="content_right">
<el-input class="ename_input"
......@@ -69,7 +69,7 @@
</span>
<el-cascader ref="address" class="cascader-region" v-model="addressType" :options="addressList" :props="props" @change="domicileChange" collapse-tags clearable></el-cascader>
</div>
<el-dropdown @command="moneyhandleCommand" class="el-dropdown-land" trigger="click" ref="moneyShowPopper" :hide-on-click="false">
<el-dropdown @command="moneyhandleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="moneyShowPopper" :hide-on-click="false">
<span class="el-dropdown-link" :class=" establishmentDto.startMoney || establishmentDto.endMoney? 'color_text' : ''">
总投资{{establishmentDto.startMoney || establishmentDto.endMoney? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -111,7 +111,7 @@
</el-option>
</el-select>
</div>
<el-dropdown @command="planStartTimehandleCommand" class="el-dropdown-land" trigger="click" ref="planStartTimeShowPopper":hide-on-click="false">
<el-dropdown @command="planStartTimehandleCommand" placement="bottom-start" class="el-dropdown-land" trigger="click" ref="planStartTimeShowPopper":hide-on-click="false">
<span class="el-dropdown-link" :class="planStartTimeValue ? 'color_text' : ''">
计划开工时间{{ planStartTimeValue ? " 1项" : ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -133,7 +133,7 @@
</el-dropdown-menu>
</div>
</el-dropdown>
<el-dropdown @command="planEndTimehandleCommand" class="el-dropdown-land" trigger="click" ref="planEndTimeShowPopper" :hide-on-click="false">
<el-dropdown @command="planEndTimehandleCommand" placement="bottom-start" class="el-dropdown-land" trigger="click" ref="planEndTimeShowPopper" :hide-on-click="false">
<span class="el-dropdown-link" :class="planEndTimeValue ? 'color_text' : ''">
计划完工日期{{ planEndTimeValue ? " 1项" : ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -1129,10 +1129,11 @@
.content{
padding: 0px 16px;
padding-top: 16px;
border-radius: 4px 4px 4px 4px;
background: #FFFFFF;
.content_item{
padding-top: 12px;
padding-top: 20px;
display: flex;
align-items: center;
.label{
......@@ -1267,7 +1268,8 @@
}
}
.content-label{
margin-top: 12px;
margin-top: 8px;
margin-bottom: 2px;
.list-label{
background: #F3F3FF;
color: #8491E8;
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ 580745ce
<template>
<div>
<div class="content">
<div class="content_item">
<div class="content_item content_item_padding0">
<div class="label">项目名称</div>
<div class="content_right">
<el-input class="ename_input"
......@@ -51,7 +51,7 @@
</el-select>
</div>
<el-dropdown @command="handleCommand" class="el-dropdown-land" trigger="click" ref="popper" :hide-on-click="false">
<el-dropdown @command="handleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="popper" :hide-on-click="false">
<span class="el-dropdown-link" :class="landMarketDto.startAcreage || landMarketDto.endAcreage? 'color_text': ''">
出让面积{{landMarketDto.startAcreage || landMarketDto.endAcreage? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -85,7 +85,7 @@
</el-dropdown-menu>
</el-dropdown>
<div class="select-popper">
<el-popover placement="bottom" v-model="showIpt" trigger="click">
<el-popover v-model="showIpt" placement="bottom-start" trigger="click">
<div class="jabph_popper_box jabph_popper_box1" style="position: relative">
<div class="jabph_popper_wrap">
最小
......@@ -114,7 +114,7 @@
<div class="content_item">
<div class="label">成交信息</div>
<div class="content_right">
<el-dropdown @command="transactionPricehandleCommand" class="el-dropdown-land" trigger="click" ref="transactionPriceShowPopper" :hide-on-click="false">
<el-dropdown @command="transactionPricehandleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="transactionPriceShowPopper" :hide-on-click="false">
<span class="el-dropdown-link" :class="landMarketDto.startTransactionPrice ||landMarketDto.endTransactionPrice ? 'color_text': ''">
成交金额{{landMarketDto.startTransactionPrice ||landMarketDto.endTransactionPrice? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -147,7 +147,7 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-dropdown @command="contractSignTimehandleCommand" class="el-dropdown-land" trigger="click" ref="contractSignTimeShowPopper" :hide-on-click="false">
<el-dropdown @command="contractSignTimehandleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="contractSignTimeShowPopper" :hide-on-click="false">
<span class="el-dropdown-link" :class="contractSignTimeValue ? 'color_text' : ''">
签订日期{{ contractSignTimeValue ? " 1项" : ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -932,10 +932,11 @@
<style lang="scss" scoped>
.content{
padding: 0px 16px;
padding-top: 16px;
border-radius: 4px 4px 4px 4px;
background: #FFFFFF;
.content_item{
padding-top: 12px;
padding-top: 20px;
display: flex;
align-items: center;
.label{
......@@ -1060,6 +1061,7 @@
font-size: 16px;
font-weight: 700;
color: #3D3D3D;
margin-bottom: 4px;
line-height: 19px;
.list-titel-a{
text-decoration: none;
......@@ -1070,7 +1072,7 @@
}
}
.content-label{
margin-top: 7px;
margin-top: 5px;
.list-label{
background: #F3F3FF;
color: #8491E8;
......@@ -1094,7 +1096,7 @@
display: flex;
justify-content: start;
align-items: center;
margin-right: 27px;
margin-right: 32px;
font-size: 14px;
span:first-child{
......@@ -1121,7 +1123,7 @@
width: auto;
background: #F3F4F5;
display: inline-flex;
margin-top: 7px;
margin-top: 8px;
.list-content-text{
margin-top: 0px;
span{
......
dsk-operate-ui/src/views/radar/components/Tender/Select.vue
View file @ 580745ce
......@@ -11,6 +11,7 @@
multiple
filterable
:filter-method="filterMethod"
placement="bottom-start"
v-el-select-loadmore="loadMore(rangeNumber)"
@change="selectChange"
@visible-change="visibleChange" >
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ 580745ce
<template>
<div>
<div class="content">
<div class="content_item">
<div class="content_item content_item_padding0">
<div class="label">项目名称</div>
<div class="content_right">
<el-input class="ename_input" v-model="keyword"
......@@ -63,7 +63,7 @@
<el-cascader ref="address" class="cascader-region" v-model="addressType" :options="addressList":props="props" @change="domicileChange" collapse-tags clearable>
</el-cascader>
</div>
<el-dropdown @command="punishDatehandleCommand" trigger="click" class="el-dropdown-land" ref="punishDateShowPopper":hide-on-click="false">
<el-dropdown @command="punishDatehandleCommand" trigger="click" placement="bottom-start" class="el-dropdown-land" ref="punishDateShowPopper":hide-on-click="false">
<span class="el-dropdown-link" :class="punishDateValue ? 'color_text' : ''">发布时间{{ punishDateValue ? " 1项" : ""}}
<i class="el-icon-caret-bottom"></i>
</span>
......@@ -106,7 +106,7 @@
</el-option>
</el-select>
</div>
<el-dropdown @command="bidMoneyhandleCommand" class="el-dropdown-land" trigger="click" ref="bidMoneyShowPopper":hide-on-click="false">
<el-dropdown @command="bidMoneyhandleCommand" placement="bottom-start" class="el-dropdown-land" trigger="click" ref="bidMoneyShowPopper":hide-on-click="false">
<span class="el-dropdown-link" :class=" jskBidQueryDto.startBidMoney || jskBidQueryDto.endBidMoney? 'color_text' : ''">
预算金额{{jskBidQueryDto.startBidMoney || jskBidQueryDto.endBidMoney? " 1项": ""}}
<i class="el-icon-caret-bottom"></i>
......@@ -209,7 +209,7 @@
</span>
</div>
<div class="list-content" v-if="item.companyName||item.agency">
<div class="list-content list-content1" v-if="item.companyName||item.agency">
<p class="list-content-text" v-if="item.companyName">
<span>招采单位：</span>
<router-link v-if="item.jskEid" :to="'/company/' + encodeStr(item.jskEid) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
......@@ -1107,11 +1107,12 @@
<style lang="scss" scoped>
.content {
padding: 0px 16px;
padding-top: 16px;
border-radius: 4px 4px 4px 4px;
background: #FFFFFF;
.content_item {
padding-top: 12px;
padding-top: 20px;
display: flex;
align-items: center;
......@@ -1272,7 +1273,7 @@
background: #F3F3FF;
color: #8491E8;
border-radius: 1px 1px 1px 1px;
margin-right: 12px;
margin-right: 8px;
padding: 3px 7px;
font-size: 12px;
......@@ -1291,17 +1292,15 @@
.list-content {
margin-top: 3px;
margin-top:8px;
display: flex;
justify-content: start;
align-items: center;
.list-content-text {
margin-top: 7px;
display: flex;
justify-content: start;
align-items: center;
margin-right: 27px;
margin-right: 32px;
font-size: 14px;
span:first-child {
......@@ -1326,6 +1325,9 @@
}
.list-content1{
margin-top: 12px;
}
}
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ 580745ce
......@@ -446,7 +446,7 @@
</template>
</template>
</el-table-column>
<el-table-column prop="zj" label="招标人" width="312" >
<el-table-column prop="zj" label="招标人" width="280" >
<template slot-scope="scope">
<router-link :to="'/company/'+encodeStr(scope.row.tendereeId) " tag="a" class="list-titel-a" v-html="scope.row.tenderee"></router-link>
</template>
......
dsk-operate-ui/src/views/radar/debtProject/details.vue
View file @ 580745ce
......@@ -136,14 +136,14 @@
<div class="main4-box">
<label class="label">项目主体</label>
<span>
<router-link v-if="textList.projectEntity" :to="'/company/' + encodeStr(textList.projectEntityId) + '/?index=true'" tag="a" class=" blue" v-html="textList.projectEntity"></router-link>
<router-link v-if="textList.projectEntity" :to="scope.row.projectEntityUipId?'/enterprise/' + encodeStr(scope.row.projectEntityUipId) :'/company/' + encodeStr(scope.row.projectEntityId) " tag="a" class="list-titel-a blue" v-html="scope.row.projectEntity"></router-link>
<template v-else>--</template>
</span>
<label class="label">主管部门</label>
<span>{{textList.chargeDepartment||'--'}}</span>
<label class="label">实施单位</label>
<span>
<router-link v-if="textList.piu" :to="'/company/' + encodeStr(textList.piuId) + '/?index=true'" tag="a" class=" blue" v-html="textList.piu"></router-link>
<router-link v-if="textList.piu" :to="scope.row.piuUipId?'/enterprise/' + encodeStr(scope.row.piuUipId) :'/company/' + encodeStr(scope.row.piuId) " tag="a" class="list-titel-a blue" v-html="scope.row.piu"></router-link>
<template v-else>--</template>
</span>
</div>
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
View file @ 580745ce
......@@ -254,4 +254,11 @@ public class EnterpriseService {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRating", BeanUtil.beanToMap(body, false, false));
return BeanUtil.toBean(map, R.class);
}
public R getUipIdByCid(List<Integer> body) throws Exception {
if (CollectionUtils.isEmpty(body)) return R.ok();
HashMap<String, Object> paramMap = new HashMap<>();
paramMap.put("ids", body);
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/getUipIdByCid", paramMap);
return BeanUtil.toBean(map, R.class);
}
}
dsk-system/src/main/java/com/dsk/system/service/impl/SpecialPurposeBondsServiceImpl.java
View file @ 580745ce
......@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
......@@ -98,7 +99,21 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
@Override
public AjaxResult bondStatistics(SpecialPurposeBondsDto dto) {
// todo 临时处理 待还原
Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/bond/statistics", BeanUtil.beanToMap(dto, false, false));
Integer code = MapUtils.getInteger(map, "code", 300);
if (code.equals(HttpStatus.OK.value())) {
List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(map, "data", ""));
Iterator<Object> it = list.iterator();
while (it.hasNext()) {
Map<String, Object> informationMap = (Map<String, Object>)it.next();
// 专项债用于项目规模
Integer count = MapUtils.getInteger(informationMap, "count",0);
if (count.equals(0)) {
it.remove();
}
}
}
return BeanUtil.toBean(map, AjaxResult.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