ERP上下架页面调整

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -481,7 +481,7 @@ define([ 'app/app' ], function(app) {
 				angular.forEach($scope.currenctMaterial, function (material, index) {
 					material.isChoosed = false;
 					//第一个自动展开
-					if (index == 0 && $stateParams.standardParam && $stateParams.standardParam =='unstandard') {
+					if (index == 0 && $stateParams.standardParam && ($stateParams.standardParam =='standard' || $stateParams.standardParam =='unstandard')) {
 						material.selected = true;
 					}
 				});

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_unstandard_erp.html

@@ -488,22 +488,22 @@
 			<div class="check fr">
 				<!--<a ng-show="!isBatch && standard_tab == 'unstandard'" ng-click="matchAll()"><span ng-show="!isBatch && standard_tab == 'unstandard'">一键匹配</span></a>-->
 				<a ng-show="!isBatch" ng-click="enterBatch()"><span ng-show="!isBatch">批量操作：</span></a>
-				<label class="check-active">
+				<!--<label class="check-active">
 				<input type="checkbox"  ng-click="chooseAll()" ng-checked="isChoosedAll" id="AllChoose"/>
 				<label for="AllChoose"></label>
 				<span>全选</span>
 				</label>
 				<a>提交申请</a>
-				<a>忽略选中</a>
-				<!--<span class="check-btn" ng-show="isBatch">-->
-                    <!--<label class="check-active">-->
-                        <!--<input type="checkbox"  ng-click="chooseAll()" ng-checked="isChoosedAll" id="AllChoose"/>-->
-                        <!--<label for="AllChoose"></label>-->
-                        <!--<span>全选</span>-->
-                    <!--</label>-->
-                    <!--<a ng-click="deleteBatch()">删除</a>-->
-                    <!--<a ng-click="exitBatch()">取消</a>-->
-                <!--</span>-->
+				<a>忽略选中</a>-->
+				<span class="check-btn" ng-show="isBatch">
+                    <label class="check-active">
+                        <input type="checkbox"  ng-click="chooseAll()" ng-checked="isChoosedAll" id="AllChoose"/>
+                        <label for="AllChoose"></label>
+                        <span>全选</span>
+                    </label>
+                    <a ng-click="deleteBatch()">删除</a>
+                    <a ng-click="exitBatch()">取消</a>
+                </span>
 			</div>
 		</div>
 		<div class="wanted_list01">