@@ -342,19 +391,20 @@
{{each biddingHallListList as value i}}
{{value.projectName}} |
- {{value.biddingType}} |
+ {{value.biddingType}} |
{{value.signupStopTime}} |
{{value.biddingStartTime}} |
- {{value.price}} |
-
+ | {{value.price}} |
+
{{if value.biddingType=='自由竞价'&&value.timeType=='进行中'}}
*
{{else}}
{{value.money}}
{{/if}}
|
- {{value.projectShowStatus}} |
-
+ | {{value.unit}} |
+ {{value.projectShowStatus}} |
+
{{if value.projectShowStatus == '正在报名'}}{{/if}}
{{if value.projectShowStatus == '正在竞价'}}{{/if}}
{{if value.projectShowStatus == '等待竞价'}}{{/if}}
diff --git a/static/js/api/index.js b/static/js/api/index.js
index 6b36922..fa0bab9 100644
--- a/static/js/api/index.js
+++ b/static/js/api/index.js
@@ -157,3 +157,17 @@ var itemsList = '/transaction/website/outproject/list'
projectNumber:项目类型字典value值(下拉框选择)
*/
var needProjectList = '/transaction/website/needproject/list'
+
+/*
+@purl /transaction/website/tender/publicity/{deptId}
+@param
+ deptId:行政区划部门ID
+*/
+var tenderList = '/transaction/website/tender/publicity'//招标公告列表
+
+/*
+@purl /transaction/website/win/publicity/{deptId}
+@param
+ deptId:行政区划部门ID
+*/
+var winList = '/transaction/website/win/publicity'//中标公告列表
diff --git a/static/js/project/index.js b/static/js/project/index.js
index 4222663..0a3ad44 100644
--- a/static/js/project/index.js
+++ b/static/js/project/index.js
@@ -181,6 +181,9 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
//土地挂牌价格走势统计图
// tools.doGet(statistics, {deptId: 100}, module.statisticsContent, true);
+ tools.doGet(tenderList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.inviteTendersInformation,true);
+ tools.doGet(winList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.winTheBiddingInformation,true);
+
//竞价大厅-滚动
module.hallRolling();
setTimeout(function(){
@@ -190,6 +193,60 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
};
+ //招标公告数据
+ module.inviteTendersInformation = function (data) {
+ if (data.code == 200) {
+ var content = data.rows;
+ var pageCount = (data.total/module.data.pageSize).toFixed(0);
+ if (pageCount < 1){
+ pageCount = 1;
+ }
+ if(module.data.inviteTendersInformationList == ''){
+ // 初始化 分页器
+ var page_s1=createPage('.page_s3');
+ // 设置分页
+ setPage(page_s1,{
+ pageTotal: data.toqtal, // 数据总条数
+ pageSize: module.data.pageSize, // 每页显示条数
+ pageCurrent: 1, // 当前页
+ maxBtnNum: 5, // 最多按钮个数 (最少5个)
+ })
+ $('#page_s3').html('共'+pageCount+'页')
+ }
+ module.data.pageCount = pageCount;
+ module.data.inviteTendersInformationList = content;
+ var inviteTendersInformationData = template('inviteTendersInformationData', module.data);
+ $("#inviteTendersInformationContent").html(inviteTendersInformationData);
+ }
+ }
+
+ //中标公告数据
+ module.winTheBiddingInformation = function (data) {
+ if (data.code == 200) {
+ var content = data.rows;
+ var pageCount = (data.total/module.data.pageSize).toFixed(0);
+ if (pageCount < 1){
+ pageCount = 1;
+ }
+ if(module.data.winTheBiddingInformationList == ''){
+ // 初始化 分页器
+ var page_s1=createPage('.page_s4');
+ // 设置分页
+ setPage(page_s1,{
+ pageTotal: data.total, // 数据总条数
+ pageSize: module.data.pageSize, // 每页显示条数
+ pageCurrent: 1, // 当前页
+ maxBtnNum: 5, // 最多按钮个数 (最少5个)
+ })
+ $('#page_s4').html('共'+pageCount+'页')
+ }
+ module.data.pageCount = pageCount;
+ module.data.winTheBiddingInformationList = content;
+ var winTheBiddingInformationData = template('winTheBiddingInformationData', module.data);
+ $("#winTheBiddingInformationContent").html(winTheBiddingInformationData);
+ }
+ }
+
//主题图片切换
module.switchTheme = function(){
if(themeColor == 'red'){
@@ -745,8 +802,12 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
document.getElementById('cjgg').style.display = 'none';
document.getElementById('jzgg').style.display = 'none';
+ document.getElementById('zbgg').style.display = 'none';
+ document.getElementById('zbjg').style.display = 'none';
document.getElementById('cjggBtn').className = '';
document.getElementById('jzggBtn').className = '';
+ document.getElementById('zbggBtn').className = '';
+ document.getElementById('zbjgBtn').className = '';
document.getElementById(type).style.display = 'block';
document.getElementById(type+'Btn').className = 'active';
diff --git a/view/announcement/announcement.html b/view/announcement/announcement.html
index 50ff88c..452a31a 100644
--- a/view/announcement/announcement.html
+++ b/view/announcement/announcement.html
@@ -115,7 +115,7 @@
{{# value.projectCode}}
{{# value.projectName}}
- {{# value.dealMoneySum}}
+ {{# value.dealMoneySum}}{{# value.unit}}
{{# value.dealTime.substr(0,10)}}
{{/each}}
@@ -134,7 +134,7 @@
{{# value.projectCode}}
{{# value.projectName}}
- {{# value.dealMoneySum}}
+ {{# value.dealMoneySum}}{{# value.unitName}}
{{# value.jzsSignDate}}
{{/each}}
diff --git a/view/bidding/biddingList.html b/view/bidding/biddingList.html
index b3dfaad..5c628c6 100644
--- a/view/bidding/biddingList.html
+++ b/view/bidding/biddingList.html
@@ -192,13 +192,14 @@
项目名称 |
- 竞价方式 |
+ 竞价方式 |
报名结束时间 |
竞价结束时间 |
- 标的底价 |
- 当前报价 |
- 竞价状态 |
- 操作 |
+ 标的底价 |
+ 当前报价 |
+ 价格单位 |
+ 竞价状态 |
+ 操作 |
@@ -206,19 +207,20 @@
{{each biddingInformationList as value i}}
|
{{value.projectName}} |
- {{value.biddingType}} |
+ {{value.biddingType}} |
{{value.signupStopTime}} |
{{value.biddingStopTime}} |
- {{value.price}} |
-
+ | {{value.price}} |
+
{{if value.biddingType=='自由竞价'&&value.timeType!='已结束'}}
*
{{else}}
{{value.money}}
{{/if}}
|
- {{value.projectShowStatus}} |
-
+ | {{value.unit}} |
+ {{value.projectShowStatus}} |
+
{{if value.projectShowStatus == '正在报名'}}{{/if}}
{{if value.projectShowStatus == '正在竞价'}}{{/if}}
{{if value.projectShowStatus == '等待竞价'}}{{/if}}
|