首页获取招标单bug修复，单据存储字段不对问题修改

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

src/main/webapp/resources/css/index.css

@@ -1464,6 +1464,9 @@ ul>li.item-link>a {
 	height: 28px;
 	line-height: 28px;
 	padding: 0 10px 8px 15px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 .state-wrap {

src/main/webapp/resources/js/common/services.js

@@ -187,15 +187,15 @@ define(['angular', 'toaster'], function(angular) {
                 });
             },
             getTender: function(count, success) {
-                var request = $http.get(rootPath + '/tender/latestTender');
+                var request = $http.get(rootPath + '/tender/latestTender?page=1&count=' + count);
                 request.success(function(data) {
-                    success.call(null, data.content);
+                    success.call(null, data);
                 });
             },
             getOpenTender: function(count, success) {
-                var request = $http.get(rootPath + '/tender/latestOpenTender');
+                var request = $http.get(rootPath + '/tender/latestOpenTender?page=1&count=' + count);
                 request.success(function(data) {
-                    success.call(null, data.content);
+                    success.call(null, data);
                 });
             }
         };

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

@@ -1303,6 +1303,7 @@ 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;
+            console.log(data);
             var newDate = new Date();
             newDate = newDate.setDate(newDate.getDate() - 3);
             angular.forEach($scope.tenders, function(tender) {
@@ -1317,6 +1318,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         SnapshotService.getOpenTender(250, function(data){
             $scope.openTenders = data;
             var newDate = new Date();
+            console.log(data);
             newDate = newDate.setDate(newDate.getDate() - 3);
             angular.forEach($scope.openTenders, function(tender) {
                 if (tender.date > newDate) {
@@ -10331,16 +10333,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                 }
                 console.log($scope.tender.purchaseTenderProds);
                 $scope.tender.tenderAttaches = $scope.attaches;
-                if ($scope.tender.shipAddress.address !== null) {
-                    if (!$scope.tender.shipAddress.addressdet) {
-                        $scope.tender.shipAddress.addressdet = '';
-                    }
-                    if (!$scope.tender.shipAddress.receriver) {
-                        $scope.tender.shipAddress.receriver = '';
-                    }
-                    if (!$scope.tender.shipAddress.usertel) {
-                        $scope.tender.shipAddress.usertel = '';
-                    }
+                if ($scope.tender.shipAddress.address !== null && $scope.tender.shipAddress.addressdet !== null && $scope.tender.shipAddress.receriver !== null && $scope.tender.shipAddress.usertel !== null) {
                     $scope.tender.shipAddress = $scope.tender.shipAddress.address + $scope.tender.shipAddress.addressdet + ' ' + $scope.tender.shipAddress.receiver + ' ' + $scope.tender.shipAddress.usertel;
                 }
                 if (isPublish) { // 发布

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

@@ -100,8 +100,8 @@
 		<div class="pane-body">
 			<ul class="list-unstyled detail">
 				<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>
-					<span ng-show="tender.isNew"><img src="static/img/home/newTender.png"></span>
 				</li>
 				<li ng-show="tenders == null || tenders == ''" class="grey">
 					您还未收到客户的招标信息！
@@ -116,8 +116,8 @@
 		<div class="pane-body">
 			<ul class="list-unstyled detail">
 				<li ng-repeat="tender in openTenders | 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>
-					<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.html

@@ -394,18 +394,18 @@
                     </div>
                     <div class = "col-xs-4">
                         <div class="tender-desc">交易币别：</div>
-                        <select class="select-menu" data-style="btn-primary">
-                            <option name="currency" ng-model="tender.currency" value ="RMB">RMB</option>
-                            <option name="currency" ng-model="tender.currency" value ="USD">USD</option>
-                            <option name="currency" ng-model="tender.currency" value ="HKD">HKD</option>
-                            <option name="currency" ng-model="ttender.currency" value = "EUR">EUR</option>
+                        <select class="select-menu" data-style="btn-primary" ng-model="tender.currency">
+                            <option value ="RMB">RMB</option>
+                            <option value ="USD">USD</option>
+                            <option value ="HKD">HKD</option>
+                            <option value = "EUR">EUR</option>
                         </select>
                     </div>
                     <div class = "col-xs-4">
                         <div class="tender-desc">是否含税：</div>
-                        <select class="select-menu">
-                            <option ng-model="tender.ifTax" value ="yes">是</option>
-                            <option ng-model="tender.ifTax" value ="no">否</option>
+                        <select class="select-menu" ng-model="tender.ifTax">
+                            <option value ="1">是</option>
+                            <option value ="0">否</option>
                         </select>
                     </div>
                     <div class="col-xs-12">
@@ -563,15 +563,15 @@
                     <div class="col-xs-12">
                         <div class="tender-desc">发票要求：</div>
                         <div class="input-select col-xs-3">
-                            <input class="tender-input"  name="invoiceType" type="radio" value="2" ng-model="tender.invoiceType"/>
+                            <input class="tender-input" type="radio" value="2" ng-model="tender.invoiceType"/>
                             <span>增值税专用发票</span>
                         </div>
                         <div class="input-select col-xs-3">
-                            <input class="tender-input" name="invoiceType" type="radio" value="1" ng-model="tender.invoiceType" />
+                            <input class="tender-input" type="radio" value="1" ng-model="tender.invoiceType" />
                             <span>增值税普通发票</span>
                         </div>
                         <div class="input-select col-xs-3">
-                            <input class="tender-input"  name="invoiceType" type="radio" value="0" ng-model="tender.invoiceType" />
+                            <input class="tender-input" type="radio" value="0" ng-model="tender.invoiceType" />
                             <span>不需要发票</span>
                         </div>
                     </div>

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

@@ -351,7 +351,7 @@
                                 </dd>
                                 <dd ng-repeat="saleTenderItem in tenderProd.saleTenderItems | orderBy: orderType">
                                     <span class="wid01">{{saleTenderItem.saleTender.enterpriseBaseInfo.enName}}
-                                        <a ng-disabled="tender.overdue != 1" ui-sref="sale.vendortender({vendUU:saleTenderItem.saleTender.enterpriseBaseInfo.uu, id:tender.id})" target="_self" title="查看投标单" >查看投标单
+                                        <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>

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

@@ -360,35 +360,38 @@
                     <!--<div ng-if = "getTenderStatus(tender) == 'weizhongbiao'">-->
                     <!--<img src="resources/img/tender/weizhongbiao.png">-->
                     <!--</div>-->
-                    <div ng-if="tender.status == '已结标' && tender.result == 1 && tender.applyVendor == true">
+                    <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 == false">
+                    <div ng-if="tender.status == '已结标' && tender.result == 1 && !tender.applyVendor">
                         <img src="resources/img/tender/weizhongbiao.png">
                     </div>
-                    <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result == 1 && tender.vendorHasBid == false">
+                    <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 == true">
+                    <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 == true">
+                    <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result != 1 && tender.vendorHasBid">
                         <img src="resources/img/tender/daipingbiao.png">
                     </div>
                     <div ng-if="tender.result == 0 && tender.overdue == 1">
                         <img src="resources/img/tender/daipingbiao.png">
                     </div>
-                    <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result != 1 && tender.vendorHasBid == false">
+                    <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 == true">
+                    <div ng-if="tender.overdue != 1 && tender.vendorHasBid">
                         <img src="resources/img/tender/yitoubiao.png">
                     </div>
-                    <div ng-if="tender.status == '待投标' && tender.overdue != 1 && tender.vendorHasBid == false">
+                    <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">

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

@@ -383,7 +383,7 @@
                 </div>
                 <!--<div class="col-xs-12" style="padding: 30px;">-->
                     <!--<div class="col-xs-2 pull-right btn-bid">-->
-                        <!--<a class="btn" ui-sref="purc.evaluation({id:bid.id})">返回</a>-->
+                        <!--<a class="btn" ui-sref="purc.evaluation({id:bid.id})" ng-click="javascript:history.go(-1);">返回</a>-->
                     <!--</div>-->
                 <!--</div>-->
             </div>