| @@ -227,7 +227,7 @@ | |||||
| <td>{{value.biddingStartTime}}</td> | <td>{{value.biddingStartTime}}</td> | ||||
| <td>{{value.price}}</td> | <td>{{value.price}}</td> | ||||
| <td style="width: 5%;"> | <td style="width: 5%;"> | ||||
| {{if value.biddingType == '自由竞价' && value.projectShowStatus != '已经成交'}} | |||||
| {{if value.biddingType == '自由竞价' && value.projectShowStatus == '正在竞价'}} | |||||
| * | * | ||||
| {{else}} | {{else}} | ||||
| {{value.money}} | {{value.money}} | ||||
| @@ -185,7 +185,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t | |||||
| var biddingInformationData = template('biddingInformationData', module.data); | var biddingInformationData = template('biddingInformationData', module.data); | ||||
| $("#biddingInformationContent").html(biddingInformationData); | $("#biddingInformationContent").html(biddingInformationData); | ||||
| if (content.length > 0){ | if (content.length > 0){ | ||||
| if((module.data.outProjectInformationDetail.biddingType=='自由竞价'||module.data.outProjectInformationDetail.biddingType=='1')&&module.data.outProjectInformationDetail.projectShowStatus!='已经成交'){ | |||||
| if((module.data.outProjectInformationDetail.biddingType=='自由竞价'||module.data.outProjectInformationDetail.biddingType=='1')&&module.data.outProjectInformationDetail.projectShowStatus=='正在竞价'){ | |||||
| $("#biddingMoney").html('*'); | $("#biddingMoney").html('*'); | ||||
| $("#biddingPeople").html('*'); | $("#biddingPeople").html('*'); | ||||
| }else{ | }else{ | ||||
| @@ -106,7 +106,7 @@ | |||||
| <td>{{value.biddingStartTime}}</td> | <td>{{value.biddingStartTime}}</td> | ||||
| <td>{{value.price}}{{value.unit}}</td> | <td>{{value.price}}{{value.unit}}</td> | ||||
| <td> | <td> | ||||
| {{if (value.biddingType=='自由竞价' || value.biddingType=='1')&&value.projectShowStatus!='已经成交'}} | |||||
| {{if (value.biddingType=='自由竞价' || value.biddingType=='1')&&value.projectShowStatus=='正在竞价'}} | |||||
| * | * | ||||
| {{else}} | {{else}} | ||||
| {{value.money}}{{if value.money}}{{value.unit}}{{/if}} | {{value.money}}{{if value.money}}{{value.unit}}{{/if}} | ||||
| @@ -79,13 +79,13 @@ | |||||
| <div class="tableList" id="tableList" style="height: calc(100vh - 130px - 27vh)!important"> | <div class="tableList" id="tableList" style="height: calc(100vh - 130px - 27vh)!important"> | ||||
| <table width="100%;" id="biddingInformationContent" cellpadding="0" cellspacing="0" style="table-layout: fixed;"> | <table width="100%;" id="biddingInformationContent" cellpadding="0" cellspacing="0" style="table-layout: fixed;"> | ||||
| <script id="biddingInformationData" type="text/html"> | <script id="biddingInformationData" type="text/html"> | ||||
| {{if ((outProjectInformationDetail.biddingType=='自由竞价' || outProjectInformationDetail.biddingType=='1')&&outProjectInformationDetail.projectShowStatus=='已经成交') || (outProjectInformationDetail.biddingType!='自由竞价' && outProjectInformationDetail.biddingType!='1')}} | |||||
| {{if ((outProjectInformationDetail.biddingType=='自由竞价' || outProjectInformationDetail.biddingType=='1')&&outProjectInformationDetail.projectShowStatus!='正在竞价') || (outProjectInformationDetail.biddingType!='自由竞价' && outProjectInformationDetail.biddingType!='1')}} | |||||
| {{each biddinglistInformationDetail as value i}} | {{each biddinglistInformationDetail as value i}} | ||||
| <tr> | <tr> | ||||
| <td>{{value.memberId}}</td> | <td>{{value.memberId}}</td> | ||||
| <td>{{value.userAccount}}</td> | <td>{{value.userAccount}}</td> | ||||
| <td> | <td> | ||||
| {{if (outProjectInformationDetail.biddingType=='自由竞价' || outProjectInformationDetail.biddingType=='1')&&outProjectInformationDetail.projectShowStatus!='已经成交'}} | |||||
| {{if (outProjectInformationDetail.biddingType=='自由竞价' || outProjectInformationDetail.biddingType=='1')&&outProjectInformationDetail.projectShowStatus=='正在竞价'}} | |||||
| * | * | ||||
| {{else}} | {{else}} | ||||
| {{value.money}} | {{value.money}} | ||||
| @@ -264,7 +264,7 @@ | |||||
| <td>{{value.biddingStopSetime}}</td> | <td>{{value.biddingStopSetime}}</td> | ||||
| <td style="width: 5%;">{{value.price}}</td> | <td style="width: 5%;">{{value.price}}</td> | ||||
| <td style="width: 5%;"> | <td style="width: 5%;"> | ||||
| {{if value.biddingType=='自由竞价'&&value.projectShowStatus!='已经成交'}} | |||||
| {{if value.biddingType=='自由竞价'&&value.projectShowStatus=='正在竞价'}} | |||||
| * | * | ||||
| {{else}} | {{else}} | ||||
| {{value.money}} | {{value.money}} | ||||
| @@ -610,7 +610,7 @@ | |||||
| <script id="biddinglistInformationData" type="text/html"> | <script id="biddinglistInformationData" type="text/html"> | ||||
| <h1>·竞价记录</h1> | <h1>·竞价记录</h1> | ||||
| {{if ((outProjectInformationDetail.biddingType=='自由竞价' || outProjectInformationDetail.biddingType=='1')&&outProjectInformationDetail.projectShowStatus=='已经成交') || (outProjectInformationDetail.biddingType!='自由竞价' && outProjectInformationDetail.biddingType!='1')}} | |||||
| {{if ((outProjectInformationDetail.biddingType=='自由竞价' || outProjectInformationDetail.biddingType=='1')&&outProjectInformationDetail.projectShowStatus!='正在竞价') || (outProjectInformationDetail.biddingType!='自由竞价' && outProjectInformationDetail.biddingType!='1')}} | |||||
| <table cellspacing="0" cellpadding="0" width="100%" id="biddingTable"> | <table cellspacing="0" cellpadding="0" width="100%" id="biddingTable"> | ||||
| <tr> | <tr> | ||||
| <td>出价人代号</td> | <td>出价人代号</td> | ||||
| @@ -677,7 +677,7 @@ | |||||
| <td>{{value.projectName}}</td> | <td>{{value.projectName}}</td> | ||||
| <td>{{value.biddingStopTime}}</td> | <td>{{value.biddingStopTime}}</td> | ||||
| <td> | <td> | ||||
| {{if value.biddingType == '1' && value.projectShowStatus !='已经成交'}} | |||||
| {{if value.biddingType == '1' && value.projectShowStatus =='正在竞价'}} | |||||
| * | * | ||||
| {{else}} | {{else}} | ||||
| {{value.money}} | {{value.money}} | ||||