Merge branch 'erp_batchToGoods_20180117' of ssh://10.10.100.21/source/platform-b2c into erp_batchToGoods_20180117

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

@@ -1587,7 +1587,7 @@
 				<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>
-					<span class="check-btn" ng-show="isBatch">
+					<!--<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>
@@ -1596,9 +1596,9 @@
 						<a
 								ng-click="deleteBatch()" name="delete-material">删除</a>
 						<a ng-click="exitBatch()">取消</a>
-					</span>
+					</span>-->
 				</div>
-				<div class="batch-operate">
+				<div class="batch-operate" ng-show="isBatch">
 					<div class="operate-head">
 						<label class="check-active fl">
 							<input type="checkbox"  ng-click="chooseAll()" ng-checked="isChoosedAll" id="AllChoose"/>
@@ -1609,7 +1609,7 @@
 							<span class="com-btn-level1 com-btn-submit" ng-click="batchPutOn()">上架</span>
 							<span class="com-btn-level1 com-btn-submit" ng-mouseenter="enterBatchPutOnPropertySaveButton()" ng-mouseleave="leaveBatchPutOnPropertySaveButton()" ng-click="saveBatchPutOnProperty()">保存</span>
 							<span class="com-btn-level1 com-btn-red">删除</span>
-							<span class="com-btn-level1 com-btn-cancel">取消</span>
+							<span class="com-btn-level1 com-btn-cancel" ng-click="exitBatch()">取消</span>
 						</div>
 					</div>
 					<div class="operate-content">

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

@@ -1586,7 +1586,7 @@
 				</div>
 				<div class="check fr">
 					<a ng-click="matchAll()"><span>一键匹配</span></a>
-					<a ng-click="enterBatch()"><span>批量操作</span></a>
+					<a ng-click="enterBatch()" ng-show="!isBatch"><span>批量操作</span></a>
 					<!--<span class="check-btn" ng-show="isBatch">-->
 						<!--<label class="check-active">-->
 							<!--<input type="checkbox"  ng-click="chooseAll()" ng-checked="isChoosedAll" id="AllChoose"/>-->
@@ -1598,7 +1598,7 @@
 						<!--<a ng-click="exitBatch()">取消</a>-->
 					<!--</span>-->
 				</div>
-				<div class="batch-operate">
+				<div class="batch-operate" ng-show="isBatch">
 					<div class="operate-head">
 						<label class="check-active fl">
 							<input type="checkbox"  ng-click="chooseAll()" ng-checked="isChoosedAll" id="AllChoose"/>
@@ -1609,7 +1609,7 @@
 							<span class="com-btn-level1 com-btn-submit">上架</span>
 							<span class="com-btn-level1 com-btn-submit">保存</span>
 							<span class="com-btn-level1 com-btn-red">删除</span>
-							<span class="com-btn-level1 com-btn-cancel">取消</span>
+							<span class="com-btn-level1 com-btn-cancel" ng-click="exitBatch()">取消</span>
 						</div>
 					</div>
 					<div class="operate-content">