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

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

@@ -160,7 +160,8 @@
 			<td>
 				税率：<span ng-bind="::quotationItem.quotation.taxrate || 0"></span>%
 			</td>
-			<td class="text-right" colspan="1" class="order-sum">
+			<td class="text-left" colspan="1" title="录入人">
+				<i class="fa fa-user text-muted"></i>  {{::quotationItem.quotation.user.userName}}
 			</td>
 			<td class="text-center">
 				<div class="operates">
@@ -181,7 +182,7 @@
 					供应商物料编号：<spans ng-bind="::quotationItem.vendorprodcode"></span>
 				</div>
 				<div ng-if="::quotationItem.leadtime && !quotationItem.$editing" class="text-muted">
-					交货周期：<spans ng-bind="::quotationItem.leadtime"></span>天
+					交货周期：<span ng-bind="::quotationItem.leadtime"></span> 天
 				</div>
 			</td>
 			<td class="text-center">

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

@@ -90,6 +90,20 @@
 			<div ng-if="item.quotation.status == 101 && item.quotation.agreed == 1" class="status">报价已采纳</div>
 			<div ng-if="item.quotation.status == 101 && item.quotation.agreed == 0" class="status">报价未采纳</div>
 		</div>
+		<div class="form-group form-group-sm" ng-if="item.quotation.code">
+			<label class="col-sm-2 text-right">单据时间</label>
+			<div class="col-sm-2">
+				<div class="">
+					{{::item.quotation.date | date:'yyyy-MM-dd HH:mm:ss'}}
+				</div>
+			</div>
+			<label class="col-sm-2 text-right">录入人：</label>
+			<div class="col-sm-2">
+				<div class="">
+					{{::item.quotation.user.userName}}
+				</div>
+			</div>
+		</div>
 		<div class="form-group form-group-sm" ng-if="item.quotation.code">
 			<label for="code" class="col-sm-2 control-label">单据编号</label>
 			<div class="col-sm-4">