供应商搜不到的bug处理

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

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

@@ -2539,6 +2539,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	// 平台新增的询价单
 	app.controller('PurcInquiryCtrl', ['$scope', 'PurchaseInquiry', 'toaster', 'BaseService', '$upload', '$filter', '$modal', '$rootScope', 'ngTableParams', 'GetProductInfo', '$timeout', function($scope, PurchaseInquiry, toaster, BaseService, $upload, $filter, $modal, $rootScope, ngTableParams, GetProductInfo, $timeout) {
 		BaseService.scrollBackToTop();
+		$scope.status = 'InquiryNew';
 		$scope.active = 'all';
 		var getService = function() {
 			return GetProductInfo;
@@ -2700,7 +2701,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         		if(data.success) {
         			toaster.pop('success', '提示', data.success);
         			$timeout(function() {
-        				window.loaction.hash = "#/purc/purchaseinquiry";
+        				window.location.hash = "#/purc/inquiry_unapply";
         			}, 500);
         		}
         		if(data.error) {
@@ -2714,7 +2715,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 
 	// 平台询价单(已提交)
 	app.controller('PurchaseInquiryCtrl', ['$scope', '$filter', 'ngTableParams', 'toaster', 'BaseService', 'PurchaseInquiry', function($scope, $filter, ngTableParams, toaster, BaseService, PurchaseInquiry) {
-		
+		$scope.status = 'InquirySubmit';
 		BaseService.scrollBackToTop();
 		$scope.active = 'todo';
 		$scope.agreedText = '全部';
@@ -2824,6 +2825,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	// 平台询价单（未提交）
 	app.controller('UnapplyInquiryCtrl', ['$scope', 'PurchaseInquiry', 'ngTableParams', 'BaseService', 'toaster', function($scope, PurchaseInquiry, ngTableParams, BaseService, toaster) {
 		BaseService.scrollBackToTop();
+		$scope.status = 'InquiryUnSubmit';
 		$scope.tableParams = new ngTableParams({
 			page : 1, 
 			count : 5,
@@ -9137,6 +9139,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElements);
+						$scope.total = page.totalElement;
 						$defer.resolve(page.content);
 					}
 					$scope.totalCount = page.totalElements;

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

@@ -4,15 +4,15 @@
 			<div class="btn-group btn-group-sm btn-group-justified">
 				<div class="btn-group btn-group-sm">
 					<a type="button" class="btn btn-default btn-line" ui-sref="purc.inquiry"
-						ng-class="{'btn-info':status=='enList'}" >已提交</a>
+						ng-class="{'btn-info':status=='InquirySubmit'}" >已提交</a>
 				</div>
 				<div class="btn-group btn-group-sm">
 					<a type="button" class="btn btn-default btn-line" ui-sref="purc.inquiry_unapply"
-						ng-class="{'btn-info':status=='send'}" >未提交<!-- （<em>5</em>） --></a>
+						ng-class="{'btn-info':status=='InquiryUnSubmit'}" >未提交<!-- （<em>5</em>） --></a>
 				</div>
 				<div class="btn-group btn-group-sm">
 					<a type="button" class="btn btn-default btn-line" ui-sref="purc.inquiry_new"
-						ng-class="{'btn-info':status=='news'}" >新增</a>
+						ng-class="{'btn-info':status=='InquiryNew'}" >新增</a>
 				</div>
 			</div>
 		</div>

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

@@ -1,4 +1,140 @@
 <style>
+	/*增加样式*/
+.view-slide-in {
+	/*margin-top: 20px;*/
+}
+.view-slide-in .block {
+	background: #f5f5f5;
+}
+.view-slide-in .group-container {
+	background: #fff;
+	margin-bottom: 10px;
+}
+.view-slide-in .group-container .btn-group {
+	width: 160px;
+	border: none;
+	height: 45px;
+}
+.view-slide-in .group-container .btn-group .btn {
+	color: #000;
+}
+.view-slide-in .group-container .btn-group .btn-info {
+	color: #d32526;
+	background: #fff;
+	border: none;
+}
+.view-slide-in .group-container .btn-group .btn {
+	border: none;
+	font-size: 16px;
+	font-family: "Microsoft YaHei", "微软雅黑";
+}
+.view-slide-in .group-container .btn-group .btn em {
+	color: #d32526;
+	font-style: inherit;
+}
+.view-slide-in .group-container .btn-group .btn:hover {
+	background: #fff;
+	color: #d32526;
+}
+.view-slide-in .group-container {
+	padding: 0;
+}
+.view-slide-in .search-bg {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+#topSearch {
+	font-size: 18px;
+}
+.view-slide-in #topSearch .search-bg i {
+	color: #999;
+	margin-left: 10px;
+}
+.form-group-sm .form-control-feedback {
+	width: 85px;
+	height: 36px;
+	line-height: 36px;
+	color: #fff;
+	background: #327ebe;
+	text-align: center;
+	font-size: 14px;
+	cursor: pointer;
+}
+#topSearch .input-sm, .form-group-sm .form-control {
+	height: 36px;
+	line-height: 36px;
+	border: #327ebe 1px solid;
+	border-radius: 0px;
+	font-size: 14px;
+}
+.search-bg .col-xs-6,.search-bg .row {
+	padding-right: 0;
+}
+.order-table .company-list,.order-table .order-hd:first-child {
+	background: #fff;
+	font-size: 16px;
+	height: 55px;
+	line-height: 55px;
+	border-bottom: #ddd 1px solid;
+}
+.order-table .company-list {
+	width:100%;
+	height: 190px;
+	border-bottom: 20px solid #f5f5f5;
+}
+.order-table .order-hd span.margin-left20 {
+	margin-left: 20px;
+}
+.order-table .product {
+	line-height: 25px;
+	font-size: 14px;
+}
+.order-table .product span {
+	margin-right: 10px;
+}
+.grey01 {
+	color: #969595;
+	font-size: 14px;
+	text-align: center;
+}
+.order-table .btn {
+	border-radius: 0;
+	width: 94px;
+	height: 36px;
+	color: #fff;
+}
+.order-table .btn01 {
+	color: #327ebe;
+	background: #fff;
+	border: none;
+	font-size: 16px;
+}
+.order-table .order-hd td.first {
+	line-height: 25px;
+	font-size: 14px;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
+.search-bg .input-group-addon{
+	width: 85px;
+	height: 36px;
+	display: inline-block;
+	background: #327ebe;
+	font-size: 16px;
+	text-align: center;
+	line-height: 36px;
+	color: #fff;
+	padding: 0;
+	border: none;
+	border-radius: 0;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.search-bg .form-group{
+	position: relative;
+}
+
 	.order-table .header>th {
 		height: 38px;
 		text-align: center;

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

@@ -672,6 +672,142 @@ input[type="radio"], input[type="checkbox"] {
 	background: #EEEEEE;
 	cursor: pointer;
 }
+
+/*增加样式*/
+.view-slide-in {
+	/*margin-top: 20px;*/
+}
+.view-slide-in .block {
+	background: #f5f5f5;
+}
+.view-slide-in .group-container {
+	background: #fff;
+	margin-bottom: 10px;
+}
+.view-slide-in .group-container .btn-group {
+	width: 160px;
+	border: none;
+	height: 45px;
+}
+.view-slide-in .group-container .btn-group .btn {
+	color: #000;
+}
+.view-slide-in .group-container .btn-group .btn-info {
+	color: #d32526;
+	background: #fff;
+	border: none;
+}
+.view-slide-in .group-container .btn-group .btn {
+	border: none;
+	font-size: 16px;
+	font-family: "Microsoft YaHei", "微软雅黑";
+}
+.view-slide-in .group-container .btn-group .btn em {
+	color: #d32526;
+	font-style: inherit;
+}
+.view-slide-in .group-container .btn-group .btn:hover {
+	background: #fff;
+	color: #d32526;
+}
+.view-slide-in .group-container {
+	padding: 0;
+}
+.view-slide-in .search-bg {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+#topSearch {
+	font-size: 18px;
+}
+.view-slide-in #topSearch .search-bg i {
+	color: #999;
+	margin-left: 10px;
+}
+.form-group-sm .form-control-feedback {
+	width: 85px;
+	height: 36px;
+	line-height: 36px;
+	color: #fff;
+	background: #327ebe;
+	text-align: center;
+	font-size: 14px;
+	cursor: pointer;
+}
+#topSearch .input-sm, .form-group-sm .form-control {
+	height: 36px;
+	line-height: 36px;
+	border: #327ebe 1px solid;
+	border-radius: 0px;
+	font-size: 14px;
+}
+.search-bg .col-xs-6,.search-bg .row {
+	padding-right: 0;
+}
+.order-table .company-list,.order-table .order-hd:first-child {
+	background: #fff;
+	font-size: 16px;
+	height: 55px;
+	line-height: 55px;
+	border-bottom: #ddd 1px solid;
+}
+.order-table .company-list {
+	width:100%;
+	height: 190px;
+	border-bottom: 20px solid #f5f5f5;
+}
+.order-table .order-hd span.margin-left20 {
+	margin-left: 20px;
+}
+.order-table .product {
+	line-height: 25px;
+	font-size: 14px;
+}
+.order-table .product span {
+	margin-right: 10px;
+}
+.grey01 {
+	color: #969595;
+	font-size: 14px;
+	text-align: center;
+}
+.order-table .btn {
+	border-radius: 0;
+	width: 94px;
+	height: 36px;
+	color: #fff;
+}
+.order-table .btn01 {
+	color: #327ebe;
+	background: #fff;
+	border: none;
+	font-size: 16px;
+}
+.order-table .order-hd td.first {
+	line-height: 25px;
+	font-size: 14px;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
+.search-bg .input-group-addon{
+	width: 85px;
+	height: 36px;
+	display: inline-block;
+	background: #327ebe;
+	font-size: 16px;
+	text-align: center;
+	line-height: 36px;
+	color: #fff;
+	padding: 0;
+	border: none;
+	border-radius: 0;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.search-bg .form-group{
+	position: relative;
+}
 </style>
 <div ng-include src="'static/tpl/index/purc/enMenu.html'"></div>
 <div class="ng-scope">
@@ -812,7 +948,7 @@ input[type="radio"], input[type="checkbox"] {
                         </div>
                     </div>
                 </div>
-                <div class="col-xs-12" style="padding: 30px;">
+                <div class="col-xs-12" style="padding: 30px;" ng-if="inquiry.inquiryItems.length>0 && vendors.length>0">
                     <div class="col-xs-2 pull-right btn-publish">
                         <button class="btn" ng-disabled="tenderForm.$invalid " ng-click="save()">保存</button>
                     </div>

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

@@ -133,6 +133,141 @@
 	color: #CC3333;
 }
 
+/*增加样式*/
+.view-slide-in {
+	/*margin-top: 20px;*/
+}
+.view-slide-in .block {
+	background: #f5f5f5;
+}
+.view-slide-in .group-container {
+	background: #fff;
+	margin-bottom: 10px;
+}
+.view-slide-in .group-container .btn-group {
+	width: 160px;
+	border: none;
+	height: 45px;
+}
+.view-slide-in .group-container .btn-group .btn {
+	color: #000;
+}
+.view-slide-in .group-container .btn-group .btn-info {
+	color: #d32526;
+	background: #fff;
+	border: none;
+}
+.view-slide-in .group-container .btn-group .btn {
+	border: none;
+	font-size: 16px;
+	font-family: "Microsoft YaHei", "微软雅黑";
+}
+.view-slide-in .group-container .btn-group .btn em {
+	color: #d32526;
+	font-style: inherit;
+}
+.view-slide-in .group-container .btn-group .btn:hover {
+	background: #fff;
+	color: #d32526;
+}
+.view-slide-in .group-container {
+	padding: 0;
+}
+.view-slide-in .search-bg {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+#topSearch {
+	font-size: 18px;
+}
+.view-slide-in #topSearch .search-bg i {
+	color: #999;
+	margin-left: 10px;
+}
+.form-group-sm .form-control-feedback {
+	width: 85px;
+	height: 36px;
+	line-height: 36px;
+	color: #fff;
+	background: #327ebe;
+	text-align: center;
+	font-size: 14px;
+	cursor: pointer;
+}
+#topSearch .input-sm, .form-group-sm .form-control {
+	height: 36px;
+	line-height: 36px;
+	border: #327ebe 1px solid;
+	border-radius: 0px;
+	font-size: 14px;
+}
+.search-bg .col-xs-6,.search-bg .row {
+	padding-right: 0;
+}
+.order-table .company-list,.order-table .order-hd:first-child {
+	background: #fff;
+	font-size: 16px;
+	height: 55px;
+	line-height: 55px;
+	border-bottom: #ddd 1px solid;
+}
+.order-table .company-list {
+	width:100%;
+	height: 190px;
+	border-bottom: 20px solid #f5f5f5;
+}
+.order-table .order-hd span.margin-left20 {
+	margin-left: 20px;
+}
+.order-table .product {
+	line-height: 25px;
+	font-size: 14px;
+}
+.order-table .product span {
+	margin-right: 10px;
+}
+.grey01 {
+	color: #969595;
+	font-size: 14px;
+	text-align: center;
+}
+.order-table .btn {
+	border-radius: 0;
+	width: 94px;
+	height: 36px;
+	color: #fff;
+}
+.order-table .btn01 {
+	color: #327ebe;
+	background: #fff;
+	border: none;
+	font-size: 16px;
+}
+.order-table .order-hd td.first {
+	line-height: 25px;
+	font-size: 14px;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
+.search-bg .input-group-addon{
+	width: 85px;
+	height: 36px;
+	display: inline-block;
+	background: #327ebe;
+	font-size: 16px;
+	text-align: center;
+	line-height: 36px;
+	color: #fff;
+	padding: 0;
+	border: none;
+	border-radius: 0;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.search-bg .form-group{
+	position: relative;
+}
 </style>
 <div ng-include src="'static/tpl/index/purc/enMenu.html'"></div>
 <link rel="stylesheet" href="static/css/public.css">
@@ -194,8 +329,7 @@
 		<tr class="inquiry-hd" ng-dblclick="inquiry.$collapsed=!inquiry.$collapsed" ng-class="{'text-bold': inquiry.display>0}">
 			<td class="first">
 				<div class="inquiry-main">
-					<span> <input type="checkbox" class="selector"
-						ng-model="inquiry.$selected" ng-click="checkOne(inquiry)">
+					<span> {{$index+1}}
 					</span> 
 					&nbsp;<span class="text-num text-bold"
 						ng-bind="::inquiry.date | date:'yyyy-MM-dd'"></span> 
@@ -203,13 +337,13 @@
 			</td>
 			<td colspan="1"><a ng-bind="::inquiry.code" ui-sref="purc.inquiry_detail({id:inquiry.id})" target="_self"></a> </td>
 			<td colspan="1">{{::inquiry.recorder}}</td>
-			<td colspan="2" class="inquiry-sum">
-				<div ng-if="inquiryItem.replyable">
-					<span class="text-inverse text-bold" ng-bind="::inquiry.endDate | timespan"></span>
-					<span class="text-muted">后截止报价</span>
+			<td colspan="1" class="inquiry-sum">
+				<div >
+					<span class="text-inverse text-bold" ng-bind="::inquiry.endDate| date: 'yyyy-MM-dd'"></span>
 				</div>
 			</td>
-			<td colspan="1" class="text-center">
+			<td colspan="2" class="text-center">
+				备注：<span ng-bind="::inquiry.remark"></span>
 			</td>
 			<td colspan="1" class="text-center">
 				<a ng-click="submit(inquiry.id)">提交</a>
@@ -243,7 +377,7 @@
 				</div>
 			</td>
 			<td class="text-center br-l">
-				<div class="text-num" ng-bind="::item.delivery | date:'yyyy-MM-dd'"></div>
+				<div class="text-num" ng-bind="::item.toDate | date:'yyyy-MM-dd'"></div>
 			</td>
 			<td class="br-l">
 				<div style="margin: 0 auto" ng-if="item.$editing">

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

@@ -86,13 +86,13 @@
 			<div class="row">
 				<div id="topSearch" style="float: left">
 					<span class="text-muted f16"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
-					单据{{tableParams.total()}}条
+					单据{{total}}条
 				</div>
 				<div class="col-xs-6">
 					<div class="search">
 						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
-							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称或申请人搜索"  style="width: 100%"/>
-							<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称、简称或申请人搜索"  style="width: 100%"/>
+							<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
 						</div>
 					</div>
 				</div>