Merge remote-tracking branch 'origin/feature/yc-mobile-0522' into feature/yc-mobile-0522

# Conflicts:
#	src/main/resources/jxls-tpl/trade/releaseByBatchError-rmb.xls

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -406,6 +406,10 @@ define(['app/app'], function (app) {
          * 变更到更新状态
          */
         $scope.changeToUpdate = function (isUpdate) {
+            if ($rootScope.userInfo.userUU != $rootScope.userInfo.enterprise.enAdminuu) {
+                toaster.pop('error', '您无该模块的编辑权限，请联系企业管理员进行编辑维护！');
+                return;
+            }
             $scope.updateState = isUpdate;
             if ($scope.updateState == false) {
                 $scope.enterpriseInfo = angular.copy($scope.enterpriseInfoBackup);

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_store_maintain_ctrl.js

@@ -140,6 +140,10 @@ define(['app/app'], function (app) {
 		 * @param module	模块名称
 		 */
 		$scope.showEdit = function (module) {
+			if ($rootScope.userInfo.userUU != $rootScope.userInfo.enterprise.enAdminuu) {
+				toaster.pop('error', '您无该模块的编辑权限，请联系企业管理员进行编辑维护！');
+				return;
+			}
 			changeEditStatus(module, true);
 		};
 

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

@@ -654,7 +654,7 @@
                     </div>
                 </div>
                 <div class="sreach-input fr">
-                    <input type="search" placeholder="型号/品牌/类目" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
+                    <input type="search" placeholder="型号/品牌/类目/规格/公司" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
                     <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
                 </div>
             </div>

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

@@ -691,7 +691,7 @@
                     </div>
                 </div>
                 <div class="sreach-input fr">
-                    <input type="search" placeholder="型号/品牌/类目" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
+                    <input type="search" placeholder="型号/品牌/类目/规格/公司" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
                     <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
                 </div>
             </div>

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

@@ -924,8 +924,8 @@
                         <p class="basic_title"><span>企业信息</span>
                             <!--<span class="fr"><a href="#">修改</a><a href="#">提交</a><a href="#">删除</a></span>-->
                             <span class="fr">
-                                <button ng-if=" !updateState"  ng-click="changeToUpdate(true)">修改</button>
-                                <button ng-if=" updateState"  ng-click="saveUpdate()">保存</button>
+                                <button ng-if="!updateState"  ng-click="changeToUpdate(true)">修改</button>
+                                <button ng-if="updateState"  ng-click="saveUpdate()">保存</button>
                                 <button ng-if="updateState" ng-click="changeToUpdate(false)" style="color: #f00">取消</button>
                             </span>
             </p>