Skip to content

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

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

parents 53e2d0b6 7e966685
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 557 additions and 307 deletions
dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java
View file @ d0be8b75
...@@ -145,7 +145,7 @@ public class CustomerController extends BaseController { ...@@ -145,7 +145,7 @@ public class CustomerController extends BaseController {
if (!ObjectUtils.isEmpty(obj)) { if (!ObjectUtils.isEmpty(obj)) {
customer.setCompanyId(MapUtil.getInt(obj, "jskEid")); customer.setCompanyId(MapUtil.getInt(obj, "jskEid"));
customer.setLegalPerson(MapUtil.getStr(obj, "legalPerson")); customer.setLegalPerson(MapUtil.getStr(obj, "legalPerson"));
customer.setRegisterCapital(MapUtil.getStr(obj, "registeredCapital")); customer.setRegisterCapital(MapUtil.getStr(obj, "registeredCapitalStr"));
customer.setProvinceId(MapUtil.getInt(obj, "provinceId")); customer.setProvinceId(MapUtil.getInt(obj, "provinceId"));
customer.setCityId(MapUtil.getInt(obj, "cityId")); customer.setCityId(MapUtil.getInt(obj, "cityId"));
customer.setDistrictId(MapUtil.getInt(obj, "countyId")); customer.setDistrictId(MapUtil.getInt(obj, "countyId"));
......
dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseBussinessController.java
View file @ d0be8b75
...@@ -35,7 +35,7 @@ public class EnterpriseBussinessController { ...@@ -35,7 +35,7 @@ public class EnterpriseBussinessController {
@ApiOperation(value = "客户项目列表（openApi）") @ApiOperation(value = "客户项目列表（openApi）")
@RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST) @RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST)
public TableDataInfo clientProjectPage(@RequestBody EnterpriseBussinessClientProjectPageBody paramMap) throws Exception { public Map<String, Object> clientProjectPage(@RequestBody EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
return enterpriseBussinessService.clientProjectPage(paramMap); return enterpriseBussinessService.clientProjectPage(paramMap);
} }
...@@ -59,7 +59,7 @@ public class EnterpriseBussinessController { ...@@ -59,7 +59,7 @@ public class EnterpriseBussinessController {
@ApiOperation(value = "供应商项目列表（openApi）") @ApiOperation(value = "供应商项目列表（openApi）")
@RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST) @RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST)
public TableDataInfo supplierProjectPage(@RequestBody EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception { public Map<String, Object> supplierProjectPage(@RequestBody EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
return enterpriseBussinessService.supplierProjectPage(paramMap); return enterpriseBussinessService.supplierProjectPage(paramMap);
} }
......
dsk-operate-ui/src/api/radar/radar.js
View file @ d0be8b75
...@@ -15,6 +15,22 @@ let searchDic = function searchDic(param) { ...@@ -15,6 +15,22 @@ let searchDic = function searchDic(param) {
}) })
} }
// 关键词哎字段
let keywordList = function keywordList(param) {
return request({
url: '/radar/keywordList',
method: 'post',
})
}
// 标讯-来源网站下拉远程搜索
let bidSourceList = function bidSourceList(param) {
return request({
url: '/radar/bidSourceList',
method: 'post',
data: param
})
}
// 专项债项目查询 // 专项债项目查询
let bondProjectPage = function bondProjectPage(param) { let bondProjectPage = function bondProjectPage(param) {
return request({ return request({
...@@ -130,7 +146,46 @@ let bidNoticeProDetail = function bidNoticeProDetail(param) { ...@@ -130,7 +146,46 @@ let bidNoticeProDetail = function bidNoticeProDetail(param) {
data: param data: param
}) })
} }
// 公招标讯
let jskBidPage = function jskBidPage(param) {
return request({
url: 'radar/jskBidPage',
method: 'post',
data: param
})
}
// 公招标讯详情
let bidNoticeDetail = function bidNoticeDetail(param) {
return request({
url: '/enterpriseProject/bidNoticeDetail',
method: 'post',
data: param
})
}
// 开标记录查询
let jskBidTenderPage = function jskBidTenderPage(param) {
return request({
url: '/radar/jskBidTenderPage',
method: 'post',
data: param
})
}
// 开标记录详情
let tenderDetail = function tenderDetail(param) {
return request({
url: '/enterpriseBussiness/tenderDetail',
method: 'post',
data: param
})
}
// 开标记录详情列表
let tenderPage = function tenderPage(param) {
return request({
url: '/enterpriseBussiness/tenderPage',
method: 'post',
data: param
})
}
...@@ -150,5 +205,12 @@ export default { ...@@ -150,5 +205,12 @@ export default {
getCapitalSourceSelect, getCapitalSourceSelect,
bidPlanDetail, bidPlanDetail,
jskBidNewsPage, jskBidNewsPage,
bidNoticeProDetail bidNoticeProDetail,
keywordList,
bidSourceList,
jskBidPage,
bidNoticeDetail,
jskBidTenderPage,
tenderDetail,
tenderPage
} }
\ No newline at end of file
dsk-operate-ui/src/assets/styles/index.scss
View file @ d0be8b75
...@@ -307,11 +307,12 @@ ul, li { ...@@ -307,11 +307,12 @@ ul, li {
background: #F0F3FA; background: #F0F3FA;
} }
} }
.el-table__fixed{ .is-scrolling-left+.el-table__fixed,.is-scrolling-middle+.el-table__fixed,.is-scrolling-right+.el-table__fixed{
box-shadow:none; box-shadow:none;
height: auto !important; height: auto !important;
bottom: 12px; bottom: 16px;
} }
.caret-wrapper{ .caret-wrapper{
width: 10px; width: 10px;
} }
......
dsk-operate-ui/src/components/Keyword/index.vue
View file @ d0be8b75
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
</template> </template>
<script> <script>
import api from '@/api/radar/radar.js';
var debounce=function(fn, delay = 300) { var debounce=function(fn, delay = 300) {
var timer = null; var timer = null;
return function() { return function() {
...@@ -114,32 +115,36 @@ export default { ...@@ -114,32 +115,36 @@ export default {
this.content = this.keywordList[this.activeIndex].content this.content = this.keywordList[this.activeIndex].content
}, },
show(){ show(){
// this.$axios.post("/nationzj/project/keywordList").then(res=>{ api.keywordList().then(res => {
// if(res.data.code==200){ console.log(res);
// this.keywordList = res.data.data if(res.code==200){
// this.options = res.data.data this.keywordList = res.data
// // localStorage.setItem("keyword",JSON.stringify(res.data.data)) this.options = res.data
// this.content = this.keywordList[this.activeIndex].content; // localStorage.setItem("keyword",JSON.stringify(res.data.data))
// this.dialogVisible = true; this.content = this.keywordList[this.activeIndex].content;
// } this.dialogVisible = true;
// }) }
}).catch(error => {
});
this.dialogVisible = true; this.dialogVisible = true;
/*if(localStorage.getItem("keyword")){ if(localStorage.getItem("keyword")){
this.keywordList = JSON.parse(localStorage.getItem("keyword")); this.keywordList = JSON.parse(localStorage.getItem("keyword"));
this.options = this.keywordList; this.options = this.keywordList;
this.content = this.keywordList[this.activeIndex].content; this.content = this.keywordList[this.activeIndex].content;
this.dialogVisible = true; this.dialogVisible = true;
}else{ }else{
this.$axios.post("/nationzj/project/keywordList").then(res=>{ api.keywordList().then(res => {
if(res.data.code==200){ console.log(res);
this.keywordList = res.data.data if(res.code==200){
this.options = res.data.data this.keywordList = res.data
localStorage.setItem("keyword",JSON.stringify(res.data.data)) this.options = res.data
this.content = this.keywordList[this.activeIndex].content; localStorage.setItem("keyword",JSON.stringify(res.data.data))
this.dialogVisible = true; this.content = this.keywordList[this.activeIndex].content;
} this.dialogVisible = true;
}) }
}*/ }).catch(error => {
});
}
}, },
}, },
......
dsk-operate-ui/src/views/custom/customList/index.vue
View file @ d0be8b75
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card noborder"> <el-card class="box-card noborder">
<div class="tables"> <div class="tables">
<div class="empty" v-if="tableData.total==0 && isNew == true"> <div class="empty" v-if="tableData.total==0">
<img src="@/assets/images/project/empty.png"> <img src="@/assets/images/project/empty.png">
<div class="p1">添加你的第一位客户吧</div> <div class="p1">抱歉，没找到相关数据</div>
<div class="p2">抱歉，你还未添加客户，快去添加吧</div> <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
<div class="btn btn_primary h36 w88" @click="opennew">添加客户</div> <div class="btn btn_primary h36 w88" @click="opennew">添加客户</div>
<div class="btn btn_primary btn_shallow h36 w88" @click="pldrs">批量导入</div> <div class="btn btn_primary btn_shallow h36 w88" @click="pldrs">批量导入</div>
</div> </div>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<div class="btn btn_primary h32 p10" @click="opennew"><div class="img img1"></div>添加客户</div> <div class="btn btn_primary h32 p10" @click="opennew"><div class="img img1"></div>添加客户</div>
</div> </div>
</div> </div>
<el-table v-if="isNew != true || tableData.total > 0" <el-table v-if="tableData.total > 0"
:data="tableData.rows" :data="tableData.rows"
stripe border stripe border
style="width: 100%" style="width: 100%"
...@@ -287,7 +287,7 @@ export default { ...@@ -287,7 +287,7 @@ export default {
headers: { headers: {
Authorization: "Bearer " + getToken(), Authorization: "Bearer " + getToken(),
}, },
isNew:true, // isNew:true,
showlist:false, showlist:false,
} }
}, },
...@@ -325,7 +325,7 @@ export default { ...@@ -325,7 +325,7 @@ export default {
//翻页 //翻页
handleCurrentChange(val) { handleCurrentChange(val) {
this.pldr=false this.pldr=false
this.isNew = false // this.isNew = false
this.searchParam.pageNum=val this.searchParam.pageNum=val
this.getCustomerList() this.getCustomerList()
}, },
......
dsk-operate-ui/src/views/index.vue
View file @ d0be8b75
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<div class="main"> <div class="main">
<div class="amount"> <div class="amount">
<p> <p>
<span>产值目标（万元）</span> <span>产值目标(万元)</span>
<span>实际已完成(万元)</span> <span>实际已完成(万元)</span>
</p> </p>
<p> <p>
...@@ -547,7 +547,9 @@ export default { ...@@ -547,7 +547,9 @@ export default {
let option ={ let option ={
legend: { legend: {
x:'right', x:'right',
padding:[0,120,0,0], padding:[3,120,0,0],
itemHeight:8,
itemWidth:16,
}, },
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
...@@ -567,7 +569,7 @@ export default { ...@@ -567,7 +569,7 @@ export default {
type: 'value', type: 'value',
}, },
grid: { grid: {
top:35, top:40,
left:30, left:30,
right:10, right:10,
bottom:20, bottom:20,
...@@ -1036,8 +1038,8 @@ export default { ...@@ -1036,8 +1038,8 @@ export default {
} }
} }
.btn{ .btn{
width: 80%; width: 100%;
height: 64px; height: 60px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 4px; border-radius: 4px;
border: 1px solid #E6E6E9; border: 1px solid #E6E6E9;
...@@ -1045,6 +1047,7 @@ export default { ...@@ -1045,6 +1047,7 @@ export default {
line-height: 64px; line-height: 64px;
font-size: 14px; font-size: 14px;
margin-left: 0; margin-left: 0;
margin-right: 7px;
i{ i{
margin-right: 4px; margin-right: 4px;
} }
......
dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue
View file @ d0be8b75
...@@ -65,9 +65,9 @@ ...@@ -65,9 +65,9 @@
<div class="common-title">经济信息</div> <div class="common-title">经济信息</div>
<div class="content-box"> <div class="content-box">
<span><img src="@/assets/images/economies/icon_1.png">下属辖区 <label>{{recentlyYear.subordinateJurisdiction}}<i>个</i></label></span> <span><img src="@/assets/images/economies/icon_1.png">下属辖区 <label>{{recentlyYear.subordinateJurisdiction}}<i>个</i></label></span>
<span><img src="@/assets/images/economies/icon_2.png">城投平台 <label>{{recentlyYear.urbanInvestmentPlatform}}<i>亿</i></label></span> <span><img src="@/assets/images/economies/icon_2.png">城投平台 <label>{{recentlyYear.urbanInvestmentPlatform}}<i>家</i></label></span>
<span><img src="@/assets/images/economies/icon_3.png">城投平台授信余额 <label>{{recentlyYear.creditBalance}}<i>个</i></label></span> <span><img src="@/assets/images/economies/icon_3.png">城投平台授信余额 <label>{{recentlyYear.creditBalance}}<i>亿</i></label></span>
<span><img src="@/assets/images/economies/icon_4.png">城投平台营收账款 <label>{{recentlyYear.accountsReceivable}}<i>家</i></label></span> <span><img src="@/assets/images/economies/icon_4.png">城投平台营收账款 <label>{{recentlyYear.accountsReceivable}}<i>亿</i></label></span>
<span><img src="@/assets/images/economies/icon_5.png">城投平台有息债务 <label>{{recentlyYear.uipInterestBearingDebt}}<i>亿</i></label></span> <span><img src="@/assets/images/economies/icon_5.png">城投平台有息债务 <label>{{recentlyYear.uipInterestBearingDebt}}<i>亿</i></label></span>
</div> </div>
</div> </div>
......
dsk-operate-ui/src/views/macro/financing/index.vue
View file @ d0be8b75
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
:data="tableData" :data="tableData"
element-loading-text="Loading" element-loading-text="Loading"
border border
:summary-method="getSummaries"
show-summary show-summary
height="360" height="360"
fit fit
...@@ -51,11 +52,11 @@ ...@@ -51,11 +52,11 @@
<router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a" class="a-link">{{ scope.row.projectName}}</router-link> <router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a" class="a-link">{{ scope.row.projectName}}</router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="projectTotalInvestment" label="项目总投资（亿）" :formatter="formatStatus" sortable="custom" width="155" /> <el-table-column prop="projectTotalInvestment" label="项目总投资（亿）" :formatter="formatStatus" align="right" sortable="custom" width="155" />
<el-table-column prop="projectCapital" label="项目资本金（亿）" :formatter="formatStatus" sortable="custom" width="155" /> <el-table-column prop="projectCapital" label="项目资本金（亿）" :formatter="formatStatus" align="right" sortable="custom" width="155" />
<el-table-column prop="econData007" label="项目收益倍数（倍）" :formatter="formatStatus" sortable="custom" width="150" /> <el-table-column prop="econData007" label="项目收益倍数（倍）" :formatter="formatStatus" align="right" sortable="custom" width="150" />
<el-table-column prop="zxz" label="专项债金额（亿）" :formatter="formatStatus" sortable="custom" width="150" /> <!--<el-table-column prop="zxz" label="专项债金额（亿）" :formatter="formatStatus" sortable="custom" width="150" />-->
<el-table-column prop="specialBondCapital" label="专项债用作资本金（亿）" :formatter="formatStatus" width="170" /> <el-table-column prop="specialBondCapital" label="专项债用作资本金（亿）" align="right" sortable="custom" :formatter="formatStatus" width="170" />
<el-table-column prop="projectEntity" :formatter="formatStatus" label="项目主体"> <el-table-column prop="projectEntity" :formatter="formatStatus" label="项目主体">
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!--<router-link :to="'/macro/financing/details/'+ scope.row.projectEntityId" tag="a" class="a-link">{{ scope.row.projectEntity}}</router-link>--> <!--<router-link :to="'/macro/financing/details/'+ scope.row.projectEntityId" tag="a" class="a-link">{{ scope.row.projectEntity}}</router-link>-->
...@@ -226,7 +227,35 @@ export default { ...@@ -226,7 +227,35 @@ export default {
this.tableData=list; this.tableData=list;
}) })
}, },
getSummaries(param){
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
if (index === 3) {
sums[index] = '100';
return;
}
const values = data.map(item => Number(item[column.property]));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return Number(Number(prev) + Number(curr)).toFixed(3)
} else {
return prev;
}
}, 0);
if (index === 1) {
sums[index] = Number(sums[index]).toFixed(0);
return;
}
});
return sums;
},
// 重置页数 // 重置页数
handleSizeChange(val) { handleSizeChange(val) {
this.pageIndex = 1 this.pageIndex = 1
......
dsk-operate-ui/src/views/project/projectList/index.vue
View file @ d0be8b75
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
地区团队 地区团队
</span> </span>
<div class="select-popper"> <div class="select-popper">
<span :class="{ color_text:searchParam.provinceId.length ||searchParam.cityId.length ||searchParam.districtId.length,}"> <span :class="{ color_text:searchParam.provinceId.length ||searchParam.cityId.length ||searchParam.districtId.length}">
项目地区{{searchParam.provinceId.length ||searchParam.cityId.length ||searchParam.districtId.length? searchParam.provinceId.length +searchParam.cityId.length +searchParam.districtId.length +"项": ""}} 项目地区{{searchParam.provinceId.length ||searchParam.cityId.length ||searchParam.districtId.length? searchParam.provinceId.length +searchParam.cityId.length +searchParam.districtId.length +"项": ""}}
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
</span> </span>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
项目信息 项目信息
</span> </span>
<div class="select-popper"> <div class="select-popper">
<span class="color_text"> <span :class="{color_text:searchParam.projectType.length}">
项目类型{{searchParam.projectType.length? searchParam.projectType.length + "项": ""}} 项目类型{{searchParam.projectType.length? searchParam.projectType.length + "项": ""}}
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
</span> </span>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</el-dropdown> </el-dropdown>
</div> </div>
<div class="select-popper"> <div class="select-popper">
<span class="color_text"> <span :class="{color_text:searchParam.projectStage.length}">
项目阶段{{searchParam.projectStage.length? searchParam.projectStage.length + "项": ""}} 项目阶段{{searchParam.projectStage.length? searchParam.projectStage.length + "项": ""}}
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
</span> </span>
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
<div class="tables" v-if="total == 0"> <div class="tables" v-if="total == 0">
<div class="empty"> <div class="empty">
<img src="@/assets/images/project/empty.png"> <img src="@/assets/images/project/empty.png">
<div class="p1">添加你的第一个项目吧</div> <div class="p1">抱歉，没找到相关数据</div>
<div class="p2">抱歉，你还未添加项目，快去添加吧</div> <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
<div class="btn btn_primary h36 w88" @click="addNew(true)">新建商机</div> <div class="btn btn_primary h36 w88" @click="addNew(true)">新建商机</div>
<div class="btn btn_primary btn_shallow h36 w88" @click="pldrs">批量导入</div> <div class="btn btn_primary btn_shallow h36 w88" @click="pldrs">批量导入</div>
</div> </div>
......
dsk-operate-ui/src/views/radar/BidRecord/details.vue
View file @ d0be8b75
...@@ -4,21 +4,29 @@ ...@@ -4,21 +4,29 @@
<ul class="bottomlist-content"> <ul class="bottomlist-content">
<li class="bottomlist-list" > <li class="bottomlist-list" >
<p class="list-titel"> <p class="list-titel">
绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司) {{textList.name}}
<!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> -->
</p> </p>
<div class="content-label"> <div class="content-label">
<span class="list-label">市政工程</span> <span class="list-label list-label-zb" v-if="textList.province||textList.city||textList.district">
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.district">
-{{textList.district}}
</template>
</span>
</div> </div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>发布时间：</span> <span>发布时间：</span>
<span >2022-04-21</span> <span > {{textList.publishTime||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>来源网站：</span> <span>来源网站：</span>
<span>芜湖旭日</span> <span>{{textList.source||'--'}}</span>
</p> </p>
</div> </div>
...@@ -42,28 +50,43 @@ ...@@ -42,28 +50,43 @@
> >
<el-table-column label="序号" width="80"> <el-table-column label="序号" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
1 <span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投标单位" >
<el-table-column label="项目名称" >
<template slot-scope="scope"> <template slot-scope="scope">
通过 {{ scope.row.name||'--'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投标报价（万）" width="300" > <el-table-column label="投标报价（万）" width="300" >
<template slot-scope="scope"> <template slot-scope="scope">
老河口市发展和改革局 {{ scope.row.tenderOffer||'--'}}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<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> </div>
<div class="content main3"> <div class="content main3">
<div class="common-title">原文信息</div> <div class="common-title">原文信息</div>
<div class="list-content-img" @mouseenter="showimg=false" @mouseleave="showimg=true">
<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>
</span>
</div>
<div class="main3-box"> <div class="main3-box" v-html="textList.content">
</div> </div>
...@@ -77,26 +100,67 @@ ...@@ -77,26 +100,67 @@
<script> <script>
import "@/assets/styles/public.css"; import "@/assets/styles/public.css";
import {
encodeStr
} from "@/assets/js/common.js"
import api from '@/api/radar/radar.js';
export default { export default {
name: 'BidRecordDetails', name: 'BidRecordDetails',
data() { data() {
return { return {
id: '', id: '',
tableData: [{ tableData: [],
id: 0, "pageNum": 1,
name: '20重庆债14(2005938)', "pageSize": 10,
time: '2020-09-18', total: 0,
gm: '285.24', textList: {},
zj: '否', showimg:true
}]
} }
}, },
created() { created() {
console.log(this.$route.params) this.id = this.$route.params.id;
this.id = this.$route.params.id this.tenderPage();
this.tenderDetail();
}, },
methods: { methods: {
tenderDetail() {
api.tenderDetail({
id: this.id
}).then(res => {
// console.log(res);
this.textList = res.data;
console.log(this.textList);
}).catch(error => {
});
},
handleCurrentChange(pageNum) {
this.pageNum = pageNum;
this.search(pageNum, this.pageSize);
},
tenderPage(pageNum, pageSize) {
if (!pageNum) {
this.pageNum = 1;
}
if (!pageSize) {
this.pageSize = 20;
}
var data = {
cid: this.id,
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);
}).catch(error => {
});
}
} }
} }
...@@ -282,18 +346,44 @@ ...@@ -282,18 +346,44 @@
} }
.main3 { .main3 {
position: relative;
.main3-box { .main3-box {
margin-top: 22px; margin-top: 22px;
min-height: 400px; min-height: 400px;
border: 1px solid #D8D8D8; border: 1px solid #D8D8D8;
} }
.list-content-img{
position: absolute;
top: 16px;
right:14px ;
color: #0081FF;
display: flex;
align-items: center;
font-size: 14px;
cursor: pointer;
img{
width: 14px;
height: 14px;
margin-right: 4px;
}
}
.list-content-img:hover{
color: #0067CC;
}
} }
.main5 { .main5 {
.table-item { .table-item {
margin-top: 22px; margin-top: 22px;
} }
.pagination {
padding: 14px;
.el-pagination {
float: right;
}
}
} }
} }
</style> </style>
\ No newline at end of file
dsk-operate-ui/src/views/radar/Tender/details.vue
View file @ d0be8b75
...@@ -4,51 +4,60 @@ ...@@ -4,51 +4,60 @@
<ul class="bottomlist-content"> <ul class="bottomlist-content">
<li class="bottomlist-list" > <li class="bottomlist-list" >
<p class="list-titel"> <p class="list-titel">
绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司) {{textList.projectName}}
<!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> -->
</p> </p>
<div class="content-label"> <div class="content-label">
<span class="list-label">市政工程</span> <span class="list-label" v-if="textList.province||textList.city||textList.area">
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.area">
-{{textList.area}}
</template>
</span>
<span class="list-label list-label-zb" v-if="textList.businessType">
{{textList.businessType}}
</span>
<span class="list-label list-label-lx" v-if="textList.industry">
{{textList.industry}}
</span>
</div> </div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>招采单位：</span> <span>招采单位：</span>
<span class="blue">江西合胜合招标咨询有限公司</span> <span class="blue"> {{textList.tenderee||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>代理单位：</span> <span>代理单位：</span>
<span class="blue">江西合胜合招标咨询有限公司</span> <span class="blue">{{textList.agency||'--'}}</span>
</p> </p>
</div> </div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>预算金款：</span> <span>预算金款：</span>
<span>123,456,78万元</span> <span>{{textList.projectAmount||'--'}}万元</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>联系方式：</span> <span>联系方式：</span>
<span >招采单位 张工 123456789</span> <span >招采单位 {{textList.contact}}{{textList.contactTel}}</span>
</p> </p>
</div> </div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>发布时间：</span> <span>发布时间：</span>
<span >今日</span> <span >{{textList.issueTime||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>报名截止日期：</span> <span>报名截止日期：</span>
<span >2022-04-21</span> <span >{{textList.overTime||'--'}}</span>
</p>
<p class="list-content-text">
<span>开标时间：</span>
<span >2022-04-21</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>来源网站：</span> <span>来源网站：</span>
<span >赤峰市阿鲁科尔沁旗人民政府</span> <span >{{textList.dataSource||'--'}}</span>
</p> </p>
</div> </div>
...@@ -62,9 +71,11 @@ ...@@ -62,9 +71,11 @@
<div class="list-content-img" @mouseenter="showimg=false" @mouseleave="showimg=true"> <div class="list-content-img" @mouseenter="showimg=false" @mouseleave="showimg=true">
<img v-if="showimg" src="@/assets/images/bxpro/original1.png"> <img v-if="showimg" src="@/assets/images/bxpro/original1.png">
<img v-else src="@/assets/images/bxpro/original.png"> <img v-else src="@/assets/images/bxpro/original.png">
<span>原文链接</span> <span>
<a :href="textList.url">原文链接</a>
</span>
</div> </div>
<div class="main3-box"> <div class="main3-box" v-html="textList.content">
...@@ -77,27 +88,35 @@ ...@@ -77,27 +88,35 @@
<script> <script>
import "@/assets/styles/public.css"; import "@/assets/styles/public.css";
import api from '@/api/radar/radar.js';
export default { export default {
name: 'TenderDetails', name: 'TenderDetails',
data() { data() {
return { return {
id: '', id: '',
tableData: [{ textList:{},
id: 0,
name: '20重庆债14(2005938)',
time: '2020-09-18',
gm: '285.24',
zj: '否',
}],
showimg:true showimg:true
} }
}, },
created() { created() {
console.log(this.$route.params) this.id = this.$route.params.id;
this.id = this.$route.params.id this.bidNoticeDetail();
}, },
methods: { methods: {
bidNoticeDetail() {
api.bidNoticeDetail({
id: this.id
}).then(res => {
// console.log(res);
this.textList = res.data;
console.log(this.textList);
}).catch(error => {
});
},
} }
} }
...@@ -182,11 +201,22 @@ ...@@ -182,11 +201,22 @@
background: #F3F3FF; background: #F3F3FF;
color: #8491E8; color: #8491E8;
border-radius: 1px 1px 1px 1px; border-radius: 1px 1px 1px 1px;
margin-right: 12px;
padding: 3px 7px; padding: 3px 7px;
font-size: 12px; font-size: 12px;
} }
.list-label-zb{
font-weight: 400;
color: #5A88F9;
background: #E7EDFC;
}
.list-label-lx{
font-weight: 400;
color: #41A1FD;
background: #E4F3FD;
}
} }
...@@ -288,6 +318,7 @@ ...@@ -288,6 +318,7 @@
margin-top: 22px; margin-top: 22px;
min-height: 400px; min-height: 400px;
border: 1px solid #D8D8D8; border: 1px solid #D8D8D8;
padding: 16px;
} }
.list-content-img{ .list-content-img{
......
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue
View file @ d0be8b75
...@@ -8,15 +8,15 @@ ...@@ -8,15 +8,15 @@
placeholder="请输入项目名称关键字" v-model="keyword" ></el-input> placeholder="请输入项目名称关键字" v-model="keyword" ></el-input>
</div> </div>
</div> </div>
<div class="content_item"> <!-- <div class="content_item">
<div class="label">参投单位</div> <div class="label">参投单位</div>
<div class="content_right"> <div class="content_right">
<el-input class="ename_input" <el-input class="ename_input"
placeholder="请输入项目名称关键字" v-model="jskBidQueryDto.companyName" ></el-input> placeholder="请输入参投单位关键字" v-model="jskBidQueryDto.companyName" ></el-input>
</div> </div>
</div> </div> -->
<div class="content_item"> <div class="content_item">
<div class="label">项目名称</div> <div class="label">项目信息</div>
<div class="content_right"> <div class="content_right">
<div class="select-popper" > <div class="select-popper" >
<span :class="{color_text:jskBidQueryDto.province.length ||jskBidQueryDto.city.length ||jskBidQueryDto.county.length,}"> <span :class="{color_text:jskBidQueryDto.province.length ||jskBidQueryDto.city.length ||jskBidQueryDto.county.length,}">
...@@ -129,50 +129,34 @@ ...@@ -129,50 +129,34 @@
</div> </div>
</div> </div>
<ul class="bottomlist-content"> <ul class="bottomlist-content" v-if="tableData.length>0">
<li class="bottomlist-list" > <li class="bottomlist-list" v-for="item in tableData">
<p class="list-titel"> <p class="list-titel">
<router-link :to="'/radar/BidRecord/details/'+ 1" tag="a" class="list-titel-a" >绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)</router-link> <router-link :to="'/radar/BidRecord/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> </p>
<div class="content-label"> <div class="content-label">
<span class="list-label">市政工程</span> <span class="list-label list-label-zb" v-if="item.domicile">
{{item.domicile}}
</span>
</div> </div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>项目业主：</span> <span>开标时间：</span>
<span class="blue">芜湖旭日机械制造有限公司</span> <span>{{item.tenderTime||'--'}}</span>
</p>
<p class="list-content-text">
<span>审批部门：</span>
<span>芜湖旭日</span>
</p>
<p class="list-content-text">
<span>审批结果：</span>
<span>12345.62万</span>
</p>
<p class="list-content-text">
<span>审批结果：</span>
<span>2014-05-12</span>
</p>
<p class="list-content-text">
<span>总投资：</span>
<span>62654</span>
</p>
<p class="list-content-text">
<span>计划开工日期：</span>
<span>62654</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>计划完工日期：</span> <span>发布时间：</span>
<span>626</span> <span>{{item.punishDate||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>是否为向民间推介项目：</span> <span>来源网站：</span>
<span>62654</span> <span>{{item.source||'--'}}</span>
</p> </p>
</div> </div>
</li> </li>
...@@ -180,7 +164,7 @@ ...@@ -180,7 +164,7 @@
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>0">
<el-pagination <el-pagination
background background
:page-size="pageSize" :page-size="limit"
:current-page="page" :current-page="page"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
...@@ -194,6 +178,8 @@ ...@@ -194,6 +178,8 @@
<script> <script>
import jsk_data from '../../../../../public/jsk.json'; import jsk_data from '../../../../../public/jsk.json';
import {encodeStr} from "@/assets/js/common.js"
import api from '@/api/radar/radar.js';
export default { export default {
name: 'BidRecord', name: 'BidRecord',
data() { data() {
...@@ -223,8 +209,6 @@ export default { ...@@ -223,8 +209,6 @@ export default {
}, },
], ],
page: 1,
limit: 20,
punishDateOptions: [ punishDateOptions: [
{ {
label: "不限", label: "不限",
...@@ -261,7 +245,6 @@ export default { ...@@ -261,7 +245,6 @@ export default {
], ],
punishDateValue: "", punishDateValue: "",
jskBidQueryDto: { jskBidQueryDto: {
hasMoney:"",
province: [], province: [],
city: [], city: [],
county: [] county: []
...@@ -279,8 +262,8 @@ export default { ...@@ -279,8 +262,8 @@ export default {
tableData:[], tableData:[],
total:6000, total:6000,
page:1, page: 1,
pageSize:20 limit: 20,
}; };
}, },
computed: { computed: {
...@@ -403,20 +386,12 @@ export default { ...@@ -403,20 +386,12 @@ export default {
}, },
}, },
mounted() { mounted() {
if (this.$route.query.keyword) {
this.keyword = this.$route.query.keyword; this.addressListfn();
} this.search();
this.addressListfn();
}, },
methods: { methods: {
// 关键词推荐
cliclikeywoder() {
this.$refs.keyword.show();
},
keywordClick(val) {
this.keyword = val
},
refresh(value) { refresh(value) {
if(value) { if(value) {
this.$router.go(0) this.$router.go(0)
...@@ -454,8 +429,14 @@ export default { ...@@ -454,8 +429,14 @@ export default {
}else{ }else{
delete params.keywordNot delete params.keywordNot
} }
api.jskBidTenderPage(params).then(res=>{
this.$emit("search",params) if (res.code==200) {
this.tableData=res.data.list;
this.total=res.data.total;
}
}).catch(error=>{
});
}, },
//关闭支付弹窗 //关闭支付弹窗
......
dsk-operate-ui/src/views/radar/components/Tender/Select.vue
View file @ d0be8b75
...@@ -23,11 +23,7 @@ ...@@ -23,11 +23,7 @@
</template> </template>
<script> <script>
// import {_debounce} from "@/static/common.js" import api from '@/api/radar/radar.js';
// import URL from "@/api/businessOpportunities/tender";
var URL={
};
var debounce = function(fn, delay = 300) { var debounce = function(fn, delay = 300) {
var timer = null; var timer = null;
return function() { return function() {
...@@ -99,17 +95,18 @@ export default { ...@@ -99,17 +95,18 @@ export default {
if(this.inputValue){ if(this.inputValue){
params.keyword = this.inputValue; params.keyword = this.inputValue;
} }
this.$axios.post(URL.sourceSearch,params,{headers: { "Content-Type": "application/json" }}).then(res=>{ api.bidSourceList(params).then(res => {
if(res.data.code==200){ // console.log(res);
this.sourceNamelist = this.sourceNamelist.concat(res.data.data.list); if(res.code==200){
if(this.sourceNamelist.length>0&&this.sourceNamelist[0]!='不限'){ this.sourceNamelist = this.sourceNamelist.concat(res.data.list);
this.sourceNamelist.unshift("不限") if(this.sourceNamelist.length>0&&this.sourceNamelist[0]!='不限'){
} this.sourceNamelist.unshift("不限")
} }
this.loading = false }
}).catch(err=>{ this.loading = false
this.loading = false }).catch(error => {
}) this.loading = false
});
}, 500), }, 500),
// 下拉框出现时，调用过滤方法 // 下拉框出现时，调用过滤方法
visibleChange(flag) { visibleChange(flag) {
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ d0be8b75
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<el-input class="ename_input" v-model="keyword" <el-input class="ename_input" v-model="keyword"
placeholder="请输入项目名称、文章关键词，多关键词用空格隔开，如：房建 地基"></el-input> placeholder="请输入项目名称、文章关键词，多关键词用空格隔开，如：房建 地基"></el-input>
</div> </div>
</div> </div>
<div class="content_item"> <div class="content_item">
<div class="label">招采单位</div> <div class="label">招采单位</div>
...@@ -63,7 +63,7 @@ ...@@ -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 ref="address" class="cascader-region" v-model="addressType" :options="addressList":props="props" @change="domicileChange" collapse-tags clearable>
</el-cascader> </el-cascader>
</div> </div>
<el-dropdown @command="punishDatehandleCommand" trigger="click" ref="punishDateShowPopper":hide-on-click="false"> <el-dropdown @command="punishDatehandleCommand" trigger="click" class="el-dropdown-land" ref="punishDateShowPopper":hide-on-click="false">
<span class="el-dropdown-link" :class="punishDateValue ? 'color_text' : ''">发布时间{{ punishDateValue ? " 1项" : ""}} <span class="el-dropdown-link" :class="punishDateValue ? 'color_text' : ''">发布时间{{ punishDateValue ? " 1项" : ""}}
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
</span> </span>
...@@ -183,54 +183,61 @@ ...@@ -183,54 +183,61 @@
<span>导出EXCEL</span> <span>导出EXCEL</span>
</p> </p>
</div> </div>
<ul class="bottomlist-content"> <ul class="bottomlist-content" v-if="tableData.length>0">
<li class="bottomlist-list"> <li class="bottomlist-list" v-for="item in tableData">
<p class="list-titel"> <p class="list-titel">
<router-link :to="'/radar/Tender/details/'+ 1" tag="a" class="list-titel-a">轨道交通13号线扩能提升工程</router-link> <router-link :to="'/radar/Tender/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
</p> </p>
<div class="content-label"> <div class="content-label" v-if="item.tenderStage ||item.domicile ||item.tenderingManner ||item.projectType">
<span class="list-label">江西省-南昌市</span> <span class="list-label " v-if="item.tenderStage&&item.tenderStage!='其他'&&item.tenderStage!='空白'">
{{item.tenderStage}}
</span>
<span class="list-label list-label-zb" v-if="item.domicile">
{{item.domicile}}
</span>
<span class="list-label list-label-zb" v-if="item.tenderingManner&&item.tenderingManner!='其他'&&item.tenderingManner!='空白'">
{{ item.tenderingManner}}
</span>
<span class="list-label list-label-lx" v-if="item.projectType&&item.projectType!='其他'&&item.projectType!='空白'">
{{item.projectType}}
</span>
</div> </div>
<div class="list-content"> <div class="list-content" v-if="item.companyName||item.agency">
<p class="list-content-text"> <p class="list-content-text" v-if="item.companyName">
<span>招采单位：</span> <span>招采单位：</span>
<span class="blue">江西合胜合招标咨询有限公司</span> <span class="blue">{{item.companyName||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="item.agency">
<span>代理单位：</span> <span>代理单位：</span>
<span class="blue">江西合胜合招标咨询有限公司</span> <span class="blue">{{item.agency||'--'}}</span>
</p> </p>
</div> </div>
<div class="list-content"> <div class="list-content" v-if="item.bidMoney||item.contact">
<p class="list-content-text"> <p class="list-content-text" v-if="item.bidMoney">
<span>预算金款：</span> <span>预算金款：</span>
<span>123,456,78万元</span> <span>{{item.bidMoney||'--'}}万元</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="item.contact">
<span>联系方式：</span> <span>联系方式：</span>
<span >招采单位 张工 123456789</span> <span >招采单位{{item.contact}}{{item.contactTel}} </span>
</p> </p>
</div> </div>
<div class="list-content"> <div class="list-content" v-if="item.punishDate||item.overTime||item.source">
<p class="list-content-text"> <p class="list-content-text" v-if="item.punishDate">
<span>发布时间：</span> <span>发布时间：</span>
<span >今日</span> <span >{{item.punishDate||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="item.overTime">
<span>报名截止日期：</span> <span>报名截止日期：</span>
<span >2022-04-21</span> <span >{{item.overTime||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="item.source">
<span>开标时间：</span>
<span >2022-04-21</span>
</p>
<p class="list-content-text">
<span>来源网站：</span> <span>来源网站：</span>
<span >赤峰市阿鲁科尔沁旗人民政府</span> <span >{{item.source||'--'}}</span>
</p> </p>
</div> </div>
</li> </li>
...@@ -238,7 +245,7 @@ ...@@ -238,7 +245,7 @@
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>0">
<el-pagination <el-pagination
background background
:page-size="pageSize" :page-size="limit"
:current-page="page" :current-page="page"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
...@@ -256,6 +263,8 @@ ...@@ -256,6 +263,8 @@
<script> <script>
import Select from "./Select.vue"; import Select from "./Select.vue";
import jsk_data from '../../../../../public/jsk.json'; import jsk_data from '../../../../../public/jsk.json';
import {encodeStr} from "@/assets/js/common.js"
import api from '@/api/radar/radar.js';
export default { export default {
name: 'Tender', name: 'Tender',
...@@ -523,9 +532,7 @@ ...@@ -523,9 +532,7 @@
source: [], source: [],
phonePoint: [], phonePoint: [],
}, },
page: 1,
limit: 20,
pageFlag: true,
punishDate: "", punishDate: "",
punishDateShowPopper: false, punishDateShowPopper: false,
punishDateValue: "", punishDateValue: "",
...@@ -587,9 +594,12 @@ ...@@ -587,9 +594,12 @@
], ],
domicile: [], domicile: [],
conditionsArr: [], conditionsArr: [],
total: 6000,
total: 0,
page: 1, page: 1,
pageSize: 20 pageFlag: true,
tableData:[],
limit: 20
}; };
}, },
computed: { computed: {
...@@ -691,16 +701,8 @@ ...@@ -691,16 +701,8 @@
}, },
}, },
created() { created() {
// this.$axios.get('https://files.jiansheku.com/file/json/common/searchDic.json').then(res => { this.searchDic();
this.search();
// if (res && res.status == 200) {
// this.projectTypeOptions = res.data.projectType;
// this.subjectMatterOptions = res.data.subjectMatter
// }
// }).catch(error=>{
// 　　
// });
}, },
mounted() { mounted() {
...@@ -709,6 +711,15 @@ ...@@ -709,6 +711,15 @@
}, },
methods: { methods: {
searchDic(){
api.searchDic().then(res=>{
this.projectTypeOptions = res.data.projectType;
this.subjectMatterOptions = res.data.subjectMatter
}).catch(error=>{
});
},
//有无联系方式 //有无联系方式
phonePointBtn(e) { phonePointBtn(e) {
for (var i = 0; e.length > i; i++) { for (var i = 0; e.length > i; i++) {
...@@ -717,20 +728,6 @@ ...@@ -717,20 +728,6 @@
} }
} }
}, },
// 返回单条权限
permissionsJudge(permission, field, pilist) {
return permissionsJudge(permission, field, pilist);
},
goThrough(el, data) {
return goThrough(el, data, this);
},
permissionsField(tagName, permission) {
return permissionsField(tagName, permission);
},
refresh(value) { refresh(value) {
if (value) { if (value) {
this.$router.go(0) this.$router.go(0)
...@@ -757,6 +754,7 @@ ...@@ -757,6 +754,7 @@
data.subjectMatter = data.subjectMatter.join(","); data.subjectMatter = data.subjectMatter.join(",");
data.source = data.source.join(","); data.source = data.source.join(",");
data.phonePoint = data.phonePoint.join(","); data.phonePoint = data.phonePoint.join(",");
let params = { let params = {
page: { page: {
page: this.page, page: this.page,
...@@ -767,7 +765,15 @@ ...@@ -767,7 +765,15 @@
}; };
params.keyword = this.keyword; params.keyword = this.keyword;
params.keywordNot = this.keywordNot; params.keywordNot = this.keywordNot;
this.$emit("search", params)
api.jskBidPage(params).then(res=>{
if (res.code==200) {
this.tableData=res.data.list;
this.total=res.data.total;
}
}).catch(error=>{
});
}, },
selectedHeightfn() { selectedHeightfn() {
...@@ -781,18 +787,8 @@ ...@@ -781,18 +787,8 @@
Object.assign(this.$data, this.$options.data.call(this)); //重置data Object.assign(this.$data, this.$options.data.call(this)); //重置data
this.$refs.sourceNameSelect.selectValue = [] this.$refs.sourceNameSelect.selectValue = []
this.addressListfn(); this.addressListfn();
this.$axios.get('https://files.jiansheku.com/file/json/common/searchDic.json').then(res => { this.searchDic();
if (res && res.status == 200) {
this.projectTypeOptions = res.data.projectType;
this.subjectMatterOptions = res.data.subjectMatter
}
}).catch(error => {
});
this.search(); this.search();
this.$emit("reset");
}, },
handsequencingList(index) { handsequencingList(index) {
this.fieldshow = false; this.fieldshow = false;
...@@ -1261,7 +1257,7 @@ ...@@ -1261,7 +1257,7 @@
background: #F3F3FF; background: #F3F3FF;
color: #8491E8; color: #8491E8;
border-radius: 1px 1px 1px 1px; border-radius: 1px 1px 1px 1px;
margin-right: 12px;
padding: 3px 7px; padding: 3px 7px;
font-size: 12px; font-size: 12px;
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java
View file @ d0be8b75
package com.dsk.system.dskService; package com.dsk.system.dskService;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONUtil;
import com.dsk.common.core.domain.R; import com.dsk.common.core.domain.R;
import com.dsk.common.core.domain.model.*; import com.dsk.common.core.domain.model.*;
import com.dsk.common.core.page.TableDataInfo; import com.dsk.common.core.page.TableDataInfo;
import com.dsk.common.utils.DskOpenApiUtil; import com.dsk.common.utils.DskOpenApiUtil;
import org.apache.commons.collections4.MapUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map; import java.util.Map;
@Service @Service
...@@ -27,9 +30,17 @@ public class EnterpriseBussinessService { ...@@ -27,9 +30,17 @@ public class EnterpriseBussinessService {
} }
public TableDataInfo clientProjectPage(EnterpriseBussinessClientProjectPageBody body) throws Exception { public Map<String, Object> clientProjectPage(EnterpriseBussinessClientProjectPageBody body) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientProjectPage", BeanUtil.beanToMap(body, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientProjectPage", BeanUtil.beanToMap(body, false, false));
return dskOpenApiUtil.responsePage(map); Integer code = MapUtils.getInteger(map, "code", 300);
Map data = MapUtils.getMap(map, "data", null);
if (200 != code) throw new RuntimeException();
Integer count = MapUtils.getInteger(data, "totalCount", 0);
Object list = MapUtils.getObject(data, "list", "");
TableDataInfo tableDataInfo = new TableDataInfo((List<?>) list, count);
Map<String, Object> resMap = BeanUtil.beanToMap(tableDataInfo);
resMap.put("totalAmount", MapUtils.getDouble(data, "totalAmount", 0.0));
return resMap;
} }
...@@ -51,9 +62,18 @@ public class EnterpriseBussinessService { ...@@ -51,9 +62,18 @@ public class EnterpriseBussinessService {
} }
public TableDataInfo supplierProjectPage(EnterpriseBussinessSupplierProjectPageBody body) throws Exception { public Map<String, Object> supplierProjectPage(EnterpriseBussinessSupplierProjectPageBody body) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierProjectPage", BeanUtil.beanToMap(body, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierProjectPage", BeanUtil.beanToMap(body, false, false));
return dskOpenApiUtil.responsePage(map); log.info(JSONUtil.toJsonStr(map));
Integer code = MapUtils.getInteger(map, "code", 300);
Map data = MapUtils.getMap(map, "data", null);
if (200 != code) throw new RuntimeException();
Integer count = MapUtils.getInteger(data, "totalCount", 0);
Object list = MapUtils.getObject(data, "list", "");
TableDataInfo tableDataInfo = new TableDataInfo((List<?>) list, count);
Map<String, Object> resMap = BeanUtil.beanToMap(tableDataInfo);
resMap.put("totalAmount", MapUtils.getDouble(data, "totalAmount", 0.0));
return resMap;
} }
......
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