Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

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/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -212,9 +212,9 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
         UASBatchPutOnPropertyServices.get(null, function (data) {
             if (data) {
                 $scope.uasBatchPutOnProperty = data;
-                $scope.uasBatchPutOnProperty.editFluctuateRate = $scope.uasBatchPutOnProperty.fluctuateRate * 100;
-                $scope.uasBatchPutOnProperty.editMaxDelivery = $scope.uasBatchPutOnProperty.maxDelivery;
-                $scope.uasBatchPutOnProperty.editMinDelivery = $scope.uasBatchPutOnProperty.minDelivery;
+                $scope.uasBatchPutOnProperty.editFluctuateRate = NumberService.mul($scope.uasBatchPutOnProperty.fluctuateRate, 100) || 100;
+                $scope.uasBatchPutOnProperty.editMaxDelivery = $scope.uasBatchPutOnProperty.maxDelivery || 1;
+                $scope.uasBatchPutOnProperty.editMinDelivery = $scope.uasBatchPutOnProperty.minDelivery || 1;
             } else {
 				$scope.uasBatchPutOnProperty = {};
                 $scope.uasBatchPutOnProperty.editFluctuateRate = 100;
@@ -2020,10 +2020,11 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			UASBatchPutOnPropertyServices.save(null, $scope.uasBatchPutOnProperty, function (data) {
 				if (data.code == 1) {
 					$scope.uasBatchPutOnProperty = data.data;
-					$scope.uasBatchPutOnProperty.editFluctuateRate =  $scope.uasBatchPutOnProperty.fluctuateRate * 100;
+					$scope.uasBatchPutOnProperty.editFluctuateRate =  NumberService.mul($scope.uasBatchPutOnProperty.fluctuateRate, 100);
 					$scope.uasBatchPutOnProperty.editMinDelivery = $scope.uasBatchPutOnProperty.minDelivery;
 					$scope.uasBatchPutOnProperty.editMaxDelivery = $scope.uasBatchPutOnProperty.maxDelivery;
 					toaster.pop('success', '成功', "保存成功");
+					$scope.isBatch = false;
 				} else {
 					toaster.pop('error', '失败', data.message);
 				}

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,8 +296,9 @@
 		height: 25px;
 	}
 	.search-check .batch-operate .operate-content .batch-sale input {
-		width: 42px;
+		width: 60px;
 		margin-right: 10px;
+		padding-right: 12px;
 	}
 	.search-check .batch-operate .operate-content .batch-sale div .com-btn-submit {
 		margin-right: 10px;
@@ -304,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 {
@@ -1619,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>
@@ -1821,7 +1826,7 @@
 														<div class="content margin10">
 															<!--<p class="title">自营 / 寄售</p>-->
 															<div class="input-list">
-																<select ng-disabled="$$nonProduct.canSelfSale" name="selfSale" class="wid56 select-adder form-control" ng-model="goods.editSelfSale" ng-disabled="$$nonProduct.canSelfSale">
+																<select ng-disabled="!$$nonProduct.canSelfSale" name="selfSale" class="wid56 select-adder form-control" ng-model="goods.editSelfSale">
 																	<option value="1">自营</option>
 																	<option value="2">寄售</option>
 																</select>

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,8 +296,9 @@
 		height: 25px;
 	}
 	.search-check .batch-operate .operate-content .batch-sale input {
-		width: 42px;
+		width: 60px;
 		margin-right: 10px;
+		padding-right: 12px;
 	}
 	.search-check .batch-operate .operate-content .batch-sale div .com-btn-submit {
 		margin-right: 10px;
@@ -304,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 {
@@ -1608,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">-->
@@ -1629,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>
@@ -1834,7 +1839,7 @@
 														<div class="content margin10">
 															<!--<p class="title">自营 / 寄售</p>-->
 															<div class="input-list">
-																<select ng-disabled="$$nonProduct.canSelfSale" name="selfSale" class="wid56 select-adder form-control" ng-model="goods.editSelfSale" ng-disabled="$$nonProduct.canSelfSale">
+																<select ng-disabled="!$$nonProduct.canSelfSale" name="selfSale" class="wid56 select-adder form-control" ng-model="goods.editSelfSale">
 																	<option value="1">自营</option>
 																	<option value="2">寄售</option>
 																</select>

src/main/webapp/resources/view/vendor/forstore/vendor_material_person.html

@@ -1585,7 +1585,7 @@
 						</td>
 						<!--<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>-->
 						<td>
-							<span ng-bind="material.packaging || '-'" title="{{material.packaging || '-'}}"></span>
+							<span ng-bind="material.spec || '-'" title="{{material.spec || '-'}}"></span>
 						</td>
 						<td class="edit">
 							<span name="delete-material" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="deleteMaterial(material)"><span>删除</span></span>

src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -570,7 +570,7 @@
                     <!--</div>-->
                 <!--</div>-->
                 <div class="com-modal-wrap" ng-if="result && result.total != 0 && !hadImport && $$productOn.tab == 'bathOnPerson' && personMedol">
-                    <div class="com-del-box">
+                    <div class="com-del-box com-mall-del-box">
                         <div class="title">
                             <i ng-click="setPersonMedol()"></i>
                         </div>