Sfoglia il codice sorgente

标准产品上架取消按钮

yangc 8 anni fa
parent
commit
9d773eb456

+ 3 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -674,6 +674,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 				$scope.goods.minDelivery = data.minDelivery;
 				$scope.goods.maxDelivery = data.maxDelivery;
 				$scope.goods.prices = [];
+				product.selected = true;
 				if ('MAINLAND' == $scope.store.enType)
 					$scope.goods.prices.push({start : $scope.minReserve, end : $scope.maxReserve, rMBPrice: data.price});
 				if ('HK' == $scope.store.enType)
@@ -699,9 +700,10 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 					$scope.goods.prices.push({start : $scope.minReserve, end : $scope.maxReserve});
 					$scope.goods.isSelfSupport = $scope.store.status == 'OPENED' ? 1 : 0;
 					product.img = component.img || null;
-					product.selected = true;
 					if ('ERP' == product.sourceApp) {// 如果是erp上传物料获取物料交易信息
 						getProductDetail(product);
+					} else {
+						product.selected = true;
 					}
 				} else {
 					toaster.pop('error', '当前产品对应的器件[' + product.cmpUuId + ']已失效');

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

@@ -499,10 +499,10 @@
 							<span ng-if="!material.cmpUuId" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}"></span>
 						</td>
 						<td>
-							<a ng-show="!material.selected&&!isBatch && standard_tab == 'standard'" ng-click="showShelfArea(material)"><span ng-show="!isBatch">去上架</span></a>
-							<a ng-show="!material.selected&&!isBatch && standard_tab == 'unstandard'" ng-click="match(material)"><span ng-show="!isBatch">匹配</span></a>
-							<a ng-show="!material.selected&&!isBatch" ng-click="deleteMaterial(material)"><span ng-show="!isBatch">删除</span></a>
-							<a ng-if="material.selected">取消</a>
+							<a ng-show="!material.selected" ng-click="showShelfArea(material)"><span>去上架</span></a>
+							<!--<a ng-show="!material.selected&&!isBatch && standard_tab == 'unstandard'" ng-click="match(material)"><span ng-show="!isBatch">匹配</span></a>-->
+							<a ng-show="!material.selected" ng-click="deleteMaterial(material)"><span>删除</span></a>
+							<a ng-show="material.selected" ng-click="material.selected = false;">取消</a>
 						</td>
 					</tr>
 					<!--编辑内容-->