客户公共询价页面调整

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

@@ -310,7 +310,7 @@
     </div>
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
-		<tr class="header">
+		<tr class="header" ng-if="active != 'todoAll' && active != 'todoRemind' && active != 'todoComRemind'">
 			<th>产品型号</th>
 			<th width="160">品牌</th>
 			<th width="110">分段数量</th>
@@ -318,6 +318,14 @@
 			<th width="160">最小订购/包装</th>
 			<th width="75">操作</th>
 		</tr>
+        <tr class="header" ng-if="active == 'todoAll' || active == 'todoRemind' || active == 'todoComRemind'">
+            <th>产品型号</th>
+            <th width="160">品牌</th>
+            <th width="110" class="line"><em></em>需求数量</th>
+            <th width="90">税率</th>
+            <th width="160" class="line"><em></em>报价截止日期</th>
+            <th width="75">操作</th>
+        </tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>
 		</tr>
@@ -480,16 +488,11 @@
                 </div>
             </td>
             <td>
-                币别：<span ng-bind="::(isUser?'-':inquiryItem.currency)"></span>
             </td>
             <td>
-                税率：<span>17</span>%
+
             </td>
             <td class="text-right" colspan="2" class="order-sum">
-                <div ng-if="inquiryItem.replyable">
-                    <span class="text-inverse text-bold" ng-bind="::inquiryItem.inquiry.endDate | timespan"></span>
-                    <span class="text-muted" style="margin-right:35px;">后截止报价</span>
-                </div>
             </td>
         </tr>
         <tr class="order-bd">
@@ -524,20 +527,13 @@
                 <span ng-bind="inquiryItem.product.brand || inquiryItem.inbrand || '-'"></span>
             </td>
             <td class="text-center">
-                <div ng-repeat="reply in inquiryItem.replies">
-                    <span ng-bind="reply.lapQty"></span>
-                </div>
+                <span ng-bind="inquiryItem.needquantity || '-'"></span>
             </td>
             <td class="text-center">
-                <div ng-repeat="reply in inquiryItem.replies">
-                    <span ng-bind="isUser?'':(reply.price | number:6)"></span>
-                    <span ng-show="reply.price == null || isUser" class="text-muted">-</span>
-                </div>
+                <span>17</span>%
             </td>
             <td class="text-center">
-                <span ng-bind="inquiryItem.minOrderQty ? inquiryItem.minOrderQty : '-'"></span>
-                <span>/</span>
-                <span ng-bind="inquiryItem.minPackQty ? inquiryItem.minPackQty : '-'"></span>
+                <span ng-bind-html="inquiryItem.endDate| datespan"></span>
             </td>
             <td ng-if="inquiryItem.quoted == 1">
                 <a class="offer" ng-click="">已报价</a>
@@ -567,10 +563,8 @@
                 </div>
             </td>
             <td>
-                币别：<span ng-bind="::(isUser?'-':inquiryItem.currency)"></span>
             </td>
             <td>
-                税率：<span>17</span>%
             </td>
             <td class="text-right" colspan="2" class="order-sum">
                 <div ng-if="inquiryItem.replyable">
@@ -611,20 +605,13 @@
                 <span ng-bind="inquiryItem.product.brand || inquiryItem.inbrand || '-'"></span>
             </td>
             <td class="text-center">
-                <div ng-repeat="reply in inquiryItem.replies">
-                    <span ng-bind="reply.lapQty"></span>
-                </div>
+                <span ng-bind="needQty || '-'"></span>
             </td>
             <td class="text-center">
-                <div ng-repeat="reply in inquiryItem.replies">
-                    <span ng-bind="isUser?'':(reply.price | number:6)"></span>
-                    <span ng-show="reply.price == null || isUser" class="text-muted">-</span>
-                </div>
+                <span>17</span>%
             </td>
             <td class="text-center">
-                <span ng-bind="inquiryItem.minOrderQty ? inquiryItem.minOrderQty : '-'"></span>
-                <span>/</span>
-                <span ng-bind="inquiryItem.minPackQty ? inquiryItem.minPackQty : '-'"></span>
+                <span ng-bind-html="inquiryItem.endDate| datespan"></span>
             </td>
             <td>
                 <div ng-if="inquiryItem.remainingTime <= 0" class="block">