客户打样申请，历史记录附件显示；送样时，设置数量不合法无法提交。

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

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

@@ -344,17 +344,17 @@
 							<ul ng-if="sample.sends" ng-repeat="send in sample.sends | orderBy : '-date'" class="list-unstyled list-menu">
 								<li>
 									<div class="row row-sm">
-										<div class="col-xs-7" ng-bind="send.date | date: 'yyyy-MM-dd HH:mm'"></div>
+										<div class="col-xs-7 text-inverse" ng-bind="send.date | date: 'yyyy-MM-dd HH:mm'"></div>
 										<div class="col-xs-5" ng-bind="send.recorder"></div>
 									</div>
 									<div>
-										送样单号：<span ng-bind="send.code"></span>
+										送样单号：<span class="text-inverse" ng-bind="send.code"></span>
 									</div>
 									<div>
-										送样数量：<span class="text-num" ng-bind="send.sendQty"></span>
+										送样数量：<span class="text-num text-inverse" ng-bind="send.sendQty"></span>
 									</div>
-									<div>
-										采购单价：<span class="text-num" ng-bind="send.puprice | number:6"></span>
+									<div ng-if="send.puprice">
+										采购单价：<span class="text-num text-inverse" ng-bind="send.puprice | number:6"></span>
 									</div>
 									<div class="row row-sm">
 										<div class="col-xs-6" ng-if="send.minQty">最小包装量：<span ng-bind="send.minQty"></span></div>
@@ -363,7 +363,7 @@
 									<div class="row row-sm" ng-if="send.attachs.length > 0">
 										<div class="col-xs-3">附件：</div>
 										<div class="col-xs-9">
-											<div ng-repeat="attach in sample.send.attachs"><a href="file/{{attach.id}}" class="file">{{attach.name}}</a></div>
+											<div ng-repeat="attach in send.attachs"><a href="file/{{attach.id}}" class="file">{{attach.name}}</a></div>
 										</div>
 									</div>
 								</li>

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

@@ -93,10 +93,10 @@
 			<label class="col-md-2 col-sm-2 col"><strong
 					class="text-inverse">*</strong>数量：</label>
 			<div class="col-md-4 col-sm-4 col input-group"
-				 ng-init="sampleItem.sampleSend.sendQty = sampleItem.qty - (sampleItem.send.sendQty || 0)">
+				 ng-init="sampleItem.sampleSend.sendQty = sampleItem.qty - (sampleItem.sendQty || 0)">
 				<input ng-model="sampleItem.sampleSend.sendQty" required placeholder="必填，整数"
 					   class="form-control input-sm" type="number"
-					   max="{{sampleItem.qty - (sampleItem.send.sendQty || 0)}}" min="0"> <span
+					   max="{{sampleItem.qty - (sampleItem.sendQty || 0)}}" min="0"> <span
 					style="width: 30px;" class="input-group-addon">{{sampleItem.proofing.product.unit}}</span>
 			</div>
 			<label class="col-md-2 col-sm-2 col">单重：</label>
@@ -184,7 +184,7 @@
 		</div>
 	</div>
 	<div class="modal-footer">
-		<button class="btn btn-primary" type="submit">确认送样</button>
+		<button class="btn btn-primary" type="submit" ng-disabled="sampleSendForm.$invalid">确认送样</button>
 		<button class="btn btn-warning" ng-click="cancel()" type="button">取消</button>
 	</div>
 </form>