销售、采购（所有列表及单据修改字段、位置布局）

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

src/main/webapp/resources/tpl/index/make/accept.html

@@ -183,10 +183,10 @@
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 			<tr class="header">
-				<th>商品</th>
+				<th>产品</th>
 				<th width="120">单价</th>
 				<th width="100">验收数量</th>
-				<th width="120">入库批号</th>
+				<th width="120">批号</th>
 				<th width="140">单据信息</th>
 				<th width="70">操作</th>
 			</tr>
@@ -213,19 +213,20 @@
 		</thead>
 		<tbody ng-repeat="accept in $data">
 			<tr class="order-hd">
-				<td class="first">
+				<td class="first" colspan="4">
 					<div class="order-main">
 						<!--<span><input type="checkbox" class="selector"
 							ng-model="accept.$selected"></span>-->
 						<span
 							class="text-num text-bold"
 							title="{{accept.date | date:'yyyy年MM月dd日hh:mm'}}"
-							ng-bind="accept.date | date:'yyyy-MM-dd'"></span> <span>流水号:<span
+							ng-bind="accept.date | date:'yyyy-MM-dd'"></span>
+						<span title="客户名称"
+							  ng-bind="accept.acceptItems[0].order.enterprise.enName"></span>
+						<span>流水号:<span
 							class="text-num" ng-bind="accept.code"></span></span>
 					</div>
 				</td>
-				<td colspan="3"><span title="客户名称"
-					ng-bind="accept.acceptItems[0].order.enterprise.enName"></span></td>
 				<td colspan="1" class="order-sum">
 					<div class="text-ellipsis" ng-if="accept.sendCode != null"
 						style="width: 120px;" title="送货单号：{{::accept.sendCode}}">

src/main/webapp/resources/tpl/index/make/change.html

@@ -187,7 +187,7 @@
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th>商品</th>
+			<th>产品</th>
 			<th width="100">单价</th>
 			<th>数量</th>
 			<th width="130">计划加工日期</th>
@@ -203,18 +203,19 @@
 	</thead>
 	<tbody ng-repeat="change in $data track by change.id">
 		<tr class="order-hd">
-			<td class="first" width="700">
+			<td class="first" width="700" colspan="4">
 				<div class="order-main">
 					<!--<span> <input type="checkbox" class="selector"
 						ng-model="change.$selected">
-					</span> --><span class="text-num text-bold"
-						ng-bind="::change.orderChange.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
+					</span> -->
+					<span class="text-num text-bold"
+						ng-bind="::change.orderChange.date | date:'yyyy-MM-dd'"></span>
+					<span ng-bind="::change.orderChange.enterprise.enName"></span>
+					<span>流水号：<a
 						class="text-num" ng-bind="::change.orderChange.code" ui-sref="sale.makechange_detail({id:change.id})" target="_self"></a></span> <span>订单：<span
 						class="text-num text-bold" ng-bind="::change.orderCode" ui-sref="make.order_detail({id:change.orderId})" target="_blank"></span></span>
 				</div>
 			</td>
-			<td colspan="3"><span
-				ng-bind="::change.orderChange.enterprise.enName"></span></td>
 			<td colspan="1" class="" title="{{change.orderChange.remark}}">
 				<div class="text-ellipsis" ng-bind="change.orderChange.remark" style="width: 120px;"></div>
 			</td>

src/main/webapp/resources/tpl/index/make/change_detail.html

@@ -56,7 +56,7 @@
 			</div>
 		</div>
 		<div class="title-div" style="border-bottom: 1px dashed #327ebe; position: relative;">
-			<span class="f14">商品变更详情</span>
+			<span class="f14">产品变更详情</span>
 			<div class="end" ng-show="change.status == 200">
 				<a class="btn btn-sm btn-default"
 				   ng-click="change.$editing=!change.$editing"><i
@@ -94,7 +94,7 @@
 			<table class="block table table-default table-striped table-hover" style="margin-bottom: 0;">
 				<thead>
 				<tr class="header">
-					<th width="350">商品</th>
+					<th width="350">产品</th>
 					<th width="100">单价</th>
 					<th width="100">数量</th>
 					<th width="120">开工日期</th>

src/main/webapp/resources/tpl/index/make/order.html

@@ -222,7 +222,7 @@
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th>商品</th>
+			<th>产品</th>
 			<th width="100">单价</th>
 			<th width="100">数量</th>
 			<th width="100">交货日期</th>
@@ -251,17 +251,17 @@
 	</thead>
 	<tbody ng-repeat="order in $data track by order.id">
 		<tr class="order-hd" ng-dbclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
-			<td class="first">
+			<td class="first" colspan="4">
 				<div class="order-main">
 					<!--<span> <input type="checkbox" class="selector"
 						ng-model="order.$selected" ng-click="checkOne(order)">
 					</span> -->
-					<span class="text-num text-bold"
-						ng-bind="::order.date | date:'yyyy-MM-dd'"></span> <span>订单号：
+					<span class="text-num text-bold" ng-bind="::order.date | date:'yyyy-MM-dd'"></span>
+					<span ng-bind="::order.enterprise.enName"></span>
+					<span>订单号：
 					  <a class="text-num" ng-bind="::order.code" ui-sref="sale.makeorder_detail({id:order.id})" target="_self"></a></span>
 				</div>
 			</td>
-			<td colspan="3"><span ng-bind="::order.enterprise.enName"></span></td>
 			<td colspan="1" class="order-sum">{{::order.currency}}： <span
 				ng-bind="::order.qty * order.price| number : 2"
 				class="text-num text-bold"></span>

src/main/webapp/resources/tpl/index/make/order_detail.html

@@ -72,14 +72,14 @@
 			</div>
 		</div>
 		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-			<span class="f14">商品清单</span>&nbsp;
+			<span class="f14">产品清单</span>&nbsp;
 		</div>
 		<div class="block">
 			<table class="block table table-default table-striped table-hover" style="margin-bottom: 0;">
 				<thead>
 					<tr class="header">
-						<th width="50">行号</th>
-						<th width="260">商品</th>
+						<th width="50">序号</th>
+						<th width="260">产品</th>
 						<th width="80">单价</th>
 						<th width="100">数量</th>
 						<th width="120">交货日期</th>

src/main/webapp/resources/tpl/index/make/outorder.html

@@ -200,7 +200,7 @@
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 			<tr class="header">
-				<th>商品</th>
+				<th>物料</th>
 				<th width="100">单价</th>
 				<th>数量</th>
 				<th width="120">计划加工日期</th>
@@ -228,20 +228,20 @@
 		<tbody ng-repeat="order in $data track by order.id">
 			<tr class="order-hd" ng-dbclick="order.$collapsed=!order.$collapsed"
 				ng-class="{'text-bold': order.display>0}">
-				<td class="first">
+				<td class="first" colspan="4">
 					<div class="order-main">
 						<!--<span> <input type="checkbox" class="selector"
 							ng-model="order.$selected" ng-click="checkOne(order)">
-						</span> --><span class="text-num text-bold"
-							ng-bind="::order.date | date:'yyyy-MM-dd'"></span> <span>订单号：
+						</span> -->
+						<span class="text-num text-bold"
+							ng-bind="::order.date | date:'yyyy-MM-dd'"></span>
+						<span ng-bind="::order.enterprise.enName"></span>
+						<span>订单号：
 							<a class="text-num" ng-bind="::order.code"
 							   ui-sref="purc.outorder_detail({id:order.id})" target="_self"></a>
 						</span>
 					</div>
 				</td>
-				<td colspan="3">
-					<!-- <a ng-bind="::order.enterprise.enName"></a> -->
-				</td>
 				<td colspan="1" class="order-sum">{{::order.currency}}： <span
 					ng-bind="::order.qty * order.price| number : 2"
 					class="text-num text-bold"></span>

src/main/webapp/resources/tpl/index/make/outorder_detail.html

@@ -74,14 +74,14 @@
 			</div>
 		</div>
 		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-			<span class="f14">商品清单</span>&nbsp;
+			<span class="f14">物料清单</span>&nbsp;
 		</div>
 		<div class="block">
 			<table class="block table table-default table-striped table-hover">
 				<thead>
 					<tr class="header">
-						<th width="50">行号</th>
-						<th>商品</th>
+						<!--<th width="50">序号</th>-->
+						<th>物料</th>
 						<th width="80">单价</th>
 						<th width="100">数量</th>
 						<th width="120">交货日期</th>
@@ -91,9 +91,9 @@
 				</thead>
 				<tbody>
 					<tr>
-						<td class="text-center text-num text-bold f-16 text-success">
+						<!--<td class="text-center text-num text-bold f-16 text-success">
 							<span >{{$index+1}}</span>
-						</td>
+						</td>-->
 						<td>
 							<div class="text-num text-bold">
 								<span ng-bind="::order.product.code"></span>

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

@@ -193,10 +193,10 @@
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 			<tr class="header">
-				<th>商品</th>
+				<th>产品</th>
 				<th width="120">单价</th>
 				<th width="100">验退数量</th>
-				<th width="120">入库批号</th>
+				<th width="120">批号</th>
 				<th width="140">单据信息</th>
 				<th width="70">操作</th>
 			</tr>
@@ -223,24 +223,25 @@
 		</thead>
 		<tbody ng-repeat="returns in $data">
 			<tr class="order-hd">
-				<td class="first">
+				<td class="first" colspan="4">
 					<div class="order-main">
-						<span><input type="checkbox" class="selector" ng-model="returns.$selected"></span>
+						<span><!--<input type="checkbox" class="selector" ng-model="returns.$selected">--></span>
 						<span class="text-num text-bold"
 							title="{{::returns.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-							ng-bind="::returns.date | date:'yyyy-MM-dd'"></span> <span>流水号：<span
+							ng-bind="::returns.date | date:'yyyy-MM-dd'"></span>
+						<span title="客户名称"
+							  ng-bind="::returns.returnItems[0].order.enterprise.enName"></span>
+						<span>流水号：<span
 							class="text-num" ng-bind="::returns.code"></span></span>
 					</div>
-				</td>		
-				<td colspan="3"><span title="客户名称"
-					ng-bind="::returns.returnItems[0].order.enterprise.enName"></span></td>
-								<td colspan="1" class="order-sum">
+				</td>
+				<td colspan="1" class="order-sum">
 					<div class="text-ellipsis" ng-if="returns.sendCode != null"
 						style="width: 120px;" title="送货单号：{{::returns.sendCode}}">
 						<i style="color: #CC9933;" class="fa fa-truck"></i> <span
 							ng-bind="returns.sendCode"></span>
 					</div>
-				</td>	
+				</td>
 				<td colspan="1" class="text-center">
 					<div class="operates">
 						<!-- <a href="#" class="text-muted" title="打印">

src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -346,7 +346,7 @@ margin-left: 55px;
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 		<tr class="header">
-			<th>商品</th>
+			<th>物料</th>
 			<th width="90"><span class="text-default">≥</span>分段数</th>
 			<th width="90">价格</th>
 			<th width="80">最小订购</th>
@@ -405,18 +405,20 @@ margin-left: 55px;
 		</tbody>
 		<tbody ng-repeat="inquiryItem in $data track by inquiryItem.id">
 		<tr class="order-hd">
-			<td class="first">
+			<td class="first" colspan="3">
 				<div class="order-main">
 						<!--<span> <input type="checkbox" class="selector"
 									  ng-model="inquiryItem.$selected">
-						</span> --><span class="text-num text-bold"
+						</span> -->
+					<span class="text-num text-bold"
 									  title="{{inquiryItem.inquiry.date}}"
-									  ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
+									  ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span>
+					<span
+							ng-bind="::inquiryItem.enterprise.enName"></span>
+					<span>流水号：<a
 						class="text-num" ng-bind="::inquiryItem.inquiry.code" target="_self" href="#/purc/purcinquirydetail/{{inquiryItem.inquiry.id}}"></a></span>
 				</div>
 			</td>
-			<td colspan="2"><span
-					ng-bind="::inquiryItem.enterprise.enName"></span></td>
 			<td>
 				币别：<span ng-bind="::inquiryItem.currency"></span>
 			</td>

src/main/webapp/resources/tpl/index/purc/inquiryInfo_detail.html

@@ -472,8 +472,8 @@ i, em {
                         <div class="comment-oder-text">
                             <ul>
                                 <li class="list-unstyled">
-                                    <span><em style="width: 80px;">产品型号：</em><b title="{{product.code}}">{{product.code}}</b></span>
-                                    <span><em>产品名称：</em><b title="{{product.title}}">{{product.title}}</b></span>
+                                    <span><em style="width: 80px;">物料型号：</em><b title="{{product.code}}">{{product.code}}</b></span>
+                                    <span><em>物料名称：</em><b title="{{product.title}}">{{product.title}}</b></span>
                                     <span><em>品牌：</em><b title="{{product.brand}}">{{product.brand}}</b></span>
                                 </li>
                                 <li class="list-unstyled">
@@ -485,10 +485,10 @@ i, em {
                         <div class="comment-oder-list">
                             <dl>
                                 <dt>
-                                    <span class="wid01">报价供应商</span>
+                                    <span class="wid01">供应商</span>
                                     <span>币别</span>
                                     <span>税率(% )</span>
-                                    <span class="wid02">报价信息</span>
+                                    <span class="wid02">单价</span>
                                     <span>交货周期</span>
                                     <span>最小订购</span>
                                     <span>最小包装</span>

src/main/webapp/resources/tpl/index/purc/order.html

@@ -257,9 +257,9 @@
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th>商品</th>
+			<th>物料</th>
 			<th width="80">含税单价</th>
-			<th width="100">税率（%）</th>
+			<th width="100">税率</th>
 			<th width="100">数量</th>
 			<th width="120">交货日期</th>
 			<th width="180">单据状态</th>
@@ -319,13 +319,15 @@
 	</tbody>
 	<tbody ng-repeat="order in $data track by order.id">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
-			<td class="first" colspan="3">
+			<td class="first" colspan="5">
 				<div class="order-main">
 					<!--<span> <input type="checkbox" class="selector"
 						ng-model="order.$selected" ng-click="checkOne(order)">
 					</span> -->
 					<span class="text-num text-bold"
-						ng-bind="::order.date | date:'yyyy-MM-dd'"></span> <span>订单号：<a
+						ng-bind="::order.date | date:'yyyy-MM-dd'"></span>
+					<span ng-bind="::order.receiveName"></span>
+					<span>订单号：<a
 						class="text-num" ng-bind="::order.code" ui-sref="purc.order_detail({id:order.id})" target="_self"></a></span>
 				</div>
 			</td>
@@ -333,9 +335,6 @@
 				ng-bind="getOrderTotal(order.orderItems) | number : 2"
 				class="text-num text-bold"></span>
 			</td>
-			<td colspan="2" class="text-center">
-				{{::order.receiveName}}
-			</td>
 		</tr>
 		<tr class="order-bd" ng-repeat="item in order.orderItems track by item.id"
 			ng-if="!order.$collapsed "><!-- && (!searchFilterXls.keyword || item.key || order.$showAll) -->

src/main/webapp/resources/tpl/index/purc/order_detail.html

@@ -75,14 +75,14 @@
 			</div>
 		</div>
 		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-			<span class="f14">商品清单</span>&nbsp;
+			<span class="f14">物料清单</span>&nbsp;
 		</div>
 		<div class="block">
 			<table class="block table table-default table-striped table-hover" style="margin-bottom: 0;">
 				<thead>
 				<tr class="header">
-					<th width="50">行号</th>
-					<th width="270">商品</th>
+					<th width="50">序号</th>
+					<th width="270">物料</th>
 					<th width="110">单价</th>
 					<th width="100">数量</th>
 					<th width="120">交货日期</th>

src/main/webapp/resources/tpl/index/purc/tender_evaluation.html

@@ -344,8 +344,8 @@
                         <div class="comment-oder-text">
                             <ul>
                                 <li class="list-unstyled">
-                                    <span><em style="width: 80px;">产品型号：</em><b title="{{tenderProd.prodCode}}">{{tenderProd.prodCode}}</b></span>
-                                    <span><em>产品名称：</em><b title="{{tenderProd.prodTitle}}">{{tenderProd.prodTitle}}</b></span>
+                                    <span><em style="width: 80px;">物料型号：</em><b title="{{tenderProd.prodCode}}">{{tenderProd.prodCode}}</b></span>
+                                    <span><em>物料名称：</em><b title="{{tenderProd.prodTitle}}">{{tenderProd.prodTitle}}</b></span>
                                     <span><em>品牌：</em><b title="{{tenderProd.brand}}">{{tenderProd.brand}}</b></span>
                                 </li>
                                 <li class="list-unstyled">

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

@@ -130,7 +130,7 @@
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th>商品</th>
+			<th>产品</th>
 			<th>来料数量</th>
 			<th>检验数量</th>
 			<th width="120">判定结果</th>
@@ -158,17 +158,19 @@
 	</thead>
 	<tbody ng-repeat="MRB in $data">
 		<tr class="order-hd">
-			<td class="first">
+			<td class="first" colspan="3">
 				<div class="order-main">
 					<!--<span> <input type="checkbox" class="selector"
 						ng-model="MRB.$selected">
-					</span> --><span class="text-num text-bold" title="{{::MRB.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-						ng-bind="::MRB.date | date:'yyyy-MM-dd'"></span> <span>流水号：<span
+					</span> -->
+					<span class="text-num text-bold" title="{{::MRB.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+						ng-bind="::MRB.date | date:'yyyy-MM-dd'"></span>
+					<span title="客户名称"
+						  ng-bind="::MRB.orderItem.order.enterprise.enName"></span>
+					<span>流水号：<span
 						class="text-num" ng-bind="::MRB.code"></span></span>
 				</div>
 			</td>
-			<td colspan="2"><span title="客户名称"
-				ng-bind="::MRB.orderItem.order.enterprise.enName"></span></td>
 			<td colspan="2" class="order-sum">
 				<span ng-if="MRB.sendCode != null" title="送货单号"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span ng-bind="::MRB.sendCode"></span></span>
 			</td>

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

@@ -132,10 +132,10 @@
 	<table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th>商品</th>
-			<th width="120">采购单价</th>
+			<th>产品</th>
+			<th width="120">单价</th>
 			<th width="100">入库数量</th>
-			<th width="120">入库批号</th>
+			<th width="120">批号</th>
 			<th width="140">单据信息</th>
 			<th width="70">操作</th>
 		</tr>
@@ -160,17 +160,19 @@
 	</thead>
 	<tbody ng-repeat="badIn in $data">
 		<tr class="order-hd">
-			<td class="first">
+			<td class="first" colspan="3">
 				<div class="order-main">
 					<!--<span> <input type="checkbox" class="selector"
 						ng-model="badIn.$selected">
-					</span> --><span class="text-num text-bold" title="{{::badIn.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-						ng-bind="::badIn.date | date:'yyyy-MM-dd'"></span> <span>流水号：<span
+					</span> -->
+					<span class="text-num text-bold" title="{{::badIn.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+						ng-bind="::badIn.date | date:'yyyy-MM-dd'"></span>
+					<span title="客户名称"
+						  ng-bind="::badIn.badInItems[0].orderItem.order.enterprise.enName"></span>
+					<span>流水号：<span
 						class="text-num" ng-bind="::badIn.code"></span></span>
 				</div>
 			</td>
-			<td colspan="2"><span title="客户名称"
-				ng-bind="::badIn.badInItems[0].orderItem.order.enterprise.enName"></span></td>
 			<td colspan="2" class="order-sum">
 				<div class="text-ellipsis" ng-if="badIn.sendCode != null" style="width: 240px;" title="送货单号：{{::badIn.sendCode}}" > 
 					<i style="color: #CC9933;" class="fa fa-truck"></i> 

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

@@ -129,10 +129,10 @@
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th>商品</th>
-			<th width="120">采购单价</th>
+			<th>产品</th>
+			<th width="120">单价</th>
 			<th width="100">出库数量</th>
-			<th width="120">入库批号</th>
+			<th width="120">批号</th>
 			<th width="140">单据信息</th>
 			<th width="70">操作</th>
 		</tr>
@@ -157,17 +157,19 @@
 	</thead>
 	<tbody ng-repeat="badOut in $data">
 		<tr class="order-hd">
-			<td class="first">
+			<td class="first" colspan="3">
 				<div class="order-main">
 					<!--<span> <input type="checkbox" class="selector"
 						ng-model="badOut.$selected">
-					</span> --><span class="text-num text-bold" title="{{::badOut.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-						ng-bind="::badOut.date | date:'yyyy-MM-dd'"></span> <span>流水号：<span
+					</span> -->
+					<span class="text-num text-bold" title="{{::badOut.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+						ng-bind="::badOut.date | date:'yyyy-MM-dd'"></span>
+					<span title="客户名称"
+						  ng-bind="::badOut.badOutItems[0].orderItem.order.enterprise.enName"></span>
+					<span>流水号：<span
 						class="text-num" ng-bind="::badOut.code"></span></span>
 				</div>
 			</td>
-			<td colspan="2"><span title="客户名称"
-				ng-bind="::badOut.badOutItems[0].orderItem.order.enterprise.enName"></span></td>
 			<td colspan="2" class="order-sum">
 				<div class="text-ellipsis" ng-if="badOut.sendCode != null" style="width: 240px;" title="送货单号：{{::badOut.sendCode}}" > 
 					<i style="color: #CC9933;" class="fa fa-truck"></i> 

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

@@ -179,10 +179,10 @@
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th>商品</th>
-			<th width="120">采购单价</th>
+			<th>产品</th>
+			<th width="120">单价</th>
 			<th width="100">验收数量</th>
-			<th width="120">入库批号</th>
+			<th width="120">批号</th>
 			<th width="140">单据信息</th>
 			<th width="70">操作</th>
 		</tr>
@@ -207,12 +207,15 @@
 	</thead>
 	<tbody ng-repeat="accept in $data">
 		<tr class="order-hd">
-			<td class="first" colspan="3">
+			<td class="first" colspan="6">
 				<div class="order-main">
 					<!--<span> <input type="checkbox" class="selector"
 						ng-model="accept.$selected">
 					</span> --><span class="text-num text-bold" title="{{accept.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-						ng-bind="accept.date | date:'yyyy-MM-dd'"></span> <span>流水号：<span
+						ng-bind="accept.date | date:'yyyy-MM-dd'"></span>
+					<span title="客户名称"
+						  ng-bind="accept.acceptItems[0].orderItem.order.enterprise.enName"></span>
+					<span>流水号：<span
 						class="text-num" ng-bind="accept.code"></span></span>
 					<span class="text-info" ng-if="accept.sendCode != null" title="送货单号：{{::accept.sendCode}}">
 						送货单号：
@@ -220,8 +223,6 @@
 					</span>
 				</div>
 			</td>
-			<td colspan="3"><span title="客户名称"
-				ng-bind="accept.acceptItems[0].orderItem.order.enterprise.enName"></span></td>
 			<!-- <td colspan="1" class="text-center">
 				<div class="operates">
 					<a href="#" class="text-muted" title="打印">

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

@@ -250,7 +250,7 @@
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 			<tr class="header">
-				<th>商品</th>
+				<th>样品</th>
 				<th width="120">样品数量</th>
 				<th width="200">关联单据</th>
 				<th width="140">送样信息</th>
@@ -279,18 +279,17 @@
 		</thead>
 		<tbody ng-repeat="approval in $data">
 			<tr class="order-hd">
-				<td class="first">
+				<td class="first" colspan="3">
 					<div class="order-main">
 						<!--<span> <input type="checkbox" class="selector"
 							ng-model="approval.$selected">
-						</span> --><span class="text-num text-bold"
-							title="{{approval.inDate | date: 'yyyy年MM月dd日 hh:mm'}}"
-							ng-bind="::approval.inDate | date:'yyyy-MM-dd'"></span> <span
+						</span> -->
+						<span class="text-num text-bold" title="{{approval.inDate | date: 'yyyy年MM月dd日 hh:mm'}}" ng-bind="::approval.inDate | date:'yyyy-MM-dd'"></span>
+						<span title="客户名称" ng-bind="::approval.enterprise.enName"></span>
+						<span
 							title="认定单号" ng-bind="::approval.code"></span>
 					</div>
 				</td>
-				<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 != '合格'}">

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

@@ -220,7 +220,7 @@
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th width="580">商品</th>
+			<th width="580">产品</th>
 			<th width="100">单价</th>
 			<th width="50">数量</th>
 			<th width="120">交货日期</th>
@@ -248,16 +248,17 @@
 	</thead>
 	<tbody ng-repeat="change in $data track by change.id">
 		<tr class="order-hd">
-			<td class="first">
+			<td class="first" colspan="4">
 				<div class="order-main">
 					<span class="text-num text-bold"
-						ng-bind="::change.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
-						class="text-num" ng-bind="::change.code" ui-sref="sale.change_detail({id:change.id})" target="_self"></a></span> <span>订单：<span
+						ng-bind="::change.date | date:'yyyy-MM-dd'"></span>
+					<span
+							ng-bind="::change.enterprise.enName"></span>
+					<span>流水号：<a
+						class="text-num" ng-bind="::change.code" ui-sref="sale.change_detail({id:change.id})" target="_self"></a></span><span>订单：<span
 						class="text-num text-bold" ng-bind="::change.orderCode" ui-sref="sale.order_detail({id:change.orderId})" target="_blank"></span></span>
 				</div>
 			</td>
-			<td colspan="3"><span
-				ng-bind="::change.enterprise.enName"></span></td>
 			<td colspan="1" class="" style="line-height: 20px; padding-top: 5px;">
 				<span ng-bind="change.description"></span>
 			</td>

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

@@ -104,7 +104,7 @@
 			</div>
 		</div>
 		<div class="title-div" style="border-bottom: 1px dashed #327ebe; position: relative;">
-			<span class="f14">商品变更详情</span>
+			<span class="f14">产品变更详情</span>
 			<div class="end" ng-show="change.status == 200">
 				<a class="btn btn-sm btn-default"
 					ng-click="change.$editing=!change.$editing"><i
@@ -142,7 +142,7 @@
 			<table class="block table table-default table-striped table-hover" style="margin-bottom: 0;">
 				<thead>
 				<tr class="header">
-					<th width="380">商品</th>
+					<th width="380">产品</th>
 					<th width="100">单价</th>
 					<th width="60">数量</th>
 					<th width="120">交货日期</th>

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

@@ -199,7 +199,7 @@
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 		<tr class="header">
-			<th>商品</th>
+			<th>产品</th>
 			<th width="110"><span class="text-default">≥</span>分段数</th>
 			<th width="90">价格</th>
 			<th width="80">最小订购</th>
@@ -263,18 +263,19 @@
 		</tbody>
 		<tbody ng-repeat="inquiryItem in $data track by inquiryItem.id">
 		<tr class="order-hd">
-			<td class="first">
+			<td class="first" colspan="3">
 				<div class="order-main">
 						<!--<span> <input type="checkbox" class="selector"
 									  ng-model="inquiryItem.$selected">
-						</span> --><span class="text-num text-bold"
-									  title="{{inquiryItem.inquiry.date}}"
-									  ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
+						</span> -->
+					<span class="text-num text-bold" title="{{inquiryItem.inquiry.date}}"
+									  ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span>
+					<span
+							ng-bind="::inquiryItem.inquiry.enterprise.enName"></span>
+					<span>流水号：<a
 						class="text-num" ng-bind="::inquiryItem.inquiry.code" ui-sref="sale.inquiry_detail({id:inquiryItem.inquiry.id})" target="_self"></a></span>
 				</div>
 			</td>
-			<td colspan="2"><span
-					ng-bind="::inquiryItem.inquiry.enterprise.enName"></span></td>
 			<td>
 				币别：<span ng-bind="::inquiryItem.currency"></span>
 			</td>

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

@@ -90,14 +90,14 @@
 			</div>
 		</div>
 		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-			<span class="f14">商品价格详情</span>&nbsp;
+			<span class="f14">产品价格详情</span>&nbsp;
 		</div>
 		<div class="block">
 			<table class="block table table-default table-striped" style=" margin-bottom: 0">
 				<thead>
 					<tr class="header">
-						<th width="40">序号</th>
-						<th width="270">商品</th>
+						<th width="60">序号</th>
+						<th width="260">产品</th>
 						<th width="90"><span class="text-default">≥</span>分段数</th>
 						<th width="100">价格</th>
 						<th width="50">币别</th>

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

@@ -300,7 +300,7 @@ tbody td div.text-mould {
 			<tr class="header">
 				<th>模具信息</th>
 				<th></th>
-				<th width="180">单品价格</th>
+				<th width="180">价格</th>
 				<th width="0"></th>
 				<th width="80">有效日期</th>
 				<th width="0"></th>
@@ -362,17 +362,15 @@ tbody td div.text-mould {
 		</tbody>
 		<tbody ng-repeat="inquiryMould in $data track by inquiryMould.id">
 			<tr class="order-hd">
-				<td class="first">
+				<td class="first" colspan="3">
 					<div class="order-main">
 						<!--<span> <input type="checkbox" class="selector"
 							ng-model="inquiryMould.$selected">
-						</span>--> <span class="text-num text-bold"
-							title="{{inquiryMould.date}}"
-							ng-bind="::inquiryMould.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
-							class="text-num" ng-bind="::inquiryMould.code" ui-sref="sale.inquiry_mould_detail({id:inquiryMould.id})" target="_self"></a></span>
+						</span>--> <span class="text-num text-bold" title="{{inquiryMould.date}}" ng-bind="::inquiryMould.date | date:'yyyy-MM-dd'"></span>
+						<span ng-bind="::inquiryMould.enterprise.enName"></span>
+						<span>流水号：<a class="text-num" ng-bind="::inquiryMould.code" ui-sref="sale.inquiry_mould_detail({id:inquiryMould.id})" target="_self"></a></span>
 					</div>
 				</td>
-				<td colspan="2" class="text-center"><span ng-bind="::inquiryMould.enterprise.enName"></span></td>
 				<td>
 				</td>
 				<td class = "text-center enddate">

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

@@ -107,7 +107,7 @@ tbody td .text-waiting {
 				<tr class="header">
 					<th width="385">模具资料</th>
 					<th width="20"></th>
-					<th width="300">单品价格</th>
+					<th width="300">价格</th>
 					<th width="200"></th>
 				</tr>
 				</thead>

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

@@ -304,7 +304,7 @@
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th width="400">商品</th>
+			<th width="400">产品</th>
 			<th width="100">单价</th>
 			<th width="100">数量</th>
 			<th width="120">交货日期</th>
@@ -381,7 +381,7 @@
 	</tbody>
 	<tbody ng-repeat="order in $data track by order.id">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
-			<td class="first" colspan="2">
+			<td class="first" colspan="4">
 				<div class="order-main">
 					<span> <input type="checkbox" class="selector"
 						ng-model="order.$selected" ng-click="checkOne(order)">
@@ -396,11 +396,11 @@
 						<i class="fa fa-tags" style="color: #f40;"></i>
 					</a>
 					&nbsp;&nbsp;<span class="text-num text-bold"
-						ng-bind="::order.date | date:'yyyy-MM-dd'"></span> <span>订单号：<a
-						class="text-num" ng-bind="::order.code" ui-sref="sale.order_detail({id:order.id})" target="_self"></a></span>
+						ng-bind="::order.date | date:'yyyy-MM-dd'"></span>
+					<span ng-bind="::order.enterprise.enName"></span>
+					<span>订单号：<a class="text-num" ng-bind="::order.code" ui-sref="sale.order_detail({id:order.id})" target="_self"></a></span>
 				</div>
 			</td>
-			<td colspan="2"><span ng-bind="::order.enterprise.enName"></span></td>
 			<td colspan="1" class="order-sum">{{::order.currency}}： <span
 				ng-bind="::getOrderTotal(order.orderItems) | number : 2"
 				class="text-num text-bold"></span>

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

@@ -83,19 +83,20 @@
 			</div>
 		</div>
 		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-			<span class="f14">商品清单</span>&nbsp;
+			<span class="f14">产品清单</span>&nbsp;
 		</div>
 		<div class="block">
 			<table class="block table table-default table-striped table-hover" style=" margin-bottom: 0">
 				<thead>
 					<tr class="header">
-						<th width="50">行号</th>
-						<th width="200">商品</th>
+						<th width="50">序号</th>
+						<th width="200">产品</th>
 						<th width="80">单价</th>
 						<th width="80">税率</th>
-						<th width="100">数量</th>
+						<th width="110">数量</th>
+						<th width="50">单位</th>
 						<th width="120">交货日期</th>
-						<th width="180">回复状态</th>
+						<th width="120">回复状态</th>
 						<th width="100">操作</th>
 					</tr>
 				</thead>
@@ -123,14 +124,17 @@
 						<td class="text-center" width="80">
 							<div class="text-muted">{{::item.taxrate || 0}}%</div>
 						</td>
-						<td class="text-center" width="100">
-							<div class="text-num" ><span ng-bind="::item.qty"></span><span ng-bind="::item.product.unit"></span></div>
+						<td class="text-center" width="110">
+							<div class="text-num" ><span ng-bind="::item.qty"></span></div>
 							<div style="margin-top: 20px" ng-if="item.$editing">
 								<input type="text" ng-model="item.reply.qty" min="0" max="{{item.qty}}"
 									ng-init="item.reply.qty=item.qty-item.replyQty"
 									class="form-control input-xs" placeholder="0~{{item.qty-item.replyQty}}">
 							</div>
 						</td>
+						<td class="text-center" width="50">
+							<div class="text-num" ><span ng-bind="::item.product.unit"></span></div>
+						</td>
 						<td class="text-center" width="120">
 							<div class="text-num"
 								ng-bind="::item.delivery | date:'yyyy-MM-dd'"></div>
@@ -152,7 +156,7 @@
 								</span>
 							</div>
 						</td>
-						<td width="180">
+						<td width="120">
 							<div ng-show="!item.$editing">
 								<div ng-if="!item.replyQty" class="text-muted text-center">未回复</div>
 								<div ng-if="item.replyQty > 0 && item.replyQty < item.qty">

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

@@ -116,7 +116,7 @@
 	<table class="order-table block" ng-table="tableParams" >
 		<thead>
 		<tr class="header">
-			<th width="400px">商品</th>
+			<th width="400px">产品</th>
 			<th width="90"><span class="text-default">≥</span>分段数</th>
 			<th width="90">价格</th>
 			<th width="80">最小订购</th>
@@ -156,18 +156,14 @@
 		</tbody>
 		<tbody ng-repeat="quotationItem in $data track by quotationItem.id">
 		<tr class="order-hd">
-			<td class="first">
+			<td class="first" colspan="3">
 				<div class="order-main">
-					<span> <input type="checkbox" class="selector"
-								  ng-model="quotationItem.$selected">
-					</span> <span class="text-num text-bold"
-								  title="{{quotationItem.date}}"
-								  ng-bind="::quotationItem.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
-						class="text-num" ng-bind="::quotationItem.code" ui-sref="sale.quotation.item({id:quotationItem.id})" target="_self"></a></span>
+					<span> <input type="checkbox" class="selector" ng-model="quotationItem.$selected"></span>
+					<span class="text-num text-bold" title="{{quotationItem.date}}" ng-bind="::quotationItem.date | date:'yyyy-MM-dd'"></span>
+					<span ng-bind="::quotationItem.cust.enName"></span>
+					<span>流水号：<a class="text-num" ng-bind="::quotationItem.code" ui-sref="sale.quotation.item({id:quotationItem.id})" target="_self"></a></span>
 				</div>
 			</td>
-			<td colspan="2"><span
-					ng-bind="::quotationItem.cust.enName"></span></td>
 			<td>
 				币别：<span ng-bind="::quotationItem.currency"></span>
 			</td>

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

@@ -167,26 +167,26 @@
 			</div>
 		</div>
 		<div class="form-group form-group-sm has-feedback">
-			<label for="product" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料：</label>
+			<label for="product" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>产品编号：</label>
 			<div class="col-sm-4">
 				<div class="">
 					<input ng-model="item.product.code" type="text" class="form-control input-dbfind" id="product" 
-						placeholder="点击选择物料" readonly="readonly" style="cursor: pointer;"
+						placeholder="点击选择产品" readonly="readonly" style="cursor: pointer;"
 						ng-click="dbfindCustProd()" ng-required="true">
 					<span class="form-control-feedback text-simple"  ng-if="item.$editing"><i class="fa fa-search"></i></span>
 				</div>
 			</div>
-			<label for="product" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料名称：</label>
+			<label for="product" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>产品名称：</label>
 			<div class="col-sm-4">
 				<div class="">
 					<input ng-model="item.product.title" type="text" class="form-control input-dbfind" id="product"
-						   placeholder="点击选择物料" readonly="readonly" style="cursor: pointer;"
+						   placeholder="点击选择产品" readonly="readonly" style="cursor: pointer;"
 						   ng-required="true">
 				</div>
 			</div>
 		</div>
 		<div class="form-group form-group-sm has-feedback">
-			<label for="product" class="col-sm-2 control-label">物料规格：</label>
+			<label for="product" class="col-sm-2 control-label">产品规格：</label>
 			<div class="col-sm-10">
 				<div class="">
 					<input ng-model="item.product.spec" type="text" class="form-control input-dbfind" id="product"

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

@@ -188,10 +188,10 @@
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 			<tr class="header">
-				<th>商品</th>
-				<th width="120">采购单价</th>
+				<th>产品</th>
+				<th width="120">单价</th>
 				<th width="100">验退数量</th>
-				<th width="120">入库批号</th>
+				<th width="120">批号</th>
 				<th width="140">单据信息</th>
 				<th width="70">操作</th>
 			</tr>
@@ -218,21 +218,22 @@
 		</thead>
 		<tbody ng-repeat="returns in $data">
 			<tr class="order-hd">
-				<td class="first">
+				<td class="first" colspan="4">
 					<div class="order-main">
 						<!--<span> <input type="checkbox" class="selector"
 							ng-model="returns.$selected">
 						</span> --><span class="text-num text-bold"
 							title="{{::returns.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-							ng-bind="::returns.date | date:'yyyy-MM-dd'"></span> <span>流水号：<span
-							class="text-num" ng-bind="::returns.code"></span></span>
+							ng-bind="::returns.date | date:'yyyy-MM-dd'"></span>
+						<span
+								title="客户名称"
+								ng-bind="::returns.returnItems[0].orderItem.order.enterprise.enName" ng-if="returns.returnItems[0].orderItem"></span>
+						<span
+								title="客户名称">{{returns.enName}}</span>
+						<span>流水号：<span
+							class="text-num" ng-bind="::returns.code" ng-if="!returns.returnItems[0].orderItem"></span></span>
 					</div>
 				</td>
-				<td colspan="3" ng-if="returns.returnItems[0].orderItem"><span
-					title="客户名称"
-					ng-bind="::returns.returnItems[0].orderItem.order.enterprise.enName"></span></td>
-				<td colspan="3" ng-if="!returns.returnItems[0].orderItem"><span
-					title="客户名称">{{returns.enName}}</span></td>
 				<td colspan="1" class="order-sum">
 					<div class="text-ellipsis" ng-if="returns.sendCode != null"
 						style="width: 120px;" title="送货单号：{{::returns.sendCode}}">

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

@@ -238,7 +238,7 @@
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th>商品</th>
+			<th>样品</th>
 			<th width="120">数量</th>
 			<th width="60">是否收费</th>
 			<th width="140">单价</th>
@@ -272,9 +272,9 @@
 						ng-model="sample.$selected">
 					</span> --><span class="text-num text-bold" title="{{sample.proofing.date | date: 'yyyy年MM月dd日 hh:mm'}}"
 						ng-bind="sample.proofing.date | date:'yyyy-MM-dd'"></span>
-					<span>流水号：<a class="text-num" ng-bind="::sample.proofing.code" ui-sref="sale.sample_detail({id:sample.id})" target="_self"></a></span>
 					<span title="客户名称"
 						  ng-bind="sample.proofing.enterprise.enName"></span>
+					<span>流水号：<a class="text-num" ng-bind="::sample.proofing.code" ui-sref="sale.sample_detail({id:sample.id})" target="_self"></a></span>
 				</div>
 			</td>
 			<td class="text-center">

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

@@ -99,14 +99,14 @@
 			</div>
 		</div>
 		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-			<span class="f14">商品清单</span>&nbsp;
+			<span class="f14">产品清单</span>&nbsp;
 		</div>
 		<div class="block">
 			<table class="block table table-default table-striped table-hover" style="margin-bottom: 0;">
 				<thead>
 				<tr class="header">
-					<th width="50">行号</th>
-					<th width="300">商品</th>
+					<th width="50">序号</th>
+					<th width="300">产品</th>
 					<th width="80">单价</th>
 					<th width="140">发货数量</th>
 					<th width="150">收料信息</th>

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

@@ -304,7 +304,7 @@
                             <dl ng-show = "bid.result != 1 || bid.auditStatus == 0" >
                                 <dt>
                                     <span>序号</span>
-                                    <span class="wid01">产品信息</span>
+                                    <span class="wid01">产品</span>
                                     <span>单位</span>
                                     <span>采购数量</span>
                                     <span>采购周期</span>

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

@@ -287,7 +287,7 @@
                             <dl>
                                 <dt>
                                     <span>序号</span>
-                                    <span class="wid01">产品信息</span>
+                                    <span class="wid01">产品</span>
                                     <span>单位</span>
                                     <span>采购数量</span>
                                     <span>采购周期</span>