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

src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -178,7 +178,7 @@
 		<tr class="header">
 			<th>商品</th>
 			<th width="120">采购单价</th>
-			<th width="100">验收数量</th>
+			<th width="100">入库数量</th>
 			<th width="120">入库批号</th>
 			<th width="140">单据信息</th>
 			<th width="70">操作</th>

src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -178,7 +178,7 @@
 		<tr class="header">
 			<th>商品</th>
 			<th width="120">采购单价</th>
-			<th width="100">验收数量</th>
+			<th width="100">出库数量</th>
 			<th width="120">入库批号</th>
 			<th width="140">单据信息</th>
 			<th width="70">操作</th>

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

@@ -199,16 +199,16 @@
 	<thead>
 		<tr class="header">
 			<th>商品</th>
-			<th>样品数量</th>
-			<th colspan="2">关联单据</th>
+			<th width="120">样品数量</th>
+			<th width="200">关联单据</th>
 			<th width="140">送样信息</th>
 			<th width="70">操作</th>
 		</tr>
 		<tr class="sep-row">
-			<td colspan="6"></td>
+			<td colspan="5"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="5">
+			<td colspan="4">
 				<div>
 					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
 						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
@@ -220,7 +220,7 @@
 			</td>
 		</tr>
 		<tr class="sep-row">
-			<td colspan="6"></td>
+			<td colspan="5"></td>
 		</tr>
 	</thead>
 	<tbody ng-repeat="approval in $data">
@@ -234,7 +234,7 @@
 					<span title="认定单号" ng-bind="::approval.code"></span>
 				</div>
 			</td>
-			<td colspan="3"><a title="客户名称" 
+			<td colspan="2"><a title="客户名称" 
 				ng-bind="::approval.enterprise.enName"></a></td>
 			<td colspan="1" class="order-sum" >
 				<span ng-if="approval.finalresult" class="label " ng-class="{'label-success': approval.finalresult == '合格', 'label-warning': approval.finalresult != '合格'}">
@@ -266,20 +266,20 @@
 					title="{{approval.sampleqty}}" ng-bind="approval.sampleqty"></div>
 				<div class="text-muted" ng-bind="approval.prodUnit"></div>
 			</td>
-			<td colspan="2" class="br-l">
+			<td class="br-l">
 				<div class="dropdown">申请单：
-					<a ng-bind="::approval.pscode" class="dropdown-toggle text-success" ng-mouseover="getProofing(approval)"></a>
-					<i class="fa fa-fw fa-angle-down"></i>
+					<span ng-bind="::approval.pscode" class="dropdown-toggle text-success"></span>
+					<!-- <i class="fa fa-fw fa-angle-down"></i>
 					<div class="dropdown-menu pane" style="width: 270px;">
 						<div class="pane-body">
 							申请单
 						</div>
-					</div>
+					</div> -->
 				</div>
 				<div class="row">
-					<div class="col-xs-3">附件：</div>
-					<div class="col-xs-9" ng-if="approval.attachs == 0">无</div>
-					<div class="col-xs-9 file" ng-repeat="attach in approval.attachs" ng-if="approval.attachs.length > 0">
+					<div class="col-xs-4">附件：</div>
+					<div class="col-xs-8" ng-if="approval.attachs == 0">无</div>
+					<div class="col-xs-8 file" ng-repeat="attach in approval.attachs" ng-if="approval.attachs.length > 0">
 						<a href="file/{{attach.id}}" ng-bind="::attach.name"></a>
 					</div>
 				</div>
@@ -289,20 +289,20 @@
 			</td>
 			<td class="br-l" colspan="2">
 				<div ng-if="approval.material || approval.materialquality">
-					<span ng-if="approval.material">材料：{{::approval.material}}</span>&nbsp;&nbsp;
+					<span ng-if="approval.material">材料：{{::approval.material}}&nbsp;&nbsp;</span>
 					<span ng-if="approval.materialquality">材质：{{::approval.materialquality}}</span>
 				</div>
 				<div ng-if="approval.address || approval.addressmark">
-					<span ng-if="approval.address">产地：{{::approval.address}}</span>&nbsp;&nbsp;
+					<span ng-if="approval.address">产地：{{::approval.address}}&nbsp;&nbsp;</span>
 					<span ng-if="approval.addressmark">产地标示：{{::approval.addressmark}}</span>
 				</div>
 				<div ng-if="approval.height">
-					<span ng-if="approval.height">单重：{{::approval.height}} g</span>&nbsp;&nbsp;
+					<span ng-if="approval.height">单重：{{::approval.height}} g&nbsp;&nbsp;</span>
 				</div>
 			</td>
 		</tr>
 		<tr class="order-bd checkItem">
-			<td class="product" colspan="6">
+			<td class="product" colspan="5">
 				<ul class="list-group">
 					<li class="list-group-item text-muted ">
 						<div class="row">

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

@@ -178,7 +178,7 @@
 		<tr class="header">
 			<th>商品</th>
 			<th width="120">采购单价</th>
-			<th width="100">验收数量</th>
+			<th width="100">验退数量</th>
 			<th width="120">入库批号</th>
 			<th width="140">单据信息</th>
 			<th width="70">操作</th>

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

@@ -210,8 +210,8 @@
 	<thead>
 		<tr class="header">
 			<th>商品</th>
-			<th>需求数量</th>
-			<th>单价</th>
+			<th width="120">需求数量</th>
+			<th width="100">单价</th>
 			<th width="120">交货日期</th>
 			<th width="140">客户单据</th>
 			<th width="70">操作</th>