wangcz пре 7 година
родитељ
комит
7371e89a7e

+ 1 - 1
src/main/webapp/resources/view/usercenter/b2b/Purc/vendor.html

@@ -141,7 +141,7 @@
 						<td class="text-center" title="{{vendor.saleContacts.toString()}}">
 							<span ng-repeat="users in vendor.saleContacts | limitTo: 3">{{users}}<br/></span>
 							<span ng-if="vendor.saleContacts.length > 3">...</span>
-							<span ng-if="!vendor.saleContacts || vendor.saleContacts.length === 0">-</span>
+							<span ng-if="!vendor.saleContacts || vendor.saleContacts.length === 0">待分配</span>
 						</td>
 						<td class="text-center">
 							<a ng-click="purcByEn(vendor.vendorEnterprise.enBussinessCode)">下采购单</a><br/>

+ 9 - 13
src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -1127,10 +1127,9 @@
             <thead>
             <tr>
                 <th width="110">发布时间</th>
-                <th width="220">品牌/物料名称</th>
-                <th width="220">型号/规格</th>
+                <th width="260">品牌/物料名称</th>
+                <th width="260">型号/规格</th>
                 <th width="110">采购数量(PCS)</th>
-                <th width="80">税率%</th>
                 <th width="120">截止日期</th>
                 <th width="140">操作</th>
             </tr>
@@ -1169,13 +1168,6 @@
                         </div>
                     </div>
                 </td>
-                <td>
-                    <div class="row-wrap il-content">
-                        <div class="il-box-small il-box">
-                            <div title="{{seek.taxrate}}" class="item" style="width:80px;">{{seek.taxrate || '-'}}</div>
-                        </div>
-                    </div>
-                </td>
                 <td>
                     <div class="row-wrap">
                         <!--<div ng-bind="seek.endDate | date:'yyyy-MM-dd'"></div>
@@ -1217,7 +1209,7 @@
                 </td>
             </tr>
             <tr class="expand-row" ng-if="seek.$status == 1 || seek.$status == 2 || seek.$status == 3">
-                <td colspan="7">
+                <td colspan="6">
                     <div>
                         <div class="switch-line">
                             <a ng-disabled="goodsCount == 0" ng-class="{'active': seek.$status == 1}" ng-click="setSeekStatus(seek, 1, goodsCount == 0)">商城现货(<span ng-bind="goodsCount"></span>)</a>
@@ -1297,7 +1289,8 @@
                                 <thead>
                                 <tr ng-if="currentSeek.$status == 2">
                                     <th width="273">卖家</th>
-                                    <th width="233">交期(天)</th>
+                                    <th width="173">交期(天)</th>
+                                    <th width="80">税率%</th>
                                     <th width="234">价格梯度</th>
                                     <!--<th width="195">生产日期</th>-->
                                     <th width="221">操作</th>
@@ -1308,6 +1301,7 @@
                                     <th width="96">型号</th>
                                     <th width="80">规格</th>
                                     <th width="81">交期(天)</th>
+                                    <th width="80">税率%</th>
                                     <th width="102">价格梯度</th>
                                     <th width="100">报价时间</th>
                                     <!--<th width="195">生产日期</th>-->
@@ -1320,7 +1314,8 @@
                                     <tbody>
                                     <tr ng-repeat="of in offer track by $index" ng-if="currentSeek.$status == 2 && of.isReplace != 1">
                                         <td width="273" ng-bind="of.vendName" title="{{of.vendName}}"></td>
-                                        <td width="233" class="red-text" ng-bind="of.leadtime">4-6</td>
+                                        <td width="173" class="red-text" ng-bind="of.leadtime">4-6</td>
+                                        <td width="80" class="red-text" ng-bind="of.taxrate">4-6</td>
                                         <td width="234" class="seek-replies">
                                             <!--<span>{{of.currency + of.unitPrice | currencyStr}}</span>-->
                                             <div class="red-text">
@@ -1366,6 +1361,7 @@
                                         <td width="96" ng-bind="of.replaceCmpCode || '-'" title="{{of.replaceCmpCode}}"></td>
                                         <td width="80" ng-bind="of.replaceSpec || '-'" title="{{of.replaceSpec}}"></td>
                                         <td width="81" class="red-text" ng-bind="of.leadtime">4-6</td>
+                                        <td width="80" class="red-text" ng-bind="of.taxrate">4-6</td>
                                         <td width="102" class="seek-replies">
                                             <!--<span>{{of.currency + of.unitPrice | currencyStr}}</span>-->
                                             <div class="red-text">