Browse Source

修复销售方式不可点击的问题

hulh 8 years ago
parent
commit
41ebaf2e61

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

@@ -153,12 +153,11 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
             //获取店铺的信息
             //获取店铺的信息
             StoreInfo.getStoreInfoByEnuu({enUU : $rootScope.userInfo.enterprise.uu}, function(data) {
             StoreInfo.getStoreInfoByEnuu({enUU : $rootScope.userInfo.enterprise.uu}, function(data) {
                 $scope.storeInfo = data;
                 $scope.storeInfo = data;
-				if (!$scope.storeInfo || $scope.storeInfo.status != 'OPENED' || $scope.storeInfo.storeName.indexOf('优软测试二') > 0 || $scope.storeInfo.storeName.indexOf('优软商城') > 0) {
+				if (!$scope.storeInfo || $scope.storeInfo.status != 'OPENED' || $scope.storeInfo.storeName.indexOf('优软测试二') > -1 || $scope.storeInfo.storeName.indexOf('优软商城') > -1) {
 					$scope.$$nonProduct.canSelfSale = false;
 					$scope.$$nonProduct.canSelfSale = false;
 				} else {
 				} else {
 					$scope.$$nonProduct.canSelfSale = true;
 					$scope.$$nonProduct.canSelfSale = true;
 				}
 				}
-				console.log($scope.$$nonProduct.canSelfSale);
             }, function(response) {
             }, function(response) {
                 toaster.pop('error', '获取店铺的信息失败, ' + response.data);
                 toaster.pop('error', '获取店铺的信息失败, ' + response.data);
             });
             });

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1900,7 +1900,7 @@
 													<div class="content margin10">
 													<div class="content margin10">
 														<!--<p class="title">自营 / 寄售</p>-->
 														<!--<p class="title">自营 / 寄售</p>-->
 														<div class="input-list">
 														<div class="input-list">
-															<select name="editSelfSale" ng-change="changeSaleMode(goods)" class="wid56 select-adder form-control" ng-model="goods.editSelfSale" ng-disabled="$$nonProduct.canSelfSale">
+															<select name="editSelfSale" ng-change="changeSaleMode(goods)" class="wid56 select-adder form-control" ng-model="goods.editSelfSale" ng-disabled="!$$nonProduct.canSelfSale">
 																<option value="1">自营</option>
 																<option value="1">自营</option>
 																<option value="2">寄售</option>
 																<option value="2">寄售</option>
 															</select>
 															</select>