批量操作提示语

src/main/webapp/resources/css/erp/align.css

@@ -13,10 +13,9 @@
 /*btnSize*/
 .com-btn-level1 {
     display: inline-block;
-    height: 25px;
-    width:64px;
+    padding: 0 17px;
     text-align: center;
-    line-height: 23px;
+    line-height: 25px;
     font-size: 14px;
     cursor: pointer;
     vertical-align: middle;

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

@@ -253,6 +253,9 @@
 		font-weight: normal;
 		height: 40px;
 	}
+	.search-check .batch-operate .operate-head .red-text {
+		color: #ee4312;
+	}
 	.search-check .batch-operate .operate-content {
 		height: 70px;
 		line-height: 30px;
@@ -293,9 +296,9 @@
 		height: 25px;
 	}
 	.search-check .batch-operate .operate-content .batch-sale input {
-		width: 42px;
+		width: 60px;
 		margin-right: 10px;
-		padding-right: 10px;
+		padding-right: 12px;
 	}
 	.search-check .batch-operate .operate-content .batch-sale div .com-btn-submit {
 		margin-right: 10px;
@@ -305,7 +308,7 @@
 	}
 	.search-check .batch-operate .operate-content .batch-sale div i {
 		position: absolute;
-		left: 216px;
+		left: 234px;
 		top: 2px;
 	}
 	.search-check .batch-operate .operate-content .batch-date input {
@@ -1620,7 +1623,8 @@
 							<span>全选</span>
 						</label>
 						<div class="fr">
-							<span class="com-btn-level1 com-btn-submit" ng-click="batchPutOn()">上架</span>
+							<span class="red-text">批量上架仅作用于未上架的产品，已上架的不再重复上架！</span>
+							<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" ng-click="deleteBatch()">删除</span>
 							<span class="com-btn-level1 com-btn-cancel" ng-click="exitBatch()">取消</span>

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

@@ -253,6 +253,9 @@
 		font-weight: normal;
 		height: 40px;
 	}
+	.search-check .batch-operate .operate-head .red-text {
+		color: #ee4312;
+	}
 	.search-check .batch-operate .operate-content {
 		height: 70px;
 		line-height: 30px;
@@ -293,9 +296,9 @@
 		height: 25px;
 	}
 	.search-check .batch-operate .operate-content .batch-sale input {
-		width: 42px;
+		width: 60px;
 		margin-right: 10px;
-		padding-right: 10px;
+		padding-right: 12px;
 	}
 	.search-check .batch-operate .operate-content .batch-sale div .com-btn-submit {
 		margin-right: 10px;
@@ -305,7 +308,7 @@
 	}
 	.search-check .batch-operate .operate-content .batch-sale div i {
 		position: absolute;
-		left: 216px;
+		left: 234px;
 		top: 2px;
 	}
 	.search-check .batch-operate .operate-content .batch-date input {
@@ -1609,7 +1612,7 @@
 					<a ng-click="download()">批量导出</a>
 				</div>
 				<div class="check fr">
-					<a ng-click="matchAll()"><span>一键匹配</span></a>
+					<a ng-click="matchAll()" ng-show="!isBatch"><span>一键匹配</span></a>
 					<a ng-click="enterBatch()" ng-show="!isBatch"><span>批量操作</span></a>
 					<!--<span class="check-btn" ng-show="isBatch">-->
 						<!--<label class="check-active">-->
@@ -1630,7 +1633,8 @@
 							<span>全选</span>
 						</label>
 						<div class="fr">
-							<span class="com-btn-level1 com-btn-submit" ng-click="batchPutOn()">上架</span>
+							<span class="red-text">批量上架仅作用于未上架的产品，已上架的不再重复上架！</span>
+							<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" ng-click="deleteBatch()">删除</span>
 							<span class="com-btn-level1 com-btn-cancel" ng-click="exitBatch()">取消</span>