销售采购订单详情

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

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

@@ -2644,4 +2644,101 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 	position: absolute;
 	right: -5px;
 	border-radius: 100%;
+}
+
+
+
+/*公共详情*/
+.pub-com_head {
+	width: 100%;
+	height: 40px;
+	line-height: 44px;
+	background: url("../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-list{
+	font-size: 14px;
+}
+#order-detail-list .row{
+	width: 96%;
+	margin: 0 auto;
+	line-height: 50px;
+}
+#order-detail-list .title{
+	font-weight: inherit;
+}
+#order-detail-list .content{
+	color: #323232;
+}
+#order-detail-list .table-default .header {
+	border: none;
+	background: none;
+}
+#order-detail-list .table-default .header th{
+	border-bottom: none;
+	font-weight: normal;
+	color: #999;
+}
+#order-detail-list .table-default tbody tr{
+	background: none;
+}
+#order-detail-list .table-default tbody tr td{
+	vertical-align: middle;
+	color: #323232;
+}
+#order-detail-list .table-default th,#order-detail-list .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-list .content-hide{
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	width: 560px;
+}
+
+.title-div .end {
+	position: absolute;
+	top: 10px;
+	right: 0;
+	line-height: 24px;
+	padding-left: 15px;
+	background: #fff;
+	z-index: 2;
+}
+#order-detail-list .text-inverse{
+	width: 100%;
+	display: inline-block;
 }

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

@@ -149,7 +149,7 @@
 	float: left;
 	width: 30%;
 }
-.text-inverse{
+.rbar .text-inverse{
 	width: 26px;
 	height: 16px;
 	line-height: 16px;

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

@@ -1,11 +1,23 @@
-<div class="pane base-info">
-	<div class="pane-header">
-		客户委外变更单<!-- <a href="#" class="pull-right text-simple"><i
+<style>
+	#order-detail-list .row{
+		line-height: 20px;
+		margin-top: 20px;
+	}
+	#order-detail-list .table-default .header th{
+		display: inline-block;
+	}
+</style>
+<div class="pane base-info" id="order-detail-list">
+	<div class="pub-com_head">
+		<span>客户委外变更单</span>
+		<div class="p-right">
+			<!-- <a href="#" 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;
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
@@ -31,8 +43,8 @@
 				<div class="content" ng-bind="::change.remark"></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">
@@ -43,13 +55,12 @@
 				</div>
 			</div>
 		</div>
-		<div class="headerline">
-			<div class="index">4</div>
-			<div class="content">商品变更详情</div>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe; position: relative;">
+			<span class="f14">商品变更详情</span>
 			<div class="end" ng-show="change.status == 200">
 				<a class="btn btn-sm btn-default"
-					ng-click="change.$editing=!change.$editing"><i
-					class="fa fa-share fa-fw"></i>我要回复</a>
+				   ng-click="change.$editing=!change.$editing"><i
+						class="fa fa-share fa-fw"></i>我要回复</a>
 			</div>
 		</div>
 		<div class="row row-sm item" ng-if="change.$editing">
@@ -80,20 +91,22 @@
 			</div>
 		</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>商品</th>
-						<th width="100">单价</th>
-						<th>数量</th>
-						<th width="120">开工日期</th>
-						<th width="140">完工日期</th>
-						<th width="70">操作</th>
-					</tr>
+				<tr class="header">
+					<th width="350">商品</th>
+					<th width="100">单价</th>
+					<th width="100">数量</th>
+					<th width="120">开工日期</th>
+					<th width="140">完工日期</th>
+					<th width="70">操作</th>
+				</tr>
 				</thead>
+			</table>
+			<table class="block table table-default table-striped table-hover" ng-class="{'scoroll':order.orderItems.length>10}">
 				<tbody>
 					<tr >
-						<td>
+						<td width="350">
 							<div>
 								<span class="text-num text-bold" ng-bind="::change.product.code"></span>
 								<span class="text-light">&nbsp;&nbsp;&nbsp;订单序号：<span class="text-num">{{::change.number}}</span></span>
@@ -101,7 +114,7 @@
 							<div ng-bind="::change.newProduct.title"></div>
 							<div class="text-muted" ng-bind="::change.product.spec"></div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="100">
 							<div class="text-num"
 								ng-class="{'text-inverse': change.newPrice != change.oldPrice}"
 								title="{{change.newPrice}}" ng-bind="::change.newPrice | number:6"></div>
@@ -114,7 +127,7 @@
 								</span> <s ng-if="change.newTaxrate != change.oldTaxrate">{{::change.oldTaxrate}}%</s>
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center"  width="100">
 							<div class="text-num"
 								ng-class="{'text-inverse': change.newQty != change.oldQty}"
 								title="{{change.newQty}}" ng-bind="::change.newQty"></div>
@@ -124,7 +137,7 @@
 							</div>
 							<div class="text-muted" ng-bind="::change.newProduct.unit"></div>
 						</td>
-						<td class="text-center">
+						<td class="text-center"  width="120">
 							<div class="text-num"
 								ng-class="{'text-inverse': change.newCommence != change.oldCommence}"
 								ng-bind="::change.newCommence | date:'yyyy-MM-dd'"></div>

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

@@ -1,14 +1,17 @@
 <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>
+<div class="pane base-info" id="order-detail-list">
+	<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;
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
@@ -42,8 +45,8 @@
 				<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">
@@ -70,15 +73,15 @@
 				<div class="content" ng-if="!order.shipAddress ">无</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="260">商品</th>
 						<th width="80">单价</th>
 						<th width="100">数量</th>
 						<th width="120">交货日期</th>
@@ -86,12 +89,14 @@
 						<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>
-						<td class="text-center text-num text-bold f-16 text-success br-r">
+						<td class="text-center text-num text-bold f-16 text-success" width="50">
 							<span >1</span>
 						</td>
-						<td>
+						<td  width="260">
 							<div class="text-num text-bold">
 								<span ng-bind="::order.product.code"></span>
 							</div>
@@ -100,11 +105,11 @@
 							</div>
 							<div class="text-muted" ng-bind="::order.product.spec"></div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="80">
 							<div class="text-num" ng-bind="::order.price | number:6"></div>
 							<div class="text-muted">税率：{{::order.taxrate || 0}}%</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="100">
 							<div class="text-num" ng-bind="::order.qty"></div>
 							<div class="text-muted" ng-bind="::order.product.unit"></div>
 							<div style="margin: 0 auto" ng-if="order.$editing">
@@ -113,7 +118,7 @@
 									class="form-control input-xs" placeholder="0~{{order.qty-order.replyQty}}">
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="120">
 							<div class="text-num"
 								ng-bind="::order.delivery | date:'yyyy-MM-dd'"></div> <br>
 							<div style="margin: 0 auto"
@@ -135,7 +140,7 @@
 								</span>
 							</div>
 						</td>
-						<td>
+						<td  width="180">
 							<div ng-show="!order.$editing">
 								<div ng-if="!order.replyQty" class="text-muted text-center">未回复</div>
 								<div ng-if="order.replyQty > 0 && order.replyQty < order.qty">
@@ -186,7 +191,7 @@
 								客户验退：{{::order.returnQty}}{{::order.product.unit}}
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="100">
 							<div ng-if="order.replyQty>=order.qty" class="block">
 								<span class="text-trans success">已回复</span>
 							</div>

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

@@ -75,7 +75,7 @@
     border: 1px solid #5078cb;
 }
 .purchase_form01 ul li .input-group .form-control {
-width:146px;
+width:152px;
 	}
 .purchase_form01 ul li .dropdown-menu li{
   line-height: 30px;
@@ -125,7 +125,7 @@ width:146px;
 <div class="warp">
     <div class=" purchase">
         <div class="width100">
-            <div class="com_title">服务>采购模块><font>>代采订单</font></div>
+           <!-- <div class="com_title">服务>采购模块><font>>代采订单</font></div>-->
             <div class="com_head"><span>代采订单</span></div>
             <div class="purchase_form">
                 <!--基本信息-->

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

@@ -1,12 +1,14 @@
-<div class="pane base-info">
-	<div class="pane-header">
-		客户询价单
-		<!-- <a href="#" class="pull-right text-simple"><i
+<div class="pane base-info" id="order-detail-list">
+	<div class="pub-com_head">
+		<span>客户询价单</span>
+		<div class="p-right">
+			<!-- <a href="#" 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;
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
@@ -65,29 +67,30 @@
 				</div>
 			</div>
 		</div>
-		<div class="headerline">
-			<div class="index">2</div>
-			<div class="content">商品价格详情</div>
+		<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 class="block table table-default table-striped" style="margin-bottom: 0;">
 				<thead>
-					<tr class="header">
-						<th>商品</th>
-						<th width="90"><span class="text-default">≥</span>分段数</th>
-						<th width="90">价格</th>
-						<th width="40">币别</th>
-						<th width="45">税率</th>
-						<th width="80">最小订购</th>
-						<th width="80">最小包装</th>
-						<th width="120">有效期</th>
-						<th width="75">操作</th>
-					</tr>
+				<tr class="header">
+					<th width="270">商品</th>
+					<th width="90"><span class="text-default">≥</span>分段数</th>
+					<th width="90">价格</th>
+					<th width="50">币别</th>
+					<th width="55">税率</th>
+					<th width="80">最小订购</th>
+					<th width="80">最小包装</th>
+					<th width="120">有效期</th>
+					<th width="75">操作</th>
+				</tr>
 				</thead>
+			</table>
+			<table class="block table table-default table-striped" ng-class="{'scoroll':order.orderItems.length>10}">
 				<tbody>
 					<tr
 						ng-repeat="inquiryItem in newinquiryItems track by inquiryItem.id">
-						<td>
+						<td  width="270">
 							<div class="text-num text-bold"
 								ng-bind="::inquiryItem.product.code"></div>
 							<div ng-bind="::inquiryItem.product.title"></div>
@@ -110,7 +113,7 @@
 									ng-if="!inquiryItem.leadtime" class="text-inverse"> 必填*</span>
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="90">
 							<div ng-show="!inquiryItem.$editing">
 								<div ng-repeat="reply in inquiryItem.replies">
 									<span ng-bind="reply.lapQty"></span>
@@ -135,7 +138,7 @@
 									class="btn btn-default btn-xs" ng-show="!inquiryItem.custLap">添加分段</a>
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="90">
 							<div ng-show="!inquiryItem.$editing">
 								<div ng-repeat="reply in inquiryItem.replies">
 									<span ng-bind="reply.price | number:6"></span> <span
@@ -179,10 +182,10 @@
 								</div>
 							</div>
 						</td>
-						<td class="text-center" ng-bind="::inquiryItem.currency"></td>
-						<td class="text-center"><span
+						<td class="text-center" ng-bind="::inquiryItem.currency" width="50"></td>
+						<td class="text-center" width="55"><span
 							ng-bind="::inquiryItem.taxrate || 0"></span>%</td>
-						<td class="text-center">
+						<td class="text-center" width="80">
 							<div ng-show="!inquiryItem.$editing">
 								<span ng-bind="inquiryItem.minOrderQty"></span> <span
 									ng-show="inquiryItem.minOrderQty == null" class="text-muted">-</span>
@@ -192,7 +195,7 @@
 									ng-model="inquiryItem.minOrderQty" placeholder="最小订购">
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="80">
 							<div ng-show="!inquiryItem.$editing">
 								<span ng-bind="inquiryItem.minPackQty"></span> <span
 									ng-show="inquiryItem.minPackQty == null" class="text-muted">-</span>
@@ -202,7 +205,7 @@
 									ng-model="inquiryItem.minPackQty" placeholder="最小包装">
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="120">
 							<div ng-show="!inquiryItem.$editing"
 								ng-init="parseDate(inquiryItem)">
 								<div ng-show="inquiryItem.vendFromDate">
@@ -249,7 +252,7 @@
 								</div>
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="75">
 							<div
 								ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null"
 								class="block">

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

@@ -1,14 +1,17 @@
 <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> -->
+<div class="pane base-info" id="order-detail-list">
+	<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;
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
@@ -42,8 +45,8 @@
 				<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">
@@ -72,31 +75,33 @@
 		<div class="row row-sm item">
 			<div class="col-xs-12">
 				<span class="title">备注</span>
-				<div class="content" ng-bind="::order.remark"></div>
+				<div class="content-hide 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="80">单价</th>
-						<th width="100">数量</th>
-						<th width="120">交货日期</th>
-						<th width="180">回复状态</th>
-						<th width="100"></th>
-					</tr>
+				<tr class="header">
+					<th width="50">行号</th>
+					<th width="270">商品</th>
+					<th width="110">单价</th>
+					<th width="100">数量</th>
+					<th width="120">交货日期</th>
+					<th width="160">回复状态</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 f-16 text-success "  width="50">
 							<span ng-bind="::item.number"></span>
 						</td>
-						<td>
+						<td width="270">
 							<div class="text-num text-bold">
 								<span ng-bind="::item.product.code"></span>
 							</div>
@@ -107,11 +112,11 @@
 							<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="110">
 							<div class="text-num" ng-bind="::item.price | number:6"></div>
 							<div class="text-muted">税率：{{::item.taxrate || 0}}%</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center"  width="100">
 							<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">
@@ -120,7 +125,7 @@
 									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"
@@ -142,7 +147,7 @@
 								</span>
 							</div>
 						</td>
-						<td>
+						<td width="160">
 							<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 +198,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/purc/right.html

@@ -149,15 +149,15 @@
 		float: left;
 		width: 30%;
 	}
-	.text-inverse{
-		width: 26px;
-		height: 16px;
-		line-height: 16px;
-		font-size: 12px;
-		background: #fff;
-		border-radius: 100%;
-		display: inline-block;
-	}
+.rbar .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">

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

@@ -220,11 +220,11 @@
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th width="600">商品</th>
+			<th width="580">商品</th>
 			<th width="100">单价</th>
-			<th>数量</th>
+			<th width="50">数量</th>
 			<th width="120">交货日期</th>
-			<th width="140">变更内容</th>
+			<th width="120">变更内容</th>
 			<th width="70">操作</th>
 		</tr>
 		<tr class="sep-row">

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

@@ -1,11 +1,14 @@
-<div class="pane base-info">
-	<div class="pane-header">
-		客户采购变更单<!-- <a href="#" class="pull-right text-simple"><i
+<div class="pane base-info" id="order-detail-list">
+	<div class="pub-com_head">
+		<span>客户采购变更单</span>
+		<div class="p-right">
+			<!-- <a href="#" 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;
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
@@ -31,8 +34,8 @@
 				<div class="content" ng-bind="::change.remark"></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">
@@ -62,8 +65,8 @@
 				<div class="content" ng-bind="::change.order.shipAddress"></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="row row-sm item">
 			<div class="col-xs-3">
@@ -95,16 +98,15 @@
 				</div>
 			</div>
 		</div>
-		<div class="headerline">
-			<div class="index">4</div>
-			<div class="content">商品变更详情</div>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe; position: relative;">
+			<span class="f14">商品变更详情</span>
 			<div class="end" ng-show="change.status == 200">
 				<a class="btn btn-sm btn-default"
 					ng-click="change.$editing=!change.$editing"><i
 					class="fa fa-share fa-fw"></i>我要回复</a>
 			</div>
 		</div>
-		<div class="row row-sm item" ng-if="change.$editing">
+		<div class="row row-sm item" ng-if="change.$editing" style="line-height: 20px; padding-top: 20px;">
 			<div class="col-xs-3">
 				<div class="form-group pull-right" ng-init="change.$agreed = 1">
 					<label class="radio-inline"> <input type="radio"
@@ -132,20 +134,22 @@
 			</div>
 		</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>商品</th>
-						<th width="100">单价</th>
-						<th>数量</th>
-						<th width="120">交货日期</th>
-						<th width="140">变更内容</th>
-						<th width="70">操作</th>
-					</tr>
+				<tr class="header">
+					<th width="380">商品</th>
+					<th width="100">单价</th>
+					<th width="60">数量</th>
+					<th width="120">交货日期</th>
+					<th width="140">变更内容</th>
+					<th width="70">操作</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 change.orderChangeItems track by item.id">
-						<td>
+						<td width="380">
 							<div>
 								<span class="text-num text-bold" ng-bind="::item.newProduct.code"></span>
 								<span class="text-light">&nbsp;&nbsp;&nbsp;订单序号：<span class="text-num">{{::item.orderItemNumber}}</span></span>
@@ -153,7 +157,7 @@
 							<div ng-bind="::item.newProduct.title"></div>
 							<div class="text-muted" ng-bind="::item.newProduct.spec"></div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="100">
 							<div class="text-num"
 								ng-class="{'text-inverse': item.newPrice != item.oldPrice}"
 								title="{{item.newPrice}}" ng-bind="::item.newPrice | number:6"></div>
@@ -166,7 +170,7 @@
 								</span> <s ng-if="item.newTaxrate != item.oldTaxrate">{{::item.oldTaxrate}}%</s>
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="60">
 							<div class="text-num"
 								ng-class="{'text-inverse': item.newQty != item.oldQty}"
 								title="{{item.newQty}}" ng-bind="::item.newQty"></div>
@@ -176,16 +180,16 @@
 							</div>
 							<div class="text-muted" ng-bind="::item.newProduct.unit"></div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="120">
 							<div class="text-num"
 								ng-class="{'text-inverse': item.newDelivery != item.oldDelivery}"
-								ng-bind="::item.newDelivery | date:'yyyy-MM-dd'"></div>
+								ng-bind="::item.newDelivery | date:'yyyy-MM-dd'" style="width: 100%"></div>
 							<div ng-show="item.newDelivery != item.oldDelivery">
 								<s class="text-num text-muted"
 									ng-bind="::item.oldDelivery | date:'yyyy-MM-dd'"></s>
 							</div>
 						</td>
-						<td colspan="2">
+						<td colspan="2" width="210">
 							<div ng-bind="::item.description"></div>
 							<div ng-if="change.agreed == 1" class="block">
 								<span class="text-trans success">已同意</span>

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

@@ -1,12 +1,15 @@
-<div class="pane base-info">
-	<div class="pane-header">
-		客户询价单
-		<!-- <a href="#" class="pull-right text-simple"><i
-			class="fa fa-print fa-fw"></i>打印</a> -->
+<style>
+	#order-detail-list .table-default tbody tr td{
+		vertical-align: top;
+	}
+</style>
+<div class="pane base-info" id="order-detail-list">
+	<div class="pub-com_head">
+		<span>客户询价单</span>
 	</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;
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
@@ -65,29 +68,30 @@
 				</div>
 			</div>
 		</div>
-		<div class="headerline">
-			<div class="index">2</div>
-			<div class="content">商品价格详情</div>
+		<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 class="block table table-default table-striped" style=" margin-bottom: 0">
 				<thead>
 					<tr class="header">
-						<th>商品</th>
+						<th width="270">商品</th>
 						<th width="90"><span class="text-default">≥</span>分段数</th>
 						<th width="90">价格</th>
-						<th width="40">币别</th>
-						<th width="45">税率</th>
+						<th width="50">币别</th>
+						<th width="60">税率</th>
 						<th width="80">最小订购</th>
 						<th width="80">最小包装</th>
 						<th width="120">有效期</th>
 						<th width="75">操作</th>
 					</tr>
 				</thead>
+			</table>
+			<table class="block table table-default table-striped">
 				<tbody>
 					<tr
-						ng-repeat="inquiryItem in newinquiryItems track by inquiryItem.id">
-						<td>
+						ng-repeat="inquiryItem in newinquiryItems track by inquiryItem.id" ng-class="{'scoroll':order.orderItems.length>10}">
+						<td width="270">
 							<div class="text-num text-bold"
 								ng-bind="::inquiryItem.product.code"></div>
 							<div ng-bind="::inquiryItem.product.title"></div>
@@ -107,10 +111,10 @@
 								<input type="number" class="form-control input-xs"
 									ng-model="inquiryItem.leadtime" placeholder="交货周期(确切天数)"
 									style="display: inline-block; width: 180px;"> <span
-									ng-if="!inquiryItem.leadtime" class="text-inverse"> 必填*</span>
+									ng-if="!inquiryItem.leadtime" class="text-inverse" style="width: 30px;"> 必填*</span>
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="90">
 							<div ng-show="!inquiryItem.$editing">
 								<div ng-repeat="reply in inquiryItem.replies">
 									<span ng-bind="reply.lapQty"></span>
@@ -135,7 +139,7 @@
 									class="btn btn-default btn-xs" ng-show="!inquiryItem.custLap">添加分段</a>
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="90">
 							<div ng-show="!inquiryItem.$editing">
 								<div ng-repeat="reply in inquiryItem.replies">
 									<span ng-bind="reply.price | number:6"></span> <span
@@ -179,10 +183,10 @@
 								</div>
 							</div>
 						</td>
-						<td class="text-center" ng-bind="::inquiryItem.currency"></td>
-						<td class="text-center"><span
+						<td class="text-center" ng-bind="::inquiryItem.currency" width="50"></td>
+						<td class="text-center" width="60"><span
 							ng-bind="::inquiryItem.taxrate || 0"></span>%</td>
-						<td class="text-center">
+						<td class="text-center" width="80">
 							<div ng-show="!inquiryItem.$editing">
 								<span ng-bind="inquiryItem.minOrderQty"></span> <span
 									ng-show="inquiryItem.minOrderQty == null" class="text-muted">-</span>
@@ -192,7 +196,7 @@
 									ng-model="inquiryItem.minOrderQty" placeholder="最小订购">
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="80">
 							<div ng-show="!inquiryItem.$editing">
 								<span ng-bind="inquiryItem.minPackQty"></span> <span
 									ng-show="inquiryItem.minPackQty == null" class="text-muted">-</span>
@@ -202,7 +206,7 @@
 									ng-model="inquiryItem.minPackQty" placeholder="最小包装">
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="120">
 							<div ng-show="!inquiryItem.$editing"
 								ng-init="parseDate(inquiryItem)">
 								<div ng-show="inquiryItem.vendFromDate">
@@ -249,7 +253,7 @@
 								</div>
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="75">
 							<div
 								ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null"
 								class="block">

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

@@ -37,15 +37,17 @@ tbody td .text-waiting {
 	border-color: #56a022;
 }
 </style>
-<div class="pane base-info">
-	<div class="pane-header">
-		客户模具询价单
-		<!-- <a href="#" class="pull-right text-simple"><i
-			class="fa fa-print fa-fw"></i>打印</a> -->
+<div class="pane base-info" id="order-detail-list">
+	<div class="pub-com_head">
+		<span>客户模具询价单</span>
+		<div class="p-right">
+			<!-- <a href="#" 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;
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
@@ -96,28 +98,29 @@ tbody td .text-waiting {
 				</div>
 			</div>
 		</div>
-		<div class="headerline">
-			<div class="index">2</div>
-			<div class="content">商品价格详情</div>
+		<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 class="block table table-default table-striped" style="margin-bottom: 0;">
 				<thead>
-					<tr class="header">
-						<th>模具资料</th>
-						<th width="20"></th>
-						<th width="300">单品价格</th>
-						<th width="200"></th>
-					</tr>
+				<tr class="header">
+					<th width="385">模具资料</th>
+					<th width="20"></th>
+					<th width="300">单品价格</th>
+					<th width="200"></th>
+				</tr>
 				</thead>
+			</table>
+			<table class="block table table-default table-striped">
 				<tbody>
 					<tr>
-						<td class="product">
+						<td class="product" width="385">
 							<div class="text-mould" ng-repeat="items in inquiryMould.inquiryMouldItems">
 								<div class="text-num text-bold text-ps" >
 									{{items.psCode}}-{{items.psName}}
 								</div>
-								<div class="text-center text-muted text-prod" ng-repeat="prod in items.inquiryMouldDetails">
+								<div class="text-muted text-prod" ng-repeat="prod in items.inquiryMouldDetails">
 									<div>{{prod.prodCode}}-{{prod.prodTitle}}-{{prod.prodSpec}}</div>
 								</div>
 							</div>
@@ -135,9 +138,9 @@ tbody td .text-waiting {
 								</span>
 							</div> -->
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="20">
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="300">
 							<div ng-repeat="items in inquiryMould.inquiryMouldItems">
 								<span ng-if="inquiryMould.currency == 'RMB'">￥</span>
 								<span ng-if="inquiryMould.currency == 'USD'">$</span>
@@ -180,7 +183,7 @@ tbody td .text-waiting {
 								</div>
 							</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="200">
 							<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue == 0 && inquiryMould.valid != 0 && inquiryMould.adoptStatus == null" class="block">
 								<span class="text-waiting">待报价</span>
 							</div>

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

@@ -309,7 +309,7 @@
 			<th width="100">数量</th>
 			<th width="120">交货日期</th>
 			<th width="180">单据状态</th>
-			<th width="80">操作</th>
+			<th width="100">操作</th>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>

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

@@ -1,88 +1,7 @@
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<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="pane base-info" id="order-detail-list">
 	<div class="pub-com_head">
 		<span>客户采购单</span>
 		<div class="p-right">

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

@@ -71,18 +71,26 @@
   	z-index: 9;
   	font-family: '楷体', '微软雅黑';
 }
-
+.num-ctrl{
+	width: 60px;
+	padding: 0 !important;
+	line-height: 34px;
+}
+.title-div {
+	font-size: 14px;
+	font-weight: 600;
+	padding-left: 30px;
+	height: 50px;
+	padding-top: 11px;
+}
 </style>
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div class="block new">
 	<form class="form-horizontal" name="quotationForm">
-		<div class="headerline">
-			<div class="content">基本信息</div>
-			<div class="end">
-				<i class="fa fa-angle-down"></i>&nbsp;&nbsp;
-			</div>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe; margin-bottom: 10px;">
+			<span class="f14">基本信息</span>&nbsp;
 		</div>
 		<div style="position: relative;">
 			<div ng-if="item.quotation.status == 100" class="status">在录入</div>
@@ -254,7 +262,7 @@
 		</div>
 		<div class="form-group form-group-sm" ng-repeat="price in item.prices">
 			<label class="col-sm-2 control-label">分段 {{$index + 1}}</label>
-			<label for="qty{{$index + 1}}" class="col-sm-1 control-label"><span class="text-inverse text-bold">* </span>数量</label>
+			<label for="qty{{$index + 1}}" class="num-ctrl col-sm-1 control-label" style="width: 60px;"><span class="text-inverse text-bold">* </span>数量</label>
 			<div class="col-sm-3">
 				<div class="input-group">
 					<div class="input-group-addon">≥</div>
@@ -263,7 +271,7 @@
 					<div class="input-group-addon">{{item.product.unit}}</div>
 				</div>
 			</div>
-			<label for="price{{$index + 1}}" class="col-sm-1 control-label"><span class="text-inverse text-bold">* </span>单价</label>
+			<label for="price{{$index + 1}}" class="num-ctrl col-sm-1 control-label"><span class="text-inverse text-bold">* </span>单价</label>
 			<div class="col-sm-2">
 				<input ng-model="price.price" type="text" class="form-control" id="price{{$index + 1}}" placeholder="单价"
 					ng-pattern="/^[1-9]\d*\.{0,1}\d*|0\.\d*[1-9]\d*$/" ng-readonly="!item.$editing" ng-required="true">

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

@@ -149,7 +149,7 @@
 	float: left;
 	width: 30%;
 }
-.text-inverse{
+.rbar .text-inverse{
 	width: 26px;
 	height: 16px;
 	line-height: 16px;

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

@@ -238,7 +238,7 @@
 			<th width="120">需求数量</th>
 			<th width="100">单价</th>
 			<th width="120">交货日期</th>
-			<th width="140">客户单据</th>
+			<th width="150">客户单据</th>
 			<th width="70">操作</th>
 		</tr>
 		<tr class="sep-row">

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

@@ -35,13 +35,15 @@
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="pane base-info">
-	<div class="pane-header f16">
-		发货单 
+<div class="pane base-info"  id="order-detail-list">
+	<div class="pub-com_head">
+		<span>发货单</span>
+		<div class="p-right">
+		</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;
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
@@ -63,8 +65,8 @@
 				<div class="content" ng-bind="::order.sendItems[0].orderItem.order.enterprise.enName"></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">
@@ -87,7 +89,7 @@
 			</div>
 			<div class="col-xs-9">
 				<span class="title">交货地址</span>
-				<div class="content" ng-bind="::order.sendItems[0].orderItem.order.shipAddress"></div>
+				<div class="content-hide content" ng-bind="::order.sendItems[0].orderItem.order.shipAddress"></div>
 			</div>
 		</div>
 		<div class="row row-sm item" ng-if="order.remark">
@@ -96,27 +98,29 @@
 				<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="80">单价</th>
-						<th width="140">发货数量</th>
-						<th width="150">收料信息</th>
-						<th width="180">订单信息</th>
-					</tr>
+				<tr class="header">
+					<th width="50">行号</th>
+					<th width="300">商品</th>
+					<th width="80">单价</th>
+					<th width="140">发货数量</th>
+					<th width="150">收料信息</th>
+					<th width="180">订单信息</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.sendItems track by item.id">
-						<td class="text-center text-num text-bold f-16 text-success br-r">
+						<td class="text-center text-num text-bold f-16 text-success"  width="50">
 							<span ng-bind="::item.number"></span>
 						</td>
-						<td>
+						<td  width="300">
 							<div class="text-num text-bold">
 								<span ng-bind="::item.orderItem.product.code"></span>
 							</div>
@@ -126,16 +130,16 @@
 							<div class="text-muted" ng-bind="::item.orderItem.product.spec"></div>
 							<div class="text-bold text-inverse" ng-if="item.orderItem.factory">送货工厂：<span ng-bind="::item.orderItem.factory"></span></div>
 						</td>
-						<td class="text-center">
+						<td class="text-center" width="80">
 							<div class="text-num f14" ng-bind="::item.orderItem.price | number:6"></div>
 							<div class="text-muted">税率：{{::item.orderItem.taxrate || 0}}%</div>
 						</td>
-						<td class="text-center">
+						<td class="text-center"  width="140">
 							<div class="text-num f14" ng-bind="::item.qty"></div>
 							<div class="text-muted" ng-bind="::item.orderItem.product.unit"></div>
 							<div><code ng-if="item.replyRemark"><i class="fa fa-fw fa-warning"></i><span ng-bind="::item.replyRemark"></span></code></div>
 						</td>
-						<td class="text-center">
+						<td class="text-center"  width="150">
 							<div ng-if="!item.verifyQty" class="text-muted">客户还未收料</div>
 							<div ng-if="item.verifyQty" class="dropdown text-center">
 								<a href="javascript:void(0);" class="dropdown-toggle text-default">客户已收料{{::item.verifyQty}}{{::item.orderItem.product.unit}}<i class="fa fa-fw fa-angle-down"></i></a>
@@ -161,7 +165,7 @@
 								</div>
 							</div>
 						</td>
-						<td class="text-muted">
+						<td class="text-muted"  width="180">
 							<div>单据编号：<a href="#/sale/order/{{::item.orderItem.order.id}}" ng-bind="::item.orderItem.order.code"></a></div>
 							<div>
 								第 <span ng-bind="::item.orderItem.number"></span> 行
@@ -173,11 +177,11 @@
 			</table>
 		</div>
 		<div class="headerline">
-			<span class="index">4</span> <span class="content"><a ng-click="barCode()">条码维护&nbsp;</a>
+			<span class="content"><a ng-click="barCode()">条码维护&nbsp;</a>
 	 		<a title="点击{{vm.editBar? '(收拢)':'(展开)'}}" class="icon-right f16 fa" ng-class="{ 'fa-angle-double-down':!vm.editBar,'fa-angle-double-up':vm.editBar }"  ng-click="barCode()"></a></span> 	 
 		</div>
 		<div class="block"  ng-show="vm.editBar">
-			<div class="printBox">
+			<div class="printBox" style="margin-bottom: 20px;">
 				<div class="notContent"></div>
 				<button type="button" class="btn btn-default" ng-click="generateBarCode()">生成条码&nbsp;<a class="fa fa-print"></a></button>
 				<button type="button" class="btn btn-default" ng-click="printCode('Bar')">打印条码&nbsp;<a class="fa fa-print"></a></button>
@@ -187,15 +191,15 @@
 				<table class="block table table-default table-striped table-hover">
 					<thead>
 						<tr class="header">
-							<th width="45px" class="br-r">
+							<th width="50px" class="br-r">
 							<input type="checkBox" ng-model="checkbars.checked" ng-click="checkBarAll()" />&nbsp;全选</th>
-							<th width="35px" class="br-r">序号</th>
-							<th width="120px">物料信息</th>
-							<th width="40px">发货数</th>
+							<th width="40px" class="br-r">序号</th>
+							<th width="110px">物料信息</th>
+							<th width="50px">发货数</th>
 							<th width="50px">最小包数</th>
-							<th width="55px">外箱号<input type="checkBox" ng-model="checkboxes.checked" ng-click="checkBoxAll()" style="margin:0 0 0 4.5px;"/></th>
+							<th width="65px">外箱号<input type="checkBox" ng-model="checkboxes.checked" ng-click="checkBoxAll()" style="margin:0 0 0 4.5px;"/></th>
 							<th width="50px">外箱容量</th>
-							<th width="50px">打印状态</th>
+							<th width="60px">打印状态</th>
 							<th width="50px">操作</th>
 						</tr>
 					</thead>

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

@@ -195,7 +195,7 @@
     .tender-list dl dd{width: 100%;margin:0 auto;height: 100px;border-bottom: #ccc 1px dashed;overflow: hidden;}
     .tender-list dl dd:hover{border: #d32526 1px solid;}
     .tender-list dl dd span{height: 100px;line-height: 50px;display: inline-block;}
-    .tender-list dl span{width:8%;font-size: 14px;float: left;text-align: center;}
+    .tender-list dl span{width:10.2%;font-size: 14px;float: left;text-align: center;}
     .tender-list dl span.wid01{width:25%;}
     .tender-list dl span.wid01 p{font-size: 14px;line-height: 22px;text-align: left;margin: 0;}
     .tender-list dl dd span.wid01{margin-top: 15px;}