主动报价顶部样式改变

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

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

@@ -4266,8 +4266,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	
 	
 	// 主动报价 - 列表
-	app.controller('SaleQuotationListCtrl', ['$scope', '$filter', 'Quotation', 'PurcInquiry', 'ngTableParams', 'toaster', 'BaseService', function($scope, $filter, Quotation, PurcInquiry, ngTableParams, toaster, BaseService){
+	app.controller('SaleQuotationListCtrl', ['$scope', '$filter', 'Quotation', 'PurcInquiry', 'ngTableParams', 'toaster', 'BaseService', '$rootScope', function($scope, $filter, Quotation, PurcInquiry, ngTableParams, toaster, BaseService, $rootScope){
 		BaseService.scrollBackToTop();
+		$rootScope.enteryStatus = false;
 		$scope.active = 'todo';
 		$scope.agreedText = '全部';
 		$scope.dateZoneText = '一个月内';
@@ -4348,6 +4349,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		
 		if( ! angular.isUndefined($stateParams.id)) {// 查看模式
 			$scope.loading  = true;
+			$rootScope.enteryStatus = true;
 			Quotation.getItem({id: $stateParams.id}, function(data){
 				data.$editing = false;
 				$scope.item = data;
@@ -4358,6 +4360,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				toaster.pop('error', '数据加载失败', response.data);
 			});
 		} else {// 新增模式
+			$rootScope.enteryStatus = false;
 			$scope.item = {
 				quotation: {
 					currency: 'RMB',

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

@@ -158,9 +158,9 @@
 }
 </style>
 <div class="block">
-	<div class="pub-com_head">
+	<div class="pub-com_head" ng-controller="SaleQuotationNewCtrl">
 		<span>主动报价单</span>
-		<div class="p-right">
+		<div class="p-right" ng-if="!enteryStatus">
 			<a  ui-sref="sale.quotation.new" ui-sref-active="btn-info">
 				<i class="fa fa-plus-square-o"></i> 新增
 			</a>
@@ -168,31 +168,7 @@
 				<i class="fa fa-list"></i> 列表
 			</a>
 		</div>
-		<!--<span class="time-per fr"  ng-if="enteryStatus"><em>录入人：{{::item.quotation.user.userName}}</em><time>日期：{{::item.quotation.date | date:'yyyy-MM-dd HH:mm:ss'}}</time></span>-->
+		<span class="time-per fr"  ng-if="enteryStatus"><em>录入人：{{::item.quotation.user.userName}}</em><time>日期：{{::item.quotation.date | date:'yyyy-MM-dd HH:mm:ss'}}</time></span>
 	</div>
-	<!--<div class="condition block">
-		<div class="row">
-			<div class="col-xs-10">
-				<div class="f16 text-default text-bold" style="line-height: 30px;">
-					 主动报价单</div>
-			</div>
-			<div class="col-xs-2">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm">
-						<a class="btn btn-default btn-line"
-							ui-sref-active="btn-info" ui-sref="sale.quotation.new">
-							<i class="fa fa-plus-square-o"></i> 新增
-						</a>
-					</div>
-					<div class="btn-group btn-group-sm">
-						<a class="btn btn-default btn-line"
-							ui-sref-active="btn-info" ui-sref="sale.quotation.list">
-							<i class="fa fa-list"></i> 列表
-						</a>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>-->
 	<div ui-view></div>
 </div>

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

@@ -122,7 +122,7 @@
 			<div ng-if="item.quotation.status == 101 && item.agreed == 1" class="status">报价已采纳</div>
 			<div ng-if="item.quotation.status == 101 && item.agreed == 0" class="status">报价未采纳</div>
 		</div>
-		<div class="form-group form-group-sm" ng-if="item.quotation.code">
+		<!-- <div class="form-group form-group-sm" ng-if="item.quotation.code">
 			<label class="col-sm-2 text-right">单据时间：</label>
 			<div class="col-sm-4">
 				<div class="" style="font-size: 14px;">
@@ -135,7 +135,7 @@
 					{{::item.quotation.user.userName}}
 				</div>
 			</div>
-		</div>
+		</div> -->
 		<div class="form-group form-group-sm" ng-if="item.quotation.code">
 			<label for="code" class="col-sm-2 control-label">单据编号：</label>
 			<div class="col-sm-4">