客户采购单详情、右侧固定导航、消息圆点

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

src/main/webapp/WEB-INF/views/normal/index.html

@@ -53,7 +53,7 @@
 				</ul>
 				<div id="home-headerBtns">
 					<a href="javascript:void(0);" class="moblie-btn"><i class="fa fa-tablet fa-lg"></i></a>
-					<a ng-click="showMessage()" title="查看消息"><i class="fa fa-comments-o fa-lg"></i></a>
+					<a ng-click="showMessage()" title="查看消息" class="notice-dot"><i class="fa fa-comments-o fa-lg"></i><em></em></a>
 					<a ui-sref="approvalflow.flow"><i class="fa fa-cog fa-lg"></i></a>
 					<a ng-click="logout()" title="退出登录"><i class="fa fa-power-off fa-lg"></i></a>
 				</div>

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

@@ -2632,4 +2632,16 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 }
 #customer-tab .content{
 	width:930px;
+}
+.notice-dot{
+	position: relative;
+}
+.notice-dot em{
+	width: 8px;
+	height: 8px;
+	display: inline-block;
+	background: #d32526;
+	position: absolute;
+	right: -5px;
+	border-radius: 100%;
 }

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

@@ -136,9 +136,13 @@
 }
 .buy-cart{
 	font-size: 14px;
+	padding: 0;
+	margin-left: 55px;
 }
 .buy-cart a{
 	color: #5078cb;
+	float: left;
+	margin-left: 15px;
 }
 </style>
 <link rel="stylesheet" href="static/css/public.css">
@@ -172,9 +176,9 @@
 					</div>
 				</div>
 			</div>
-			<div class="buy-cart col-xs-2">
-				<a id="add" ui-sref="purc.newOrder"><i class="fa fa-cart-plus"></i>采购单</a>
-				<a id="add" ui-sref="purc.newOrder"><i class="fa fa-cart-plus"></i>购物车</a>
+			<div class="buy-cart col-xs-1">
+				<a id="add" ui-sref="purc.newOrder"><img src="resources/img/icon/add.png"/></a>
+				<a id="add" ui-sref="purc.newOrder"><img src="resources/img/icon/cart.png"/></a>
 			</div>
 		</div>
 	</div>

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

@@ -1,103 +1,190 @@
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="pane base-info">
-	<div class="pane-header f16">
-		客户采购单<a ng-click="print(order)" class="pull-right text-simple"><i
-			class="fa fa-print fa-fw"></i>打印</a>
+<style>
+	.pub-com_head {
+		width: 100%;
+		height: 40px;
+		line-height: 44px;
+		background: url("resources/img/approvalFlow/comm_bg01.png") no-repeat left;
+		background-color: #f5f5f5;
+		background-size: 100% 100%;
+	}
+
+	.pub-com_head span {
+		margin-left: 30px;
+		color: #000;
+		font-size: 14px;
+	}
+	.pub-com_head  .p-right{
+		float: right;
+	}
+	.pub-com_head  .p-right a{
+		color: #3a89d1;
+		font-size: 14px;
+		margin-right: 20px;
+	}
+	.pub-com_head  .p-right a:hover{
+		color: #d32526;
+		text-decoration: underline;
+	}
+	.title-div {
+		font-size: 14px;
+		font-weight: 600;
+		padding-left: 30px;
+		height: 50px;
+		padding-top: 11px;
+	}
+	#order-detail{
+		font-size: 14px;
+	}
+	#order-detail .row{
+		width: 96%;
+		margin: 0 auto;
+		line-height: 50px;
+	}
+	#order-detail .title{
+		font-weight: inherit;
+	}
+	#order-detail .content{
+		color: #323232;
+	}
+	#order-detail .table-default .header {
+		border: none;
+		background: none;
+	}
+	#order-detail .table-default .header th{
+		border-bottom: none;
+		font-weight: normal;
+		color: #999;
+	}
+	#order-detail .table-default tbody tr{
+		background: none;
+	}
+	#order-detail .table-default tbody tr td{
+		vertical-align: middle;
+		color: #323232;
+	}
+	#order-detail .table-default th,#order-detail .table-default td{
+		border-top: #ddd 1px dotted;
+	}
+	.scoroll{
+		max-height: 800px;
+		overflow-y: scroll;
+		overflow-x: hidden;
+		display: inline-block;
+		position: relative;
+	}
+	#order-detail .content-hide{
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		width: 560px;
+	}
+</style>
+<div class="pane base-info" id="order-detail">
+	<div class="pub-com_head">
+		<span>客户采购单</span>
+		<div class="p-right">
+			<a ng-click="print(order)" class="pull-right text-simple"><i class="fa fa-print fa-fw"></i>打印</a>
+		</div>
 	</div>
 	<div class="pane-body">
-		<div class="headerline">
-			<span class="index">1</span> <span class="content">采购资料</span>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">基本信息</span>&nbsp;
+			<span style="color: rgb(211,37,38);">*</span>
 		</div>
 		<div class="row row-sm item">
-			<div class="col-xs-3">
-				<span class="title">采购单号</span>
+			<div class="col-xs-4">
+				<span class="title">采购单号：</span>
 				<div class="content" ng-bind="::order.code"></div>
 			</div>
-			<div class="col-xs-3">
-				<span class="title">日期</span>
+			<div class="col-xs-4">
+				<span class="title">日期：</span>
 				<div class="content" ng-bind="::order.date | date:'yyyy-MM-dd'"></div>
 			</div>
-			<div class="col-xs-6">
-				<span class="title">客户</span>
+			<div class="col-xs-4">
+				<span class="title">客户：</span>
 				<div class="content" ng-bind="::order.enterprise.enName"></div>
 			</div>
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
-				<span class="title">采购类型</span>
+				<span class="title">采购类型：</span>
 				<div class="content" ng-bind="::order.type"></div>
 			</div>
 			<div class="col-xs-3">
-				<span class="title">录单人</span>
+				<span class="title">录单人：</span>
 				<div class="content" ng-bind="::order.recorder"></div>
 			</div>
 			<div class="col-xs-3">
-				<span class="title">审批人</span>
+				<span class="title">审批人：</span>
 				<div class="content" ng-bind="::order.auditor"></div>
 			</div>
 			<div class="col-xs-3">
-				<span class="title">采购员</span>
+				<span class="title">采购员：</span>
 				<div class="content" ng-bind="::order.user.userName"></div>
 			</div>
 		</div>
-		<div class="headerline">
-			<span class="index">2</span> <span class="content">交易信息</span>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">交易信息</span>&nbsp;
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
-				<span class="title">币别</span>
+				<span class="title">币别：</span>
 				<div class="content" ng-bind="::order.currency"></div>
 			</div>
 			<div class="col-xs-3">
-				<span class="title">汇率</span>
+				<span class="title">汇率：</span>
 				<div class="content" ng-bind="::order.rate"></div>
 			</div>
 			<div class="col-xs-6">
-				<span class="title">付款方式</span>
+				<span class="title">付款方式：</span>
 				<div class="content" ng-bind="::order.payments"></div>
 			</div>
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
-				<span class="title">金额</span>
+				<span class="title">金额：</span>
 				<div class="content" ng-bind="::order.total | number:2"></div>
 			</div>
 			<div class="col-xs-9">
-				<span class="title">交货地址</span>
-				<div class="content" ng-bind="::order.shipAddress"></div>
+				<span class="title">交货地址：</span>
+				<div class="content-hide content" ng-bind="::order.shipAddress"></div>
 			</div>
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-12">
-				<span class="title">备注</span>
+				<span class="title">备注：</span>
 				<div class="content" ng-bind="::order.remark"></div>
 			</div>
 		</div>
-		<div class="headerline">
-			<span class="index">3</span> <span class="content">商品清单</span>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">商品清单</span>&nbsp;
 		</div>
 		<div class="block">
-			<table class="block table table-default table-striped table-hover">
+			<table class="block table table-default table-striped table-hover" style=" margin-bottom: 0">
 				<thead>
 					<tr class="header">
-						<th width="50" class="br-r">行号</th>
-						<th>商品</th>
+						<th width="50">行号</th>
+						<th width="200">商品</th>
 						<th width="80">单价</th>
+						<th width="80">税率</th>
 						<th width="100">数量</th>
 						<th width="120">交货日期</th>
 						<th width="180">回复状态</th>
 						<th width="100">操作</th>
 					</tr>
 				</thead>
+			</table>
+			<table class="block table table-default table-striped table-hover" ng-class="{'scoroll':order.orderItems.length>10}">
 				<tbody>
 					<tr ng-repeat="item in order.orderItems track by item.id">
-						<td class="text-center text-num text-bold f-16 text-success br-r">
+						<td class="text-center text-num" width="50">
 							<span ng-bind="::item.number"></span>
 						</td>
-						<td>
-							<div class="text-num text-bold">
+						<td width="200">
+							<div class="text-num">
 								<span ng-bind="::item.product.code"></span>
 							</div>
 							<div>
@@ -107,23 +194,24 @@
 							<div class="text-muted text-bold" ng-if="item.vendspec"><span ng-bind="::item.vendspec"></span></div>
 							<div class="text-bold text-inverse" ng-if="item.factory">送货工厂：<span ng-bind="::item.factory"></span></div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="80">
 							<div class="text-num" ng-bind="::item.price | number:6"></div>
-							<div class="text-muted">税率：{{::item.taxrate || 0}}%</div>
 						</td>
-						<td class="text-center">
-							<div class="text-num" ng-bind="::item.qty"></div>
-							<div class="text-muted" ng-bind="::item.product.unit"></div>
-							<div style="margin: 0 auto" ng-if="item.$editing">
+						<td class="text-center" width="80">
+							<div class="text-muted">{{::item.taxrate || 0}}%</div>
+						</td>
+						<td class="text-center" width="100">
+							<div class="text-num" ><span ng-bind="::item.qty"></span><span ng-bind="::item.product.unit"></span></div>
+							<div style="margin-top: 20px" ng-if="item.$editing">
 								<input type="text" ng-model="item.reply.qty" min="0" max="{{item.qty}}"
 									ng-init="item.reply.qty=item.qty-item.replyQty"
 									class="form-control input-xs" placeholder="0~{{item.qty-item.replyQty}}">
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="120">
 							<div class="text-num"
-								ng-bind="::item.delivery | date:'yyyy-MM-dd'"></div> <br>
-							<div style="margin: 0 auto"
+								ng-bind="::item.delivery | date:'yyyy-MM-dd'"></div>
+							<div style="margin-top: 20px"
 								class="input-group input-group-xs input-trigger"
 								ng-if="item.$editing">
 								<input type="text" ng-model="item.reply.delivery"
@@ -142,7 +230,7 @@
 								</span>
 							</div>
 						</td>
-						<td>
+						<td width="180">
 							<div ng-show="!item.$editing">
 								<div ng-if="!item.replyQty" class="text-muted text-center">未回复</div>
 								<div ng-if="item.replyQty > 0 && item.replyQty < item.qty">
@@ -193,7 +281,7 @@
 								客户验退：{{::item.returnQty}}{{::item.product.unit}}
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="100">
 							<div ng-if="item.replyQty>=item.qty" class="block">
 								<span class="text-trans success">已回复</span>
 							</div>

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

@@ -20,7 +20,6 @@
 }
 
 .rbar .item-wrap {
-	padding-top: 15px;
 	position: relative;
 	cursor: pointer;
 	text-align: center;
@@ -35,15 +34,21 @@
 	width: 30px;
 	display: block;
 	color: #ffffff;
+	height: 100px;
+}
+.bar-center .item-inner{
+	padding-top: 12px;
+}
+.bar-center .item-inner .text-inverse{
+	margin-top: 5px;
 }
-
 .rbar .item-wrap:hover {
 	background-color: #6f6f6f;
 	color: #fff;
 }
 
 .rbar .inner-text {
-	padding: 10px 0 5px 0;
+	width: 10px;
 	margin: auto;
 	text-align: center;
 	display: block;
@@ -139,13 +144,22 @@
 	float: left;
 	width: 30%;
 }
+.text-inverse{
+	width: 26px;
+	height: 16px;
+	line-height: 16px;
+	font-size: 12px;
+	background: #fff;
+	border-radius: 100%;
+	display: inline-block;
+}
 </style>
 <!-- right static-bar Start -->
 <div class="rbar">
 	<div class="item-wrap" ng-controller="TruckCtrl">
 		<div class="item-inner">
-			<span class="inner-text"> <!-- <i class="fa fa-fw fa-truck fa-2x"></i> -->我的货车
-			</span> （<span class="text-inverse" ng-bind="truckCount"></span>）
+			<span class="inner-text"> <!-- <i class="fa fa-fw fa-truck fa-2x"></i> -->我的货车</span>
+			<span class="text-inverse" ng-bind="truckCount"></span>
 		</div>
 		<div class="tip">
 			<ul class="list-unstyled">
@@ -157,27 +171,27 @@
 	<div class="bar-center" ng-controller="TodoCtrl">
 		<div class="item-wrap">
 			<a class="item-inner" ui-sref="sale.inquiry"> <span
-				class="inner-text">待报价</span> （<span class="text-inverse"
-				ng-bind="todo.inquiry"></span>）
+				class="inner-text">待报价</span>
+				<span class="text-inverse" ng-bind="todo.inquiry"></span>
 			</a>
 			<div class="tip" style="display: none;">报价</div>
 		</div>
 		<div class="item-wrap">
 			<a class="item-inner" ui-sref="sale.order"> <span
-				class="inner-text">待回复</span> （<span class="text-inverse"
-				ng-bind="todo.order"></span>）
+				class="inner-text">待回复</span>
+				<span class="text-inverse" ng-bind="todo.order"></span>
 			</a>
 		</div>
 		<div class="item-wrap">
 			<a class="item-inner" ui-sref="sale.change"> <span
-				class="inner-text">变更中</span> （<span class="text-inverse"
-				ng-bind="todo.orderChange"></span>）
+				class="inner-text">变更中</span>
+				<span class="text-inverse" ng-bind="todo.orderChange"></span>
 			</a>
 		</div>
 		<div class="item-wrap">
 			<a class="item-inner" ui-sref="sale.notice"> <span
-				class="inner-text">待发货</span> （<span class="text-inverse"
-				ng-bind="todo.notice"></span>）
+				class="inner-text">待发货</span>
+				<span class="text-inverse" ng-bind="todo.notice"></span>
 			</a>
 		</div>
 	</div>