处理bug

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

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

@@ -536,7 +536,6 @@ public class PurchaseTenderController {
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
-        pageParams.getFilters().put("pt_status", "待投标");
         pageParams.getFilters().put("pt_overdue", Constant.NO);
         return searchService.searchPurcTenderIds(keyword, pageParams);
     }

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

@@ -417,7 +417,19 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
      */
     @Override
     public void decide(PurchaseTender purchaseTender) {
-        purchaseTender.setStatus("已结标");
+        boolean isApply = false;
+        for (PurchaseTenderProd tenderProd : purchaseTender.getPurchaseTenderProds()) {
+            for (SaleTenderItem tenderItem : tenderProd.getSaleTenderItems()) {
+                if (tenderItem.getApplyStatus() == Constant.YES) {
+                    isApply = true; // 只要有定标的明细，就确认状态为已结标
+                }
+            }
+        }
+        if (isApply) {
+            purchaseTender.setStatus("已结标");
+        } else {
+            purchaseTender.setStatus("流标");
+        }
         for (PurchaseTenderProd tenderProd : purchaseTender.getPurchaseTenderProds()) {
             tenderProd.setTender(purchaseTender);
             purchaseTenderProdDao.save(tenderProd);

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

@@ -3398,6 +3398,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 
         };
 
+        // 单反选
+        $scope.unCheckOne = function(vendor) {
+            vendor.checked = false;
+
+        };
+
         $scope.close = function(){
             var vendors = [];
             angular.forEach($scope.tableParams.data, function(vendor) {
@@ -10573,7 +10579,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 
         // 保存和发布招标单
         $scope.save = function(isPublish){
-            if (!$scope.tender.ifOpen && !$scope.tenderProd.enterpriseBaseInfo) { // 指定供应商招标，而未选择供应商时
+            if (!$scope.tender.ifOpen && (!$scope.tenderProd.enterpriseBaseInfo || $scope.tenderProd.enterpriseBaseInfo.length == 0)) { // 指定供应商招标，而未选择供应商时
                 toaster.pop('info','提示','请先指定供应商');
             } else {
                 $scope.loading = true;

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

@@ -118,7 +118,7 @@
 		</div>
 		<div class="pane-body">
 			<ul class="list-unstyled detail">
-				<li ng-repeat="tender in tenders | orderBy : - date">
+				<li ng-repeat="tender in tenders | orderBy : - date ">
 					<!--<span ng-show="tender.isNew"><img src="static/img/home/newTender.png"></span>-->
 					<a ui-sref="sale.tender({id:tender.id})" class="text-light" ng-bind="::tender.title"></a>
 				</li>

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

@@ -420,6 +420,8 @@
         position: absolute;
         top: 8.5px;
         right: -7px;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
     }
     .dropdown-menu {
         min-width: 150px;
@@ -558,7 +560,7 @@
                             <div class="com_title01"><span>产品明细</span><a ng-click="uplodaByBatch()">批量导入</a></div>
                             <dl>
                                 <dt>
-                                    <span>序号</span>
+                                    <span style="width: 90px;">序号</span>
                                     <span class="wid01">型号</span>
                                     <span class="wid01">产品名称</span>
                                     <span class="wid02">品牌</span>
@@ -568,7 +570,7 @@
                                 </dt>
                                 <div class="scroll-y">
                                     <dd ng-repeat="prod in tenderProd" id="li01">
-                                        <span>{{$index + 1}}</span>
+                                        <span style="width: 90px;">{{$index + 1}}</span>
                                         <span class="wid01 codeInput">
                                             <input type="text" name="code" ng-model="prod.prodCode" ng-change="getSimilarCodes(prod.prodCode)" ng-focus="onFocus('code')" placeholder="请输入标准原厂型号" typeahead="prod.code for prod in getSimilarCodes($viewValue)" autocomplete="off" typeahead-on-select="onAssociateCmpClick($item, prod)" spellcheck = "false" required>
                                         </span>
@@ -594,8 +596,8 @@
                                                 </div>
                                             </div>
                                         </span>
-                                        <span><input type="text" ng-model="prod.unit" placeholder="点击填入单位" required/></span>
-                                        <span><input type="text" ng-model="prod.qty" ng-pattern="/^\+?[1-9][0-9]*$/" placeholder="点击填入数量" required/></span>
+                                        <span class="codeInput"><input type="text" ng-model="prod.unit" placeholder="点击填入单位" required/></span>
+                                        <span class="codeInput" style="margin-left: 4px;"><input type="text" ng-model="prod.qty" ng-pattern="/^\+?[1-9][0-9]*$/" placeholder="点击填入数量" required/></span>
                                         <span class="wid03"><a ng-click="del($index)"><i class="fa fa-close"></i></a></span>
                                     </dd>
                                 </div>

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

@@ -193,7 +193,13 @@
         font-style: normal;
     }
 
+    .prod-number { /* 数字居右 */
+        text-align: right;
+    }
 
+    .tender-list02 .comment-oder-list dl dt span {
+        text-align: center;
+    }
 </style>
 
 <div class="ng-scope">
@@ -354,10 +360,10 @@
                                         <a ng-show="tender.overdue == 1" ui-sref="sale.vendortender({vendUU:saleTenderItem.saleTender.enterpriseBaseInfo.uu, id:tender.id})" target="_self" title="查看投标单" >查看投标单
                                         </a>
                                     </span>
-                                    <span ng-show="tender.overdue == 1">{{saleTenderItem.taxrate || 0}}</span>
-                                    <span ng-show="tender.overdue == 1">{{saleTenderItem.price || 0}}</span>
-                                    <span ng-show="tender.overdue == 1">{{saleTenderItem.price * tenderProd.qty | number: 2}}</span>
-                                    <span ng-show="tender.overdue == 1">{{saleTenderItem.cycle || 0}}</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">{{saleTenderItem.cycle || 0}}</span>
                                     <span class="bid-desc" ng-show="tender.overdue != 1">*</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/tender_vendor.html

@@ -49,9 +49,12 @@
             <td class="text-center" ng-bind="::vendor.vendorEnterprise.enName"></td>
             <td class="text-center" ng-bind="::vendor.vendorEnterprise.enAddress"></td>
            <!-- <td class="text-center"><input type="checkbox" ng-click="check(vendor)"></td>-->
-            <td class="text-center"><input ng-model="vendor.checked"
+            <td class="text-center" ng-show="!vendor.checked"><input ng-model="vendor.checked"
                                            name="checkbox" ng-click="checkOne(vendor)"
                                           type="checkbox"></td>
+            <td class="text-center" ng-show="vendor.checked"><input ng-model="vendor.checked"
+                                                                     name="checkbox" ng-click="unCheckOne(vendor)"
+                                                                     type="checkbox"></td>
             <!--<td class="text-center"><a title="选择" href="javascript:void(0)" ng-click="check(vendor)"><i class="fa fa-check-square-o"></i></a></td>-->
         </tr>
         </tbody>

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

@@ -421,22 +421,15 @@
                     <div ng-if="tender.status == '已结标'">
                         <img src="resources/img/tender/yijiebiao.png">
                     </div>
-                    <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result == 1">
+                    <div ng-if="(tender.status == '待评标' && tender.overdue == 1 && tender.result == 1) || (tender.status == '待投标' && tender.overdue == 1) || tender.status == '流标'"> <!-- 没人报、报了到期没评、评了没有采纳 -->
                         <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">
+                    <div ng-if="(tender.status == '待评标' && tender.overdue != 1) || (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/toubiaozhong.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>

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

@@ -316,9 +316,9 @@
                                     <!--<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><input type="text" class="editAble" ng-model="prod.currentItem.cycle" ng-pattern="/^\+?[1-9][0-9]*$/" ng-change="validateProds(prod);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(prod);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(prod);" ng-blur="validateThis(prod.currentItem.price, 'price')" placeholder="点击填写单价"/></span>
+                                    <span><input 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="validateProds(prod);validateThis(prod.currentItem.cycle, 'cycle')" ng-focus="validateProds(prod);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(prod);validateThis(prod.currentItem.taxrate, 'taxrate')" ng-focus="validateProds(prod);validateThis(prod.currentItem.taxrate, 'taxrate')" ng-blur="validateProds(prod);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(prod);" ng-blur="validateThis(prod.currentItem.price, 'price')" ng-focus="validateThis(prod.currentItem.price, 'price')" 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>
@@ -379,7 +379,7 @@
                     </div>
                     <div class = "col-xs-4">
                         <div class="bid-desc">员工人数：</div>
-                        <input class="bid-input" ng-model="currentEnBaseInfo.emNum" type="text" ng-change="validateThis(currentEnBaseInfo.emNum, 'emNum')" ng-pattern="/^\+?[1-9][0-9]*$/" />
+                        <input class="bid-input" ng-model="currentEnBaseInfo.emNum" type="text" ng-change="validateThis(currentEnBaseInfo.emNum, 'emNum')" ng-focus="validateThis(currentEnBaseInfo.emNum, 'emNum')" ng-blur="validateThis(currentEnBaseInfo.emNum, 'emNum')" ng-pattern="/^\+?[1-9][0-9]*$/" />
                     </div>
                     <div class = "col-xs-4">
                         <div class="bid-desc">企业电话：</div>

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

@@ -418,30 +418,15 @@
                 <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 = "getTenderStatus(tender) == 'daitoubiao'">-->
-                    <!--<img src="resources/img/tender/daitoubiao.png">-->
-                    <!--</div>-->
-                    <!--<div ng-if = "getTenderStatus(tender) == 'yitoubiao'">-->
-                    <!--<img src="resources/img/tender/yitoubiao.png">-->
-                    <!--</div>-->
-                    <!--<div ng-if = "getTenderStatus(tender) == 'zhongbiao'">-->
-                    <!--<img src="resources/img/tender/zhongbiao.png">-->
-                    <!--</div>-->
-                    <!--<div ng-if = "getTenderStatus(tender) == 'weizhongbiao'">-->
-                    <!--<img src="resources/img/tender/weizhongbiao.png">-->
-                    <!--</div>-->
                     <div ng-if="tender.status == '已结标' && tender.result == 1 && tender.applyVendor">
                         <img src="resources/img/tender/zhongbiao.png">
                     </div>
-                    <div ng-if="tender.status == '已结标' && tender.result == 1 && !tender.applyVendor">
+                    <div ng-if="(tender.status == '已结标' && tender.result == 1 && !tender.applyVendor) || (tender.status == '待评标' && tender.overdue == 1 && tender.result == 1 && tender.vendorHasBid)">
                         <img src="resources/img/tender/weizhongbiao.png">
                     </div>
                     <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result == 1 && !tender.vendorHasBid">
                         <img src="resources/img/tender/liubiao.png">
                     </div>
-                    <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result == 1 && tender.vendorHasBid">
-                        <img src="resources/img/tender/weizhongbiao.png">
-                    </div>
                     <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result != 1 && tender.vendorHasBid">
                         <img src="resources/img/tender/daipingbiao.png">
                     </div>
@@ -451,19 +436,12 @@
                     <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result != 1 && !tender.vendorHasBid">
                         <img src="resources/img/tender/liubiao.png">
                     </div>
-                    <!--<div ng-if="tender.status == '待评标' && tender.overdue != 1">-->
-                        <!--<img src="resources/img/tender/toubiaozhong.png">-->
-                    <!--</div>-->
-                    <!-- overdue与投标截止日期比较  result与公布结果日期比较 -->
                     <div ng-if="tender.overdue != 1 && tender.vendorHasBid">
                         <img src="resources/img/tender/yitoubiao.png">
                     </div>
                     <div ng-if="tender.overdue != 1 && !tender.vendorHasBid">
                         <img src="resources/img/tender/daitoubiao.png">
                     </div>
-                    <div ng-if="tender.overdue != 1 && !tender.vendorHasBid">
-                        <img src="resources/img/tender/daitoubiao.png">
-                    </div>
                     <div ng-if="tender.status == '待投标' && tender.overdue == 1">
                         <img src="resources/img/tender/liubiao.png">
                     </div>