应收对账单、客户打样单处理

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

src/main/webapp/resources/tpl/index/approvalFlow/user.html

@@ -368,7 +368,8 @@
 							class="form-control input-sm" ng-init="newUser.userSex='M'" style="width: 80px;">
 								<option value="F">女</option>
 								<option value="M">男</option>
-						</select></td>
+						</select>
+						</td>
 						<!--<td class="text-center"><input ng-model="newUser.userIdcode"
 							class="form-control input-sm" type="text" placeholder="身份证号">
 						</td>-->
@@ -393,7 +394,7 @@
 						<td class="text-center" ng-bind="::u.userUU"></td>
 						<td class="text-center" ng-bind="::u.userName"></td>
 						<td class="text-center" ng-bind="::u.userSex == 'F' ? '女' : '男'"></td>
-						<td class="text-center" ng-bind="::u.userIdcode"></td>
+						<!--<td class="text-center" ng-bind="::u.userIdcode"></td>-->
 						<td class="text-center" ng-bind="::u.userTel"></td>
 						<td class="text-center" ng-bind="::u.userEmail"></td>
 						<td class="text-center row-operator2">

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

@@ -46,7 +46,7 @@
 }
 
 .order-table td .static p strong {
-	font-size: 18px;
+	font-size: 14px;
 	font-weight: bold;
 	color: #888;
 }
@@ -89,6 +89,9 @@
 .unPrinted {
     color: #56a022;
 }
+.order-table td .main strong{
+	font-weight: normal;
+}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">

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

@@ -43,7 +43,7 @@
 }
 
 .order-table td .static p strong {
-	font-size: 18px;
+	font-size: 14px;
 	font-weight: bold;
 	color: #888;
 }
@@ -82,7 +82,9 @@
 .order-table td.status:hover  .operate {
 	height: 40px;
 }
-
+.order-table td .main strong{
+	font-weight: normal;
+}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">

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

@@ -236,16 +236,17 @@
 		<tr class="header">
 			<th>商品</th>
 			<th width="120">需求数量</th>
+			<th width="80">是否收费</th>
 			<th width="100">单价</th>
 			<th width="120">交货日期</th>
-			<th width="150">客户单据</th>
+			<th width="180">客户单据</th>
 			<th width="70">操作</th>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="5">
+			<td colspan="6">
 				<!--<div>
 					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
 						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
@@ -256,9 +257,7 @@
 				<a href="sale/sample/xls?_state={{active}}&keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 			</td>
 		</tr>
-		<tr class="sep-row">
-			<td colspan="6"></td>
-		</tr>
+
 	</thead>
 	<tbody ng-repeat="sample in $data">
 		<tr class="order-hd">
@@ -270,11 +269,13 @@
 						ng-bind="sample.proofing.date | date:'yyyy-MM-dd'"></span>
 				</div>
 			</td>
-			<td colspan="3"><span title="客户名称"
-				ng-bind="sample.proofing.enterprise.enName"><span></td>
-			<td colspan="1" class="order-sum" title="是否收费">
-				<div ng-show="sample.proofing.isCharge == '是'" class="label label-success">收&nbsp;&nbsp;&nbsp;费</div>
-				
+			<td colspan="4"><span title="客户名称"
+				ng-bind="sample.proofing.enterprise.enName"></span>
+			</td>
+			<td>
+				<div ng-show="sample.proofing.isCharge == '是'">
+					总额：<span class="text-num" ng-bind="sample.amount | currency: currency(sample.currency)"></span>
+				</div>
 			</td>
 			<td colspan="1" class="text-center">
 				<span ng-if="sample.print" class="label ng-scope operates-status" style="margin-right: 5px;background-color: #5D6C79">已打印</span>
@@ -305,8 +306,11 @@
 					title="{{sample.qty}}" ng-bind="sample.qty"></div>
 				<div class="text-muted" ng-bind="sample.proofing.product.unit"></div>
 			</td>
-			<td class="text-center">
-				<div ng-show="sample.proofing.isCharge != '是'" class="label label-default">不收费</div>
+			<td class="text-center br-l">
+				<div ng-show="sample.proofing.isCharge == '是'">是</div>
+				<div ng-show="sample.proofing.isCharge != '是'">否</div>
+			</td>
+			<td class="text-center br-l">
 				<div ng-show="sample.proofing.isCharge == '是'" class="text-num">
 					<span ng-bind="::currency(sample.currency)"></span>
 					<span ng-bind="::sample.price | number:6"></span>
@@ -314,10 +318,6 @@
 				<div ng-show="sample.proofing.isCharge == '是'" class="text-muted">
 					税率：<span class="text-num" ng-bind="::sample.taxrate"></span>%
 				</div>
-				<div ng-show="sample.proofing.isCharge == '是'">
-					<br>
-					总额：<span class="text-num" ng-bind="sample.amount | currency: currency(sample.currency)"></span>
-				</div>
 			</td>
 			<td class="text-center br-l">
 				<div class="text-num" title="交货日期"
@@ -360,13 +360,13 @@
 						</div>
 					</div>
 				</div>
-				
+
 			</td>
 			<td class="br-l">
 				<div><span>编号：<a class="text-num" ng-bind="::sample.proofing.code"
 						ui-sref="sale.sample_detail({id:sample.id})" target="_self"></a></span></div>
-				<div>第 <span ng-bind="sample.number"></span> 行</div>
-				<div>附件：<span ng-if="sample.proofing.attachs.length == 0">无</span></div>
+				<!--<div>第 <span ng-bind="sample.number"></span> 行</div>-->
+				<!--<div>附件：<span ng-if="sample.proofing.attachs.length == 0">无</span></div>-->
 				<div ng-if="sample.proofing.attachs.length > 0">
 					<div ng-repeat="attach in sample.proofing.attachs">
 						<a class="file" href="file/{{attach.id}}" ng-bind="::attach.name"></a>