Browse Source

标准产品样式调整

yangc 8 years ago
parent
commit
d35e2ef0b6

+ 16 - 3
src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_erp.html

@@ -251,6 +251,7 @@
 	}
 	}
 	.search-check .batch-operate .operate-head .check-active {
 	.search-check .batch-operate .operate-head .check-active {
 		font-weight: normal;
 		font-weight: normal;
+		height: 40px;
 	}
 	}
 	.search-check .batch-operate .operate-content {
 	.search-check .batch-operate .operate-content {
 		height: 70px;
 		height: 70px;
@@ -258,10 +259,10 @@
 	}
 	}
 	.search-check .batch-operate .operate-content > div {
 	.search-check .batch-operate .operate-content > div {
 		display: inline-block;
 		display: inline-block;
-		float: left;
 	}
 	}
 	.search-check .batch-operate .operate-content > div:first-child {
 	.search-check .batch-operate .operate-content > div:first-child {
-		margin-right: 50px;
+		margin-right: 111px;
+		margin-left: 28px;
 	}
 	}
 	.search-check .batch-operate .operate-content > div p {
 	.search-check .batch-operate .operate-content > div p {
 		font-weight: bold;
 		font-weight: bold;
@@ -293,6 +294,18 @@
 	}
 	}
 	.search-check .batch-operate .operate-content .batch-sale input {
 	.search-check .batch-operate .operate-content .batch-sale input {
 		width: 42px;
 		width: 42px;
+		margin-right: 10px;
+	}
+	.search-check .batch-operate .operate-content .batch-sale div .com-btn-submit {
+		margin-right: 10px;
+	}
+	.search-check .batch-operate .operate-content .batch-sale > div {
+		position: relative;
+	}
+	.search-check .batch-operate .operate-content .batch-sale div i {
+		position: absolute;
+		left: 216px;
+		top: 2px;
 	}
 	}
 	.search-check .batch-operate .operate-content .batch-date input {
 	.search-check .batch-operate .operate-content .batch-date input {
 		width: 56px;
 		width: 56px;
@@ -1615,7 +1628,7 @@
 					<div class="operate-content">
 					<div class="operate-content">
 						<div class="batch-sale">
 						<div class="batch-sale">
 							<p><span class="batch-price-title">批量设置销售价:</span><em>1</em><span class="batch-progress"><i style="left: {{uasBatchPutOnProperty.editFluctuateRate ? uasBatchPutOnProperty.editFluctuateRate > 200 ? '100%' : uasBatchPutOnProperty.editFluctuateRate / 2 + '%' : 0}}"></i></span><em>200</em></p>
 							<p><span class="batch-price-title">批量设置销售价:</span><em>1</em><span class="batch-progress"><i style="left: {{uasBatchPutOnProperty.editFluctuateRate ? uasBatchPutOnProperty.editFluctuateRate > 200 ? '100%' : uasBatchPutOnProperty.editFluctuateRate / 2 + '%' : 0}}"></i></span><em>200</em></p>
-							<div><span>销售价 = 近一个月的平均销售价 X </span><input type="number" ng-model="uasBatchPutOnProperty.editFluctuateRate" ng-change="onSalePriceChange()"> %
+							<div><span>销售价 = 近一个月的平均销售价 X </span><input type="number" ng-model="uasBatchPutOnProperty.editFluctuateRate" ng-change="onSalePriceChange()"><i>%</i>
 								<span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(100)">100%</span>
 								<span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(100)">100%</span>
 								<span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(120)">120%</span>
 								<span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(120)">120%</span>
 								<span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(130)">130%</span>
 								<span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(130)">130%</span>