yangc 8 лет назад
Родитель
Сommit
5ace76845d
1 измененных файлов с 17 добавлено и 16 удалено
  1. 17 16
      src/main/webapp/resources/view/vendor/forstore/vendor_material.html

+ 17 - 16
src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1541,7 +1541,7 @@
 	.standard-tab.table>tbody>tr>td .batch-line {
 	.standard-tab.table>tbody>tr>td .batch-line {
 		width: 100%;
 		width: 100%;
 		height: 30px;
 		height: 30px;
-		background: #FDB8B8;
+		background: #fdd6d6;
 		line-height: 30px;
 		line-height: 30px;
 	}
 	}
 </style>
 </style>
@@ -1628,6 +1628,20 @@
 								<span>*匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="cancelTip()">&times;</a>
 								<span>*匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="cancelTip()">&times;</a>
 							</td>
 							</td>
 						</tr>
 						</tr>
+						<tr class="no-hover batch-tr" ng-if="(chooseAll || chooseAllPage) && currenctMaterial.length != 0">
+							<td colspan="7">
+								<div class="batch-line" ng-if="chooseAll && !chooseAllPage">
+									已选中当前页
+									<em class="red" ng-bind="materialAll.numberOfElements"></em>个产品,
+									<a ng-click="turnAllPage()" class="blue">点击此处</a>切换选中所有页面<em class="red" ng-bind="materialAll.totalElements"></em>个产品
+								</div>
+								<div class="batch-line" ng-if="chooseAllPage">
+									已选中所有页面
+									<em class="red" ng-bind="materialAll.totalElements"></em>个产品,
+									<a ng-click="cancelAllPage()" class="blue">点击此处</a>全部取消选中
+								</div>
+							</td>
+						</tr>
 					</tbody>
 					</tbody>
 					<tbody ng-repeat="material in currenctMaterial">
 					<tbody ng-repeat="material in currenctMaterial">
 					<!--<tr ng-class="{ 'active': material.selected }" class="gre-bg">-->
 					<!--<tr ng-class="{ 'active': material.selected }" class="gre-bg">-->
@@ -2009,20 +2023,6 @@
 					</tr>
 					</tr>
 					</tbody>
 					</tbody>
 					<tbody>
 					<tbody>
-					<tr class="no-hover batch-tr" ng-if="(chooseAll || chooseAllPage) && currenctMaterial.length != 0">
-						<td colspan="7">
-							<div class="batch-line" ng-if="chooseAll && !chooseAllPage">
-								已选中当前页
-								<em class="red" ng-bind="materialAll.numberOfElements"></em>个产品,
-								<a ng-click="turnAllPage()" class="blue">点击此处</a>切换选中所有页面<em class="red" ng-bind="materialAll.totalElements"></em>个产品
-							</div>
-							<div class="batch-line" ng-if="chooseAllPage">
-								已选中所有页面
-								<em class="red" ng-bind="materialAll.totalElements"></em>个产品,
-								<a ng-click="cancelAllPage()" class="blue">点击此处</a>全部取消选中
-							</div>
-						</td>
-					</tr>
 					<!--<tr class="no-hover batch-tr" ng-if="chooseAll && !chooseAllPage" ng-class="{'active': $data.length > 10}">-->
 					<!--<tr class="no-hover batch-tr" ng-if="chooseAll && !chooseAllPage" ng-class="{'active': $data.length > 10}">-->
 					</tbody>
 					</tbody>
 				</table>
 				</table>
@@ -2284,6 +2284,7 @@
     }
     }
 </style>
 </style>
 
 
+<!--
 <script>
 <script>
 	$(function(){
 	$(function(){
 		$(document).on('click', function () {
 		$(document).on('click', function () {
@@ -2301,4 +2302,4 @@
 			}
 			}
 		});
 		});
 	})
 	})
-</script>
+</script>-->