招标问题修改。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7696 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/PurchaseTenderController.java

@@ -14,7 +14,6 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
@@ -26,7 +25,6 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -590,8 +588,8 @@ public class PurchaseTenderController {
     @RequestMapping(value = "/latestTender", method = RequestMethod.GET)
     @ResponseBody
     public List<PurchaseTender> getLatestTender(PageParams params) {
-        PageInfo info = new PageInfo(params);
-        info.sorting("date", Direction.DESC); // 按发布日期倒序
+//        PageInfo info = new PageInfo(params);
+//        info.sorting("date", Direction.DESC); // 按发布日期倒序
         return purchaseTenderService.findAll();
     }
 
@@ -604,8 +602,8 @@ public class PurchaseTenderController {
     @RequestMapping(value = "/latestOpenTender", method = RequestMethod.GET)
     @ResponseBody
     public List<PurchaseTender> getLatestOpenTender(PageParams params) {
-        PageInfo info = new PageInfo(params);
-        info.sorting("date", Direction.DESC); // 按发布日期倒序
+//        PageInfo info = new PageInfo(params);
+//        info.sorting("date", Direction.DESC); // 按发布日期倒序
         return purchaseTenderService.findOpen();
     }
 

src/main/java/com/uas/platform/b2b/mobile/service/impl/MobileReleaseServiceImpl.java

@@ -40,7 +40,9 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
     @Autowired
     private PagingReleaseDetailDao pagingReleaseDetailDao;
 
-    private static String URL = "http://113.105.74.140:8092/tigase/baiduPush";
+    private static String PROD_URL = "http://113.105.74.140:8092/tigase/baiduPush";
+
+    private static String DEV_URL = "http://192.168.253.222:8092/tigase/baiduPush";
 
     @Override
     public ModelMap getReleaseCounts(Long vendUseruu, Long venduu) {
@@ -231,12 +233,12 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
                 params.put("content", releaseDetail.getPagingRelease().getContext());//正文
                 params.put("enUU", String.valueOf(releaseDetail.getVendUU()));//UU号
 //                params.put("masterId", masterId);//账套ID
-                params.put("url", "http://uas.ubtob.com/#/sale/order");//跳转链接地址
+                params.put("url", "");//跳转链接地址
                 params.put("pageTitle", releaseDetail.getPagingRelease().getTitle());//页面标题
                 params.put("platform", "B2B");//系统名称，ERP或
                 ResponseWrap res = null;
                 try {
-                    res = HttpUtil.doPost(URL, params);
+                    res = HttpUtil.doPost(PROD_URL, params);
                     if (!res.isSuccess())
                         throw new Exception(res.getContent());
                 } catch (Exception e) {

src/main/java/com/uas/platform/b2b/model/PurchaseTender.java

@@ -87,7 +87,7 @@ public class PurchaseTender implements Serializable {
     private Date publishDate;
 
     /**
-     * 状态
+     * 状态（待发布，待投标，待评标，已结标）
      */
     @Column(name = "pt_status")
     private String status;

src/main/java/com/uas/platform/b2b/service/impl/PurchaseTenderServiceImpl.java

@@ -174,7 +174,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
         for (SaleTender saleTender : saleTenders) {
             // 理论上根据企业uu和单号可以找到唯一单据，防止数据出错，取list第一个
             PurchaseTender purchaseTender = purchaseTenderDao.findByEnUUAndCode(saleTender.getEnUU(), saleTender.getCode()).get(0);
-            if (purchaseTender.getIfOpen() == Constant.NO && purchaseTender.getIsPublish() == Constant.YES) {
+            if (purchaseTender.getIfOpen() == Constant.NO && purchaseTender.getIsPublish() == Constant.YES && purchaseTender.getStatus().equals("待投标")) { //显示发布的待投标状态的指定招标
                 tenderList.add(purchaseTender);
             }
         }
@@ -189,7 +189,8 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
                 Predicate p1 = builder.equal(root.get("ifOpen"), Constant.YES);
                 Predicate p2 = builder.equal(root.get("isPublish"), Constant.YES);
                 Predicate p3 = builder.notEqual(root.get("enUU"), SystemSession.getUser().getEnterprise().getUu());
-                Predicate predicate = builder.and(p1,p2,p3);
+                Predicate p4 = builder.notEqual(root.get("status"), "待投标");
+                Predicate predicate = builder.and(p1,p2,p3,p4);
                 query.where(predicate);
                 return null;
             }
@@ -326,6 +327,8 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
         enterpriseBaseInfoDao.save(enBaseInfo);
         SaleTender saleTender = tenderItems.get(0).getSaleTender();
         saleTender.setStatus("已投标");
+        PurchaseTender purchaseTender = purchaseTenderDao.findByEnUUAndCode(saleTender.getEnUU(), saleTender.getCode()).get(0);
+        purchaseTender.setStatus("待评标");
         Set<Attach> attachSet = new HashSet<>();
         if (!CollectionUtils.isEmpty(attaches)) {
             attachSet.addAll(attaches);

src/main/webapp/resources/js/index/app.js

@@ -1321,10 +1321,28 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
     app.controller('TenderCtrl', ['$scope', 'SnapshotService', function($scope, SnapshotService){
         SnapshotService.getTender(250, function(data){
             $scope.tenders = data;
+            var newDate = new Date();
+            newDate = newDate.setDate(newDate.getDate() - 3);
+            angular.forEach($scope.tenders, function(tender) {
+                if (tender.date > newDate) {
+                    tender.isNew = true;
+                } else {
+                    tender.isNew = false;
+                }
+            });
         });
 
         SnapshotService.getOpenTender(250, function(data){
             $scope.openTenders = data;
+            var newDate = new Date();
+            newDate = newDate.setDate(newDate.getDate() - 3);
+            angular.forEach($scope.openTenders, function(tender) {
+                if (tender.date > newDate) {
+                    tender.isNew = true;
+                } else {
+                    tender.isNew = false;
+                }
+            });
         });
 
         $scope.dateTime = new Date();
@@ -10193,7 +10211,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 
         // 查看范例
         $scope.showImg = function() {
-            var src = "static/img/eg/uploadByBatch_example.png", box = $('#image-box');
+            var src = "static/img/eg/uploadTenderProducts_example.png", box = $('#image-box');
             box.show();
             box.find('img').attr('src', src);
             box.find('a').click(function(){

src/main/webapp/resources/tpl/index/home/left.html

@@ -101,6 +101,7 @@
 			<ul class="list-unstyled detail">
 				<li ng-repeat="tender in tenders | orderBy : - date">
 					<a ui-sref="sale.tender({id:tender.id})" class="text-light" ng-bind="::tender.title"></a>
+					<span ng-show="tender.isNew"><img src="static/img/home/newTender.png"></span>
 				</li>
 				<li ng-show="tenders == null || tenders == ''" class="grey">
 					您还未收到客户的招标信息！
@@ -116,6 +117,7 @@
 			<ul class="list-unstyled detail">
 				<li ng-repeat="tender in openTenders | orderBy : - date">
 					<a ui-sref="sale.tender({id:tender.id})" class="text-light" ng-bind="::tender.title"></a>
+					<span ng-show="tender.isNew"><img src="static/img/home/newTender.png"></span>
 				</li>
 				<li ng-show="tenders == null || tenders == ''" class="grey">
 					未找到公开的招标信息！

src/main/webapp/resources/tpl/index/purc/tender_evaluation.html

@@ -328,8 +328,8 @@
                         <div class="comment-oder-text">
                             <ul>
                                 <li class="list-unstyled">
-                                    <span><em>产品名称：</em><b>{{tenderProd.prodTitle}}</b></span>
                                     <span><em>产品型号：</em><b>{{tenderProd.prodCode}}</b></span>
+                                    <span><em>产品名称：</em><b>{{tenderProd.prodTitle}}</b></span>
                                     <span><em>品牌：</em><b>{{tenderProd.brand}}</b></span>
                                 </li>
                                 <li class="list-unstyled">
@@ -343,7 +343,7 @@
                             <dl>
                                 <dt>
                                     <span class="wid01">投标供应商</span>
-                                    <span>税率</span>
+                                    <span>税率(% )</span>
                                     <span><a class="change01" ng-click="changeOrder('price')" style="margin-top: 8px;">单价s<i class="fa fa-angle-down fa-lg" title="按最低单价排序"></i></a></span>
                                     <span>含税金额</span>
                                     <span><a class="change01" ng-click="changeOrder('cycle')" style="margin-top: 8px;" title="按最短周期排序">采购周期<i class="fa fa-angle-down fa-lg"></i></a></span>
@@ -357,7 +357,10 @@
                                     </div>
                                 </dd>
                                 <dd ng-repeat="saleTenderItem in tenderProd.saleTenderItems | orderBy: orderType">
-                                    <span class="wid01">{{saleTenderItem.saleTender.enterpriseBaseInfo.enName}}<a ui-sref="sale.vendortender({vendUU:item.enterpriseBaseInfo.uu, id:tender.id})" target="_self" title="查看投标单">查看投标单</a></span>
+                                    <span class="wid01">{{saleTenderItem.saleTender.enterpriseBaseInfo.enName}}
+                                        <a ng-disabled="tender.overdue != 1" ui-sref="sale.vendortender({vendUU:item.enterpriseBaseInfo.uu, id:tender.id})" target="_self" title="查看投标单" >查看投标单
+                                        </a>
+                                    </span>
                                     <span>{{saleTenderItem.taxrate || 0}}</span>
                                     <span>{{saleTenderItem.price || 0}}</span>
                                     <span>{{saleTenderItem.price * tenderProd.qty || 0}}</span>
@@ -377,7 +380,7 @@
                                 ng-hide="tender.result == 1"
                                 ng-click="submit(tender)">确定
                         </button>
-                        <!--<div><i class="fa fa-info-circle"></i><span style="font-family: 'Microsoft Yahei Regular'; font-size: 12px; color: #969595;">评标时间为投标截止时间之后，公布结果时间之前</span></div>-->
+                        <div><i class="fa fa-info-circle"></i><span style="font-family: 'Microsoft Yahei Regular'; font-size: 12px; color: #969595;">投标截止之后，才可进行评标</span></div>
                     </div>
                 </div>
             </div>

src/main/webapp/resources/tpl/index/purc/tender_vendor.html

@@ -37,7 +37,7 @@
         <tr class="header">
             <th>序号</th>
             <th>UU</th>
-            <th>客户名称</th>
+            <th>供应商名称</th>
             <th>地址</th>
             <th><input type="checkbox" name="checkbox" ng-model="checks.checked" ng-click="checkAll()"></th>
         </tr>

src/main/webapp/resources/tpl/index/purc/tenderlist.html

@@ -3,6 +3,7 @@
     .top-nav {
         margin-bottom: 10px;
     }
+
     .top-nav #search_input {
         height: 36px;
         font-size: 14px;
@@ -32,7 +33,7 @@
 
     /* 选项菜单 招标单按钮*/
     .div-menu .text-num {
-        color: rgb(211,37,38);
+        color: rgb(211, 37, 38);
         padding: 0 5px;
     }
 
@@ -75,16 +76,18 @@
     }
 
     .div-menu .btn-select:hover {
-         border-bottom: 2px solid #D32526;
+        border-bottom: 2px solid #D32526;
     }
+
     .div-menu .btn-select:focus {
         border-bottom: 2px solid #D32526;
     }
+
     .div-menu .btn-select:first-child {
         margin-left: 10px;
-     }
+    }
 
-    .div-menu>div:first-child .btn {
+    .div-menu > div:first-child .btn {
         font-size: 16px;
     }
 
@@ -92,35 +95,43 @@
     .tender-table {
         text-align: center;
     }
+
     .tender-table .header {
         height: 50px;
         background-color: #fff;
-        color: rgb(50,50,50);
+        color: rgb(50, 50, 50);
         border-bottom: 1px solid #969595;
     }
-    .tender-table .header>th {
+
+    .tender-table .header > th {
         text-align: center;
     }
-    .tender-table>tbody {
+
+    .tender-table > tbody {
         font-size: 14px;
         color: #323232;
         border: 1px solid transparent;
     }
-    .tender-table>tbody>tr:nth-child(odd) {
+
+    .tender-table > tbody > tr:nth-child(odd) {
         height: 100px;
     }
-    .tender-table tbody>tr:nth-child(odd):hover {
+
+    .tender-table tbody > tr:nth-child(odd):hover {
         border: 2px solid #D32526;
 
     }
+
     .tender-table tbody tr td a {
         color: #327ebe;
     }
-   .main-content  .btn-group{
-       font-family: "Microsoft YaHei", "微软雅黑";
-       font-weight: 500;
-   }
-    .main-content  .btn-group button{
+
+    .main-content .btn-group {
+        font-family: "Microsoft YaHei", "微软雅黑";
+        font-weight: 500;
+    }
+
+    .main-content .btn-group button {
         font-weight: inherit;
     }
 </style>
@@ -131,7 +142,8 @@
             <span>服务>采购模块></span><span style="color: #327EBE;">招标</span>
         </div>
         <div class="input-group search-group col-xs-4">
-            <input id="search_input" type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入招标信息" />
+            <input id="search_input" type="search" class="form-control input-sm" ng-model="keyword"
+                   ng-search="onSearch()" placeholder="输入招标信息"/>
             <span class="input-group-btn">
             <button id="search_btn" class="btn btn-selected x-rss-btn x-background-whiteblue" ng-click="onSearch()">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>
         </span>
@@ -139,28 +151,33 @@
     </div>
     <div class="block main-content">
         <div class="loading in" ng-class="{'in': loading}">
-        <i></i>
+            <i></i>
         </div>
         <!-- 选项菜单和新增按钮 -->
         <div class="block">
             <div class="row div-menu">
-                <div class="col-xs-8" style="width: 766px; height: 40px; font-size: 16px; font-weight: 600; font-family: 'Microsoft Yahei Regular'; color: #000000;">
+                <div class="col-xs-8"
+                     style="width: 766px; height: 40px; font-size: 16px; font-weight: 600; font-family: 'Microsoft Yahei Regular'; color: #000000;">
                     <div class="btn-group menu-status">
                         <div class="btn-group">
                             <button type="button" class="btn btn-select"
-                                    ng-class="{'btn-selected':active=='all'}" ng-click="setActive('all')">全部</button>
+                                    ng-class="{'btn-selected':active=='all'}" ng-click="setActive('all')">全部
+                            </button>
                         </div>
                         <div class="btn-group">
                             <button type="button" class="btn btn-select"
-                                    ng-class="{'btn-selected':active=='done'}" ng-click="setActive('done')">待评标</button>
+                                    ng-class="{'btn-selected':active=='done'}" ng-click="setActive('done')">待评标
+                            </button>
                         </div>
                         <div class="btn-group">
                             <button type="button" class="btn btn-select"
-                                    ng-class="{'btn-selected':active=='todo'}" ng-click="setActive('todo')">待投标</button>
+                                    ng-class="{'btn-selected':active=='todo'}" ng-click="setActive('todo')">待投标
+                            </button>
                         </div>
                         <div class="btn-group">
                             <button type="button" class="btn btn-select"
-                                    ng-class="{'btn-selected':active=='waiting'}" ng-click="setActive('waiting')">待发布</button>
+                                    ng-class="{'btn-selected':active=='waiting'}" ng-click="setActive('waiting')">待发布
+                            </button>
                         </div>
                     </div>
                     <div class="col-xs-1 pull-right" style="padding-top: 5px;">
@@ -170,7 +187,8 @@
                 <!--<div class="col-xs-2 toggle">
                     <a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
                 </div>-->
-                <div class="col-xs-2 pull-right" style="padding-left: 0;padding-right: 15px; border-left: 16px solid #f5f5f5;">
+                <div class="col-xs-2 pull-right"
+                     style="padding-left: 0;padding-right: 15px; border-left: 16px solid #f5f5f5;">
                     <a ui-sref="purc.tender" type="button" title="新增招标单" class="btn btn-tender">
                         <img src="resources/img/tender/zhaobiao.png">
                         <span class="f16" style="color: #327EBE;">招标单</span>
@@ -232,14 +250,14 @@
         </div>
         <table class="tender-table block" ng-table="tableParams">
             <thead>
-                <tr class="header">
-                    <th width="150">招标标题</th>
-                    <th width="200">产品信息</th>
-                    <th width="150">采购数量</th>
-                    <th width="150">投标截止时间</th>
-                    <th width="150">公布结果时间</th>
-                    <th width="150">状态</th>
-                </tr>
+            <tr class="header">
+                <th width="150">招标标题</th>
+                <th width="200">产品信息</th>
+                <th width="150">采购数量</th>
+                <th width="150">投标截止时间</th>
+                <th width="150">公布结果时间</th>
+                <th width="150">状态</th>
+            </tr>
             <!-- <tr class="toolbar toolbar-top">
                  <td colspan="5">
                      <div>
@@ -269,28 +287,28 @@
             </thead>
             <tbody ng-if="tableParams.total() == 0">
             <tr>
-            <td colspan="6">
-            <div class="row text-muted info-container" style="padding: 50px 10px;">
-            <div class="col-md-4 text-center">
-            <br>
-            <br>
-            <div><img src="static/img/all/info.png" width="130px" height="90px"></div>
-            <div class="f16">当前没有对应的招标单！</div>
-            </div>
-            <div class="col-md-8 br-l">
-            <div class="f16">
-            <p>为什么我没有招标单？</p>
-            </div>
-            <div class="f14">
-            <div class="info">
-            <p>您还没有发布招标单,请新增招标单并发布。</p>
-            </div>
-            </div>
-            <br>
-            <br>
-            </div>
-            </div>
-            </td>
+                <td colspan="6">
+                    <div class="row text-muted info-container" style="padding: 50px 10px;">
+                        <div class="col-md-4 text-center">
+                            <br>
+                            <br>
+                            <div><img src="static/img/all/info.png" width="130px" height="90px"></div>
+                            <div class="f16">当前没有对应的招标单！</div>
+                        </div>
+                        <div class="col-md-8 br-l">
+                            <div class="f16">
+                                <p>为什么我没有招标单？</p>
+                            </div>
+                            <div class="f14">
+                                <div class="info">
+                                    <p>您还没有发布招标单,请新增招标单并发布。</p>
+                                </div>
+                            </div>
+                            <br>
+                            <br>
+                        </div>
+                    </div>
+                </td>
             </tr>
             </tbody>
             <!--<tbody ng-repeat="order in $data track by order.id">
@@ -300,65 +318,67 @@
                 </tr>
             </tbody>-->
             <tbody ng-repeat="tender in $data">
-                <tr>
-                    <td width="150">
-                        <div>
-                            <a ng-if="tender.isPublish == 1" ui-sref="purc.evaluation({id:tender.id})" target="_self" title="点击查看详情">
-                                {{tender.code}}
-                            </a>
-                            <a ng-if="tender.isPublish != 1" ui-sref="purc.savedtender({id:tender.id})" target="_self" title="点击查看详情">
-                                {{tender.code}}
-                            </a>
-                        </div>
-                        <div>
-                            {{tender.title}}
-                        </div>
-                        <div>
-                            招标类型:
-                            <span ng-if="tender.ifOpen == 1" style="font-weight: 600;">公开招标</span>
-                            <span ng-if="tender.ifOpen == 0" style="font-weight: 600;">指定招标</span>
-                        </div>
-                    </td>
-                    <td width="200">
-                        <div>产品名称：{{tender.prodTitle}}</div>
-                        <!--<div>产品规格：{{tender.prodSpec}}</div>-->
-                        <div>产品所属行业：电子元器件</div>
-                    </td>
-                    <td width="150">{{tender.qty}}</td>
-                    <td width="150">{{tender.endDate | date:'yyyy-MM-dd'}}</td>
-                    <td width="150">{{tender.publishDate | date:'yyyy-MM-dd'}}</td>
-                    <td width="150">
-                        <div ng-if = "tender.status == '已结标'">
-                            <img src="resources/img/tender/yijiebiao.png">
-                        </div>
-                        <div ng-if = "tender.status == '待评标' && tender.overdue == 1 && tender.result == 1">
-                            <img src="resources/img/tender/liubiao.png">
-                        </div>
-                        <div ng-if = "tender.status == '待评标' && tender.overdue == 1 && tender.result != 1">
-                            <img src="resources/img/tender/daipingbiao.png">
-                        </div>
-                        <div ng-if = "tender.status == '待评标' && tender.overdue != 1">
-                            <img src="resources/img/tender/toubiaozhong.png">
-                        </div>
-                        <!-- overdue与投标截止日期比较  result与公布结果日期比较 -->
-                        <div ng-if = "tender.status == '待投标' && tender.overdue != 1">
-                            <img src="resources/img/tender/daitoubiao.png">
-                        </div>
-                        <div ng-if = "tender.status == '待投标' && tender.overdue == 1">
-                            <img src="resources/img/tender/liubiao.png">
-                        </div>
-                        <div ng-if = "tender.status == '待发布'">
-                            <img src="resources/img/tender/zailuru.png">
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="6">
-                        <div style="height: 16px; background-color: #f5f5f5;">
-                            <!-- 间隙 -->
-                        </div>
-                    </td>
-                </tr>
+            <tr>
+                <td width="150">
+                    <div>
+                        <a ng-if="tender.isPublish == 1" ui-sref="purc.evaluation({id:tender.id})" target="_self"
+                           title="点击查看详情">
+                            {{tender.code}}
+                        </a>
+                        <a ng-if="tender.isPublish != 1" ui-sref="purc.savedtender({id:tender.id})" target="_self"
+                           title="点击查看详情">
+                            {{tender.code}}
+                        </a>
+                    </div>
+                    <div>
+                        {{tender.title}}
+                    </div>
+                    <div>
+                        招标类型:
+                        <span ng-if="tender.ifOpen == 1" style="font-weight: 600;">公开招标</span>
+                        <span ng-if="tender.ifOpen == 0" style="font-weight: 600;">指定招标</span>
+                    </div>
+                </td>
+                <td width="200">
+                    <div>产品名称：{{tender.prodTitle}}</div>
+                    <!--<div>产品规格：{{tender.prodSpec}}</div>-->
+                    <div>产品所属行业：电子元器件</div>
+                </td>
+                <td width="150">{{tender.qty}}</td>
+                <td width="150">{{tender.endDate | date:'yyyy-MM-dd'}}</td>
+                <td width="150">{{tender.publishDate | date:'yyyy-MM-dd'}}</td>
+                <td width="150">
+                    <div ng-if="tender.status == '已结标'">
+                        <img src="resources/img/tender/yijiebiao.png">
+                    </div>
+                    <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result == 1">
+                        <img src="resources/img/tender/liubiao.png">
+                    </div>
+                    <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result != 1">
+                        <img src="resources/img/tender/daipingbiao.png">
+                    </div>
+                    <div ng-if="tender.status == '待评标' && tender.overdue != 1">
+                        <img src="resources/img/tender/toubiaozhong.png">
+                    </div>
+                    <!-- overdue与投标截止日期比较  result与公布结果日期比较 -->
+                    <div ng-if="tender.status == '待投标' && tender.overdue != 1">
+                        <img src="resources/img/tender/daitoubiao.png">
+                    </div>
+                    <div ng-if="tender.status == '待投标' && tender.overdue == 1">
+                        <img src="resources/img/tender/liubiao.png">
+                    </div>
+                    <div ng-if="tender.status == '待发布'">
+                        <img src="resources/img/tender/zailuru.png">
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="6">
+                    <div style="height: 16px; background-color: #f5f5f5;">
+                        <!-- 间隙 -->
+                    </div>
+                </td>
+            </tr>
             </tbody>
         </table>
     </div>

src/main/webapp/resources/tpl/index/sale/tender.html

@@ -319,7 +319,7 @@
                                     <span><input type="text" class="editAble" ng-model="prod.currentItem.price" ng-pattern="/^(0|[0-9][0-9]{0,9})(\.[0-9]{1,6})?$/" ng-change="validateThis(prod.currentItem.price, 'price')" ng-focus="validPrice(prod.currentItem.price)" ng-blur="validPrice(prod.currentItem.price)" placeholder="点击填写单价"/></span>-->
                                     <span><input type="text" class="editAble" ng-model="prod.currentItem.cycle" ng-pattern="/^\+?[1-9][0-9]*$/" ng-change="validateProds(bid.purchaseTenderProds);validateThis(prod.currentItem.cycle, 'cycle')" placeholder="点击填写周期"/></span>
                                     <span><input type="text" class="editAble" ng-model="prod.currentItem.taxrate" ng-pattern="/^\+?[0-9][0-9]{0,1}$/" ng-change="validateProds(bid.purchaseTenderProds);validateThis(prod.currentItem.taxrate, 'taxrate')" placeholder="点击填写税率"/></span>
-                                    <span><input type="text" class="editAble" ng-model="prod.currentItem.price" ng-pattern="/^(0|[0-9][0-9]{0,9})(\.[0-9]{1,6})?$/" ng-change="validateProds(bid.purchaseTenderProds);validateThis(prod.currentItem.price, 'price')" placeholder="点击填写单价"/></span>
+                                    <span><input type="text" class="editAble" ng-model="prod.currentItem.price" ng-pattern="/^(0|[0-9][0-9]{0,9})(\.[0-9]{1,6})?$/" ng-change="validateProds(bid.purchaseTenderProds);" ng-blur="validateThis(prod.currentItem.price, 'price')" placeholder="点击填写单价"/></span>
                                     <span ng-bind="prod.currentItem.price * prod.qty || ''"></span>
                                 </dd>
                             </dl>