消息接口修改，招标界面调整

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

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

@@ -14,7 +14,6 @@ import com.uas.sso.common.util.HttpUtil.ResponseWrap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 
@@ -40,64 +39,48 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
     @Autowired
     private PagingReleaseDetailDao pagingReleaseDetailDao;
 
-    private static String PROD_URL = "http://113.105.74.140:8092/tigase/baiduPush";
+    private final 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";
+    private final static String DEV_URL = "http://192.168.253.222:8092/tigase/baiduPush";
 
     @Override
     public ModelMap getReleaseCounts(Long vendUseruu, Long venduu) {
         ModelMap map = new ModelMap();
-        String countSql = "select count(*) from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and prd.prd_totalstatus = 0";
-        Integer allCount = commonDao.queryForObject(countSql, Integer.class);
+        String typeSql = "select distinct(pr.pr_type) type from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_totalstatus = 0";
+        List<ReleaseTotal> typeList = commonDao.query(typeSql, ReleaseTotal.class);
+        String allCountSql = "select count(*) from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and prd.prd_totalstatus = 0";
+        Integer allCount = commonDao.queryForObject(allCountSql, Integer.class);
         String idSql = "select pr.pr_id from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and prd.prd_totalstatus = 0";
         List<Integer> ids = commonDao.queryForList(idSql, Integer.class);
-        String idString = new String();
+        String idString = "";
         for (Integer id : ids) {
             if (!"".equals(idString)) {
                 idString = idString.concat(",");
             }
             idString = idString.concat(String.valueOf(id));
         }
-        String title = "select a.pr_title " +
-                " from purc$pagingrelease a left join purc$pagingreleasedetail prd on a.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and not exists( " +
-                " select 1 from purc$pagingrelease b where b.pr_date>a.pr_date) and prd.prd_totalstatus = 0";
-        String date = "select a.pr_date " +
-                " from purc$pagingrelease a left join purc$pagingreleasedetail prd on a.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and not exists( " +
-                " select 1 from purc$pagingrelease b where b.pr_date>a.pr_date)  and prd.prd_totalstatus = 0";
-        String context = "select a.pr_context " +
-                " from purc$pagingrelease a left join purc$pagingreleasedetail prd on a.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and not exists( " +
-                " select 1 from purc$pagingrelease b where b.pr_date>a.pr_date)  and prd.prd_totalstatus = 0";
-        String type = "select a.pr_type " +
-                " from purc$pagingrelease a left join purc$pagingreleasedetail prd on a.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and not exists( " +
-                " select 1 from purc$pagingrelease b where b.pr_date>a.pr_date)  and prd.prd_totalstatus = 0";
-        List<ReleaseTotal> list = new ArrayList<>();
-        ReleaseTotal listdata = new ReleaseTotal();
-        List<String> dataTitles = commonDao.queryForList(title, String.class);  // 可能为0 或 1，所以用list装
-        if (!CollectionUtils.isEmpty(dataTitles)) {
-            String dataTitle = dataTitles.get(0);
-            listdata.setTitle(dataTitle);
-        }
-        List<Date> lastTimes = commonDao.queryForList(date, Date.class);
-        if (!CollectionUtils.isEmpty(lastTimes)) {
-            Date lastTime = lastTimes.get(0);
-            listdata.setLastTime(lastTime);
-        }
-        List<String> lastMessages = commonDao.queryForList(context, String.class);
-        if (!CollectionUtils.isEmpty(lastMessages)) {
-            String lastMessage = lastMessages.get(0);
-            listdata.setLastMessage(lastMessage);
-        }
-        List<String> dataTypes = commonDao.queryForList(type, String.class);
-        if (!CollectionUtils.isEmpty(dataTypes)) {
-//            String dataType = dataTypes.get(0);
-            listdata.setType("B2B"); // 暂时设置为b2b
-            listdata.setCount(allCount);
+
+        List<ReleaseTotal> listdata = new ArrayList<>();
+        for (ReleaseTotal onlyType : typeList) {
+            String type = onlyType.getType();
+            String countSql = "select count(*) from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and pr.pr_type = '" + type + "' and prd.prd_totalstatus = 0";
+            Integer count = commonDao.queryForObject(countSql, Integer.class);
+            if (count != 0) {
+                String totalSql = "select a.pr_title title,a.pr_date lastTime, a.pr_context lastMessage, a.pr_type type " +
+                        " from purc$pagingrelease a left join purc$pagingreleasedetail prd on a.pr_id = prd.prd_prid " +
+                        "where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and a.pr_type = '" + type + "' and prd.prd_totalstatus = 0 order by a.pr_date desc";
+                List<ReleaseTotal> totals = commonDao.query(totalSql, ReleaseTotal.class);
+                ReleaseTotal total = totals.get(0);
+                if (total != null) { // 存在即添加到list中
+                    total.setCount(count);
+                    listdata.add(total);
+                }
+            }
         }
-        list.add(listdata);
         map.put("allCount", allCount);
         map.put("success", true);
         map.put("ids", idString);
-        map.put("listdata", list);
+        map.put("listdata", listdata);
         return map;
     }
 
@@ -121,7 +104,7 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
         Integer allCount = commonDao.queryForObject(countSql, Integer.class);
         String idSql = "select pr.pr_id from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and pr.pr_type = '" + type + "' and prd.prd_status = 0";
         List<Integer> ids = commonDao.queryForList(idSql, Integer.class);
-        String idString = new String();
+        String idString = "";
         for (Integer id : ids) {
             if (!"".equals(idString)) {
                 idString = idString.concat(",");
@@ -237,11 +220,11 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
                     params.put("url", "");//跳转链接地址
                     params.put("pageTitle", releaseDetail.getPagingRelease().getTitle());//页面标题
                     params.put("platform", "B2B");//系统名称，ERP或
-                    ResponseWrap res = null;
                     try {
-                        res = HttpUtil.doPost(PROD_URL, params);
-                        if (!res.isSuccess())
+                        ResponseWrap res = HttpUtil.doPost(PROD_URL, params);
+                        if (!res.isSuccess()) {
                             throw new Exception(res.getContent());
+                        }
                     } catch (Exception e) {
                         e.printStackTrace();
                     }

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

@@ -48,7 +48,7 @@ public class PagingRelease implements Serializable {
     /**
      * 采购企业
      */
-    @OneToOne(cascade = { CascadeType.MERGE, CascadeType.REFRESH })
+    @OneToOne(cascade = CascadeType.REFRESH)
     @JoinColumn(name = "pr_enuu", insertable = false, updatable = false)
     private EnterpriseInfo enterprise;
 

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

@@ -47,7 +47,7 @@ public class PagingReleaseDetail implements Serializable{
     /**
      * 供应商企业
      */
-    @OneToOne(cascade = { CascadeType.MERGE, CascadeType.REFRESH })
+    @OneToOne(cascade = CascadeType.REFRESH)
     @JoinColumn(name = "prd_venduu", insertable = false, updatable = false)
     private EnterpriseInfo vendor;
 

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

@@ -41,7 +41,7 @@ public class PurchaseTenderProd implements Serializable {
     private String prodTitle;
 
     /**
-     * 物料型号
+     * 物料规格
      */
     @Column(name = "tp_prodspec")
     private String prodSpec;

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

@@ -163,7 +163,7 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
     /**
      * 投标企业基本信息
      */
-    @OneToOne(cascade = {CascadeType.REFRESH, CascadeType.MERGE, CascadeType.PERSIST})
+    @OneToOne(cascade = CascadeType.PERSIST)
     @JoinColumn(name = "st_venduu", insertable = false, updatable = false)
     private EnterpriseBaseInfo enterpriseBaseInfo;
 
@@ -186,6 +186,7 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
         this.setUser(tender.getUser());
         this.setUserTel(tender.getUserTel());
         this.setEnUU(tender.getEnUU());
+        this.setModified(new Date());
     }
 
     public SaleTender() {

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

@@ -308,6 +308,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
             if (null == enBaseInfo) {
                 Enterprise enterprise = enterpriseDao.findOne(vendUU);
                 enBaseInfo = new EnterpriseBaseInfo(enterprise.getUu(), enterprise.getEnBussinessCode(), enterprise.getEnName(), enterprise.getEnAddress());
+                enterpriseBaseInfoDao.save(enBaseInfo);
             }
             SaleTenderItem tenderItem = new SaleTenderItem();
             // 找不到投标单主表才新建一个
@@ -316,7 +317,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
                 if (null == saleTender) { // 不存在投标单说明未转投标单，进行新增投标单操作
                     saleTender = new SaleTender(tender);
                     saleTender.setVendUU(vendUU);
-                    saleTender.setEnterpriseBaseInfo(enBaseInfo); // 投标单主表构造完毕
+//                    saleTender.setEnterpriseBaseInfo(enBaseInfo); // 投标单主表构造完毕
                     saleTenderDao.save(saleTender);
                 }
                 tenderItem.setSaleTender(saleTender);

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

@@ -11047,7 +11047,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             date: new Date(),
             unit: 'PCS',
             currency: 'RMB',
-            ifOpen: 0,
+            ifOpen: 1,
             ifTax: 1,
             invoiceType: 2,
             tenderAttachs:[{}]
@@ -11423,6 +11423,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             // minDate = minDate.setDate(minDate.getDate() + 1);
             if ($scope.tender.endDate instanceof Date) {
                 var minDate = new Date($scope.tender.endDate.getTime() + 24*60*60*1000 + 1); // 不能选相同一天
+            } else {
+                var minDate = new Date($scope.tender.endDate + 24*60*60*1000 + 1); // 不能选相同一天
             }
             return $scope.tender.endDate ? $filter('date')(minDate, 'yyyy-MM-dd'):$filter('date')(new Date(), 'yyyy-MM-dd');
         };
@@ -11432,6 +11434,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             // maxDate = maxDate.setDate(maxDate.getDate() - 1);
             if ($scope.tender.publishDate instanceof Date) {
                 var maxDate = new Date($scope.tender.publishDate.getTime() - 1); // 不能选同一天
+            } else {
+                var maxDate = new Date($scope.tender.publishDate - 1); // 不能选同一天
             }
             return $scope.tender.publishDate ? $filter('date')(maxDate, 'yyyy-MM-dd'):"";
         };

src/main/webapp/resources/js/index/services/Fa.js

@@ -44,7 +44,8 @@ define([ 'ngResource'], function() {
 				isArray: true
 			},
 			getAllCustomers: {
-				url: 'sale/apCheck/getAllCustomers',
+				url: 'sale/apCheck/' +
+				'',
 				method: 'GET',
 				isArray: true
 			},

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

@@ -89,8 +89,7 @@
                     <div class="fr address">
                         <em>收货信息：</em>
                         <span class="fr" required="required">
-                             <select class="select fl" ng-model="order.shipadd" required="required"
-								ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
+                             <select class="select fl" ng-model="order.shipadd" required="required" ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
 								<option value="">请选择收货地址</option>
 							</select>
                             <a href="javascript:void(0);" class="add-address">+新增收货信息</a>

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

@@ -905,14 +905,14 @@ input[type="radio"], input[type="checkbox"] {
                 <div class="row vend-info">
                     <div class="col-xs-12">
                         <div class="tender-desc">是否开放报名：</div>
-                        <div class="input-select col-xs-4">
-                            <input  class="tender-input" name="ifOpen" type="radio" value="0" ng-model="tender.ifOpen"/>
-                            <span>只允许我邀请的供应商参与</span>
-                        </div>
                         <div class="input-select col-xs-4">
                             <input class="tender-input" name="ifOpen" type="radio" value="1" ng-click="removeChecked()" ng-model="tender.ifOpen"/>
                             <span>允许优软平台的供应商参与</span>
                         </div>
+                        <div class="input-select col-xs-4">
+                            <input  class="tender-input" name="ifOpen" type="radio" value="0" ng-model="tender.ifOpen"/>
+                            <span>只允许我邀请的供应商参与</span>
+                        </div>
                     </div>
                     <div class="col-xs-12" ng-show="tender.ifOpen == 0">
                         <a class="add-vendor tender-desc" ng-click="dbfindVendor()" href="javascript:void(0)">

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

@@ -210,6 +210,10 @@
     .tender-list02 .comment-oder-list dl dt span {
         text-align: center;
     }
+    .tender-list02 .comment-oder-list dl span a.active {
+        text-decoration: none;
+        color: #D32526;
+    }
 </style>
 
 <div class="ng-scope">
@@ -337,9 +341,9 @@
                         <div class="comment-oder-text">
                             <ul>
                                 <li class="list-unstyled">
-                                    <span><em style="width: 80px;">产品型号：</em><b>{{tenderProd.prodCode}}</b></span>
-                                    <span><em>产品名称：</em><b>{{tenderProd.prodTitle}}</b></span>
-                                    <span><em>品牌：</em><b>{{tenderProd.brand}}</b></span>
+                                    <span><em style="width: 80px;">产品型号：</em><b title="{{tenderProd.prodCode}}">{{tenderProd.prodCode}}</b></span>
+                                    <span><em>产品名称：</em><b title="{{tenderProd.prodTitle}}">{{tenderProd.prodTitle}}</b></span>
+                                    <span><em>品牌：</em><b title="{{tenderProd.brand}}">{{tenderProd.brand}}</b></span>
                                 </li>
                                 <li class="list-unstyled">
                                     <span><em style="width: 80px;">采购数量：</em><b>{{tenderProd.qty}}</b></span>
@@ -353,9 +357,9 @@
                                 <dt>
                                     <span class="wid01">投标供应商</span>
                                     <span>税率(% )</span>
-                                    <span><a class="" ng-click="changeOrder('price')" ng-disabled="tender.overdue != 1">单价<i class="fa fa-angle-down fa-lg" title="按最低单价排序"></i></a></span>
+                                    <span><a ng-class="{'active':orderType == 'price'}" ng-click="changeOrder('price')" ng-disabled="tender.overdue != 1">单价<i class="fa fa-angle-down fa-lg" title="按最低单价排序"></i></a></span>
                                     <span>含税金额</span>
-                                    <span><a class="" ng-click="changeOrder('cycle')" ng-disabled="tender.overdue != 1" title="按最短周期排序">采购周期<i class="fa fa-angle-down fa-lg"></i></a></span>
+                                    <span><a ng-class="{'active':orderType == 'cycle'}" ng-click="changeOrder('cycle')" ng-disabled="tender.overdue != 1" title="按最短周期排序">采购周期<i class="fa fa-angle-down fa-lg"></i></a></span>
                                     <span class="wid02">说明</span>
                                     <span>定标</span>
                                     <span>不定标</span>
@@ -370,9 +374,9 @@
                                         <a ng-show="tender.overdue == 1" ui-sref="sale.vendortender({vendUU:saleTenderItem.saleTender.enterpriseBaseInfo.uu, id:tender.id})" target="_self" title="查看投标单" >查看投标单
                                         </a>
                                     </span>
-                                    <span class="prod-number" ng-show="tender.overdue == 1">{{saleTenderItem.taxrate || 0}}</span>
-                                    <span class="prod-number" ng-show="tender.overdue == 1">{{saleTenderItem.price || 0}}</span>
-                                    <span class="prod-number" ng-show="tender.overdue == 1">{{saleTenderItem.price * tenderProd.qty  || 0 | number: 2}}</span>
+                                    <span class="prod-number" ng-show="tender.overdue == 1" title="{{saleTenderItem.taxrate}}">{{saleTenderItem.taxrate || 0}}</span>
+                                    <span class="prod-number" ng-show="tender.overdue == 1" title="{{saleTenderItem.price}}">{{saleTenderItem.price || 0 | number: 6}}</span>
+                                    <span class="prod-number" ng-show="tender.overdue == 1" title="{{saleTenderItem.price * tenderProd.qty  || 0 | number: 2}}">{{saleTenderItem.price * tenderProd.qty  || 0 | number: 2}}</span>
                                     <span class="prod-number" ng-show="tender.overdue == 1">{{saleTenderItem.cycle || 0}}</span>
                                     <span class="bid-desc" ng-show="tender.overdue != 1">*</span>
                                     <span class="bid-desc" ng-show="tender.overdue != 1">*</span>

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

@@ -223,7 +223,7 @@
                                     </ul>
                                 </div>
                                 <div class="form-group input-group input-group-xs input-trigger">
-                                    <input type="text" ng-model="condition.dateFrom"
+                                    <input type="text" ng-model="condition.dateFrom" ng-change="onSearch()"
                                            class="form-control" placeholder="从"
                                            datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
                                            ng-required="true"
@@ -238,7 +238,7 @@
 							</span>
                                 </div>
                                 <div class="form-group input-group input-group-xs input-trigger">
-                                    <input type="text" ng-model="condition.dateTo"
+                                    <input type="text" ng-model="condition.dateTo" ng-change="onSearch()"
                                            class="form-control" placeholder="到"
                                            datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
                                            ng-required="true"

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

@@ -537,7 +537,7 @@
                 </div>
                 <div class="col-xs-12" style="padding: 30px;">
                     <div ng-show="!currentHasBid" class="col-xs-2 pull-right btn-publish">
-                        <button class="btn" ng-click="iWantToBid(tender.id)" ng-disabled="hasClick || tender.overdue == 1" title="如果招标单已过期，将无法进入投标">我要投标</button>
+                        <button class="btn" ng-click="iWantToBid(tender.id)" ng-disabled="hasClick" ng-hide="tender.overdue == 1" title="如果招标单已过期，将无法进入投标">我要投标</button>
                     </div>
                     <div ng-show="currentHasBid" class="col-xs-2 pull-right btn-disabled">
                         <button class="btn" ng-disabled="disabled">已转投标</button>

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

@@ -196,9 +196,14 @@
     .tender-list dl dd:hover{border: #d32526 1px solid;}
     .tender-list dl dd span{height: 100px;line-height: 50px;display: inline-block;}
     .tender-list dl span{width:10.2%;font-size: 14px;float: left;text-align: center;}
+    .tender-list dl span.result{width:8.8%;font-size: 14px;float: left;text-align: center;}
+    .tender-list dl span.result-index{width:6.8%;font-size: 14px;float: left;text-align: center;}
     .tender-list dl span.wid01{width:25%;}
+    .tender-list dl span.wid01-result{width:20%; text-align: left;}
     .tender-list dl span.wid01 p{font-size: 14px;line-height: 22px;text-align: left;margin: 0;}
+    .tender-list dl span.wid01-result p{font-size: 14px;line-height: 22px;text-align: left;margin: 0;}
     .tender-list dl dd span.wid01{margin-top: 15px;}
+    .tender-list dl dd span.wid01-result{margin-top: 15px;}
     .tender-list .com_title01 em,.tender-list02 .com_title01 em{margin-left: 5px;font-size: 16px;color: #f00;position: relative;top: 3px;}
 
     /* 点击变输入框 */
@@ -293,7 +298,7 @@
                         <div class="tender-list">
                             <!--产品信息-->
                             <div class="com_title01"><span>产品信息</span><em>*</em></div>
-                            <dl>
+                            <dl ng-show = "bid.result != 1" >
                                 <dt>
                                     <span>序号</span>
                                     <span class="wid01">产品信息</span>
@@ -303,15 +308,13 @@
                                     <span>税率（%）</span>
                                     <span>单价</span>
                                     <span>含税金额</span>
-                                    <span ng-show = "bid.result == 1">评标结果</span>
-                                    <span ng-show = "bid.result == 1">评标说明</span>
                                 </dt>
                                 <dd ng-repeat="prod in bid.purchaseTenderProds | orderBy: 'index'">
                                     <span>{{$index + 1}}</span>
                                     <span class="wid01">
                                         <p>产品型号：{{prod.prodCode}}</p>
-                                        <p>产品类型：{{prod.prodTitle}}</p>
-                                        <p>品牌：<i ng-bind="prod.brand || ''" style="font-style: inherit"></i></p>
+                                        <p>产品名称：{{prod.prodTitle}}</p>
+                                        <p ng-show="prod.brand">品牌：<i ng-bind="prod.brand" style="font-style: inherit"></i></p>
                                     </span>
                                     <span ng-bind="prod.unit"></span>
                                     <span ng-bind="prod.qty"></span>
@@ -322,8 +325,39 @@
                                     <span><input type="text" class="editAble" ng-model="prod.currentItem.taxrate" ng-pattern="/^\+?[0-9][0-9]{0,1}$/" ng-change="validateProds(prod);validateThis(prod.currentItem.taxrate, 'taxrate')" ng-focus="validateThis(prod.currentItem.taxrate, 'taxrate');validateProds(prod);" ng-blur="validateThis(prod.currentItem.taxrate, 'taxrate');validateProds(prod);" 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(prod);" ng-blur="validateThis(prod.currentItem.price, 'price');validateProds(prod);" ng-focus="validateProds(prod);" placeholder="请输入单价"/></span>
                                     <span ng-bind="prod.currentItem.price * prod.qty || '' | number:2"></span>
-                                    <span  ng-show = "bid.result == 1" ng-bind="prod.currentItem.applyStatus == 1 ? '中标' : '未中标'"></span>
-                                    <span  ng-show = "bid.result == 1" ng-bind="prod.currentItem.description"></span>
+                                </dd>
+                            </dl>
+                            <dl ng-show = "bid.result == 1">
+                                <dt>
+                                    <span class="result-index">序号</span>
+                                    <span class="wid01-result">产品信息</span>
+                                    <span class="result">单位</span>
+                                    <span class="result">采购数量</span>
+                                    <span class="result">采购周期</span>
+                                    <span class="result">税率（%）</span>
+                                    <span class="result">单价</span>
+                                    <span class="result">含税金额</span>
+                                    <span class="result" ng-show = "bid.result == 1">评标结果</span>
+                                    <span class="result" ng-show = "bid.result == 1">评标说明</span>
+                                </dt>
+                                <dd ng-repeat="prod in bid.purchaseTenderProds | orderBy: 'index'">
+                                    <span class="result-index">{{$index + 1}}</span>
+                                    <span class="wid01-result">
+                                        <p>产品型号：{{prod.prodCode}}</p>
+                                        <p>产品名称：{{prod.prodTitle}}</p>
+                                        <p>品牌：{{prod.brand}}</p>
+                                    </span>
+                                    <span class="result" ng-bind="prod.unit"></span>
+                                    <span class="result" ng-bind="prod.qty"></span>
+                                    <!--<span><input type="text" class="editAble" ng-model="prod.currentItem.cycle" ng-pattern="/^\+?[1-9][0-9]*$/" ng-change="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="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="validateThis(prod.currentItem.price, 'price')" ng-focus="validPrice(prod.currentItem.price)" ng-blur="validPrice(prod.currentItem.price)" placeholder="点击填写单价"/></span>-->
+                                    <span class="result"><input readonly type="text" class="editAble" ng-model="prod.currentItem.cycle" ng-pattern="/^\+?[1-9][0-9]*$/" ng-change="validateProds(prod);validateThis(prod.currentItem.cycle, 'cycle')" ng-blur="validateThis(prod.currentItem.cycle, 'cycle');validateProds(prod);" ng-focus="validateThis(prod.currentItem.cycle, 'cycle');validateProds(prod);" placeholder="请输入周期"/></span>
+                                    <span class="result"><input readonly type="text" class="editAble" ng-model="prod.currentItem.taxrate" ng-pattern="/^\+?[0-9][0-9]{0,1}$/" ng-change="validateProds(prod);validateThis(prod.currentItem.taxrate, 'taxrate')" ng-focus="validateThis(prod.currentItem.taxrate, 'taxrate');validateProds(prod);" ng-blur="validateThis(prod.currentItem.taxrate, 'taxrate');validateProds(prod);" placeholder="请输入税率"/></span>
+                                    <span class="result"><input readonly 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(prod);" ng-blur="validateThis(prod.currentItem.price, 'price');validateProds(prod);" ng-focus="validateProds(prod);" placeholder="请输入单价"/></span>
+                                    <span class="result" ng-bind="prod.currentItem.price * prod.qty || '' | number:2"></span>
+                                    <span class="result" ng-bind="prod.currentItem.applyStatus == 1 ? '中标' : '未中标'"></span>
+                                    <span class="result" ng-bind="prod.currentItem.description"></span>
                                 </dd>
                             </dl>
                         </div>

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

@@ -272,7 +272,7 @@
                                     </ul>
                                 </div>
                                 <div class="form-group input-group input-group-xs input-trigger">
-                                    <input type="text" ng-model="condition.dateFrom"
+                                    <input type="text" ng-model="condition.dateFrom" ng-change="onSearch()"
                                            class="form-control" placeholder="从"
                                            datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
                                            ng-required="true"
@@ -287,7 +287,7 @@
 							</span>
                                 </div>
                                 <div class="form-group input-group input-group-xs input-trigger">
-                                    <input type="text" ng-model="condition.dateTo"
+                                    <input type="text" ng-model="condition.dateTo" ng-change="onSearch()"
                                            class="form-control" placeholder="到"
                                            datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
                                            ng-required="true"