【前台】+【 客户送样单】+【 显示订单是否已打印】

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

src/main/webapp/resources/js/index/app.js

@@ -2761,6 +2761,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		};
 		//打印
 		$scope.print = function(sample) {
+			PurcSample.printCount({id: sample.id},{});//增加打印此次
 			ReportService.print(sample.proofing.enUU, 'proofing', '{purc_proofingitems.ppi_id}=' + sample.id, '客户打样申请-' + sample.proofing.code);
 		};
 		

src/main/webapp/resources/js/index/services/Purc.js

@@ -231,6 +231,10 @@ define([ 'ngResource'], function() {
 		});
 	}]).factory('PurcSample', ['$resource', function($resource) {
 		return $resource('sale/sample/:id', {}, {
+			printCount: {
+				url: 'sale/sample/printCount/:id',
+				method: 'POST'
+			},
 			getSend: {
 				url: 'sale/sample/:id/send',
 				method: 'GET',

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

@@ -74,6 +74,10 @@
 	display: block;
 }
 
+.order-table>tbody:hover .operates-status {
+	display: none;
+}
+
 .order-table .order-bd {
 	border-bottom: 1px solid #e6e6e6;
 }
@@ -257,7 +261,9 @@
 				
 			</td>
 			<td colspan="1" class="text-center">
-				<div>
+				<span ng-if="sample.print" class="label ng-scope operates-status" style="margin-right: 5px;background-color: #5D6C79">已打印</span>
+				<span ng-if="!sample.print" class="label ng-scope operates-status" style="margin-right: 5px;background-color: #CA3955">未打印</span>
+				<div class="operates">
 					 <a href="#" ng-click="print(sample)" class="text-muted" title="打印">
 						<i class="fa fa-print fa-lg fa-fw"></i>打印
 					</a> 

src/main/webapp/resources/tpl/serve/self/change_admin.html

@@ -69,18 +69,6 @@
 					style="color: blue; text-decoration: none;">下图显示</a>快速开通本服务。
 				</span>
 			</div>
-			<!--  		<div id="modify_allinfo" style="width: 100%; height: 50px">
-				<div class="modify_maininfo">
-					<div ><a href="#/self/change_admin">第一步：发起申请</a></div>
-					<div class="modify_span"
-						style="width: 100px; height: 2px; border: 2px solid rgb(176, 173, 173);"></div>
-					<div><a href="#/self/change_admin">第二步：等待审核</a></div>
-					<div class="modify_span"
-						style="width: 100px; height: 2px; border: 2px solid rgb(176, 173, 173);"></div>
-					<div><a href="#/self/change_admin">第三步：等待审核结果</a></div>
-				</div>
-			</div>
-	-->
 			<div class="inner">
 				<div class="online-list" style="margin: 10px 0 0 120px;">
 					<div class="item">