采购单、委外单相关页面去除汇率、只留录单人等操作。

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

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

@@ -2753,7 +2753,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 #order-detail-list .row{
 	width: 96%;
 	margin: 0 auto;
-	line-height: 50px;
+	line-height: 40px;
 }
 #order-detail-list .title{
 	font-weight: inherit;
@@ -3283,4 +3283,8 @@ input::-webkit-clear{display:none;}
 }
 .left-nav>ul>li:hover a{
 	background: #999;
+}
+.textmore{display: block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
+#order-detail-list .table-default .header{
+	box-shadow: none;
 }

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

@@ -28,25 +28,25 @@
 			</div>
 		</div>
 		<div class="row row-sm item">
-			<div class="col-xs-3">
+			<!--<div class="col-xs-3">
 				<span class="title">委外类型</span>
 				<div class="content" ng-bind="::order.type"></div>
-			</div>
+			</div>-->
 			<div class="col-xs-3">
 				<span class="title">录单人</span>
 				<div class="content" ng-bind="::order.recorder"></div>
 			</div>
-			<div class="col-xs-6">
+			<!--<div class="col-xs-6">
 				<span class="title">审批人</span>
 				<div class="content" ng-bind="::order.auditor"></div>
-			</div>
+			</div>-->
 		</div>
-		<div class="row row-sm item">
+		<!--<div class="row row-sm item">
 			<div class="col-xs-3">
 				<span class="title">委外员</span>
 				<div class="content" ng-bind="::order.user.userName"></div>
 			</div>
-		</div>
+		</div>-->
 		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
 			<span class="f14">交易信息</span>&nbsp;
 		</div>
@@ -55,20 +55,16 @@
 				<span class="title">币别</span>
 				<div class="content" ng-bind="::order.currency"></div>
 			</div>
-			<div class="col-xs-3">
-				<span class="title">汇率</span>
-				<div class="content" ng-bind="::order.rate"></div>
+			<div class="col-xs-4">
+				<span class="title">金额</span>
+				<div class="content" ng-bind="::order.total"></div>
 			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-5">
 				<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>
-				<div class="content" ng-bind="::order.total"></div>
-			</div>
 			<div class="col-xs-9">
 				<span class="title">交货地址</span>
 				<div class="content" ng-bind="::order.shipAddress "></div>

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

@@ -28,22 +28,22 @@
 			</div>
 		</div>
 		<div class="row row-sm item">
-			<div class="col-xs-3">
+			<!--<div class="col-xs-3">
 				<span class="title">采购类型</span>
 				<div class="content" ng-bind="::order.type"></div>
-			</div>
+			</div>-->
 			<div class="col-xs-3">
 				<span class="title">录单人</span>
 				<div class="content" ng-bind="::order.recorder"></div>
 			</div>
-			<div class="col-xs-3">
+			<!--<div class="col-xs-3">
 				<span class="title">审批人</span>
 				<div class="content" ng-bind="::order.auditor"></div>
 			</div>
 			<div class="col-xs-3">
 				<span class="title">采购员</span>
 				<div class="content" ng-bind="::order.user.userName"></div>
-			</div>
+			</div>-->
 		</div>
 		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
 			<span class="f14">交易信息</span>&nbsp;
@@ -54,8 +54,8 @@
 				<div class="content" ng-bind="::order.currency"></div>
 			</div>
 			<div class="col-xs-3">
-				<span class="title">汇率</span>
-				<div class="content" ng-bind="::order.rate"></div>
+				<span class="title">金额</span>
+				<div class="content" ng-bind="::order.total | number:2"></div>
 			</div>
 			<div class="col-xs-6">
 				<span class="title">付款方式</span>
@@ -63,10 +63,6 @@
 			</div>
 		</div>
 		<div class="row row-sm item">
-			<div class="col-xs-3">
-				<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>

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

@@ -276,10 +276,10 @@
 				 	<span ng-class="{'text-inverse': change.newCurrency != change.oldCurrency}" ng-bind="::change.newCurrency"></span>&nbsp;
 				 	<s class="text-muted" ng-if="change.newCurrency != change.oldCurrency" ng-bind="::change.oldCurrency"></s>&nbsp;&nbsp;&nbsp;&nbsp;
 				 </span>
-				 <span><span class="text-bold">汇率：</span>
+				<!-- <span><span class="text-bold">汇率：</span>
 				 	<span ng-class="{'text-inverse': change.newRate != change.oldRate}" ng-bind="::change.newRate"></span>&nbsp;
 				 	<s class="text-muted" ng-if="change.newRate != change.oldRate" ng-bind="::change.order.rate"></s>&nbsp;&nbsp;&nbsp;&nbsp;
-				 </span>
+				 </span>-->
 				 <span><span class="text-bold">支付方式：</span>
 				 	<span ng-class="{'text-inverse': change.newPayments != change.oldPayments}" ng-bind="::change.newPayments"></span>&nbsp;
 				 	<s class="text-muted" ng-if="change.newPayments != change.oldPayments" ng-bind="::change.oldPayments"></s>&nbsp;&nbsp;&nbsp;&nbsp;

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

@@ -28,29 +28,33 @@
 			</div>
 		</div>
 		<div class="row row-sm item">
-			<div class="col-xs-3">
+			<!--<div class="col-xs-3">
 				<span class="title">采购类型：</span>
 				<div class="content" ng-bind="::order.type"></div>
-			</div>
+			</div>-->
 			<div class="col-xs-3">
 				<span class="title">录单人：</span>
 				<div class="content" ng-bind="::order.recorder"></div>
 			</div>
+			<div class="col-xs-9">
+				<span class="title">备注：</span>
+				<div class="content" ng-bind="::order.remark"></div>
+			</div>
 			<!-- <div class="col-xs-6">
 				<span class="title">审批人：</span>
 				<div class="content" ng-bind="::order.auditor"></div>
 			</div> -->
-			<div class="col-xs-6">
+			<!--<div class="col-xs-6">
 				<span class="title">采购员：</span>
 				<div class="content" ng-bind="::order.user.userName"></div>
-			</div>
+			</div>-->
 		</div>
-		<div class="row row-sm item">
+		<!--<div class="row row-sm item">
 			<div class="col-xs-12">
 				<span class="title">备注：</span>
 				<div class="content" ng-bind="::order.remark"></div>
 			</div>
-		</div>
+		</div>-->
 		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
 			<span class="f14">交易信息</span>&nbsp;
 		</div>
@@ -59,9 +63,13 @@
 				<span class="title">币别：</span>
 				<div class="content" ng-bind="::order.currency"></div>
 			</div>
-			<div class="col-xs-3">
+			<!--<div class="col-xs-3">
 				<span class="title">汇率：</span>
 				<div class="content" ng-bind="::order.rate"></div>
+			</div>-->
+			<div class="col-xs-3">
+				<span class="title">金额：</span>
+				<div class="content" ng-bind="::order.total | number:2"></div>
 			</div>
 			<div class="col-xs-6">
 				<span class="title">付款方式：</span>
@@ -69,10 +77,6 @@
 			</div>
 		</div>
 		<div class="row row-sm item">
-			<div class="col-xs-3">
-				<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-hide content" ng-bind="::order.shipAddress"></div>