Merge remote-tracking branch 'origin/feature_release-tomysql' into feature_release-tomysql

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

@@ -1226,6 +1226,8 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 		};
 
 		var loadData = function () {
+			// alert(1)
+			// console.log($scope.param)
 			Material.getAll($scope.param, function (data) {
 				$scope.materialAll = data;
 				$scope.currenctMaterial = data.content;

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

@@ -911,8 +911,8 @@
                 <li ng-class="{'active': tab=='base'}"><a ng-click="checkTab('base')">基本信息</a></li>
                 <li ng-class="{'active': tab=='safe'}"><a ng-click="checkTab('safe')">安全设置</a></li>
                 <li ng-class="{'active': tab=='bind'}" ng-if="isAdmin"><a ng-click="checkTab('bind')">申请绑定</a></li>
-                <li ng-class="{'active': tab=='auth'}"><a ng-click="checkTab('auth')">员工管理</a></li>
-                <li ng-class="{'active': tab=='role'}"><a ng-click="checkTab('role')">角色权限</a></li>
+               <!-- <li ng-class="{'active': tab=='auth'}"><a ng-click="checkTab('auth')">员工管理</a></li>
+                <li ng-class="{'active': tab=='role'}"><a ng-click="checkTab('role')">角色权限</a></li>-->
                 <!--<li ng-class="{'active': tab=='logistic'}"><a href="#" ng-click="checkTab('logistic')">收货地址</a></li>-->
             </ul>
         </div>
@@ -1303,11 +1303,11 @@
       </ul>
     </div>
         <!-- 人员信息 -->
-        <div class="count01 clearfix" ng-if="tab=='auth'">
-            <!--<div class="power_title">员工账号及权限管理</div>-->
+       <!-- <div class="count01 clearfix" ng-if="tab=='auth'">
+            &lt;!&ndash;<div class="power_title">员工账号及权限管理</div>&ndash;&gt;
             <div class="auth-info-header">
                 <div class="addUser-group">
-                    <!--<i class="fa fa-user-plus fa-fw"></i>-->
+                    &lt;!&ndash;<i class="fa fa-user-plus fa-fw"></i>&ndash;&gt;
                     <div class="addUser-btn" ng-click="setAdding(!adding)" ng-mouseenter="setInSelect(true)" ng-mouseleave="setInSelect(false)">
                         <img src="static/img/vendor/images/addUser.png" alt="">
                         <span>新增用户</span>
@@ -1327,7 +1327,7 @@
                     <span ng-click="onSearch(keyword, filterRole)">搜索</span>
 
                     <input type="text" ng-keyup="onKeyUpSearch(keyword, filterRole, $event)" ng-model="keyword" placeholder="输入人员姓名、电话号码、邮箱或UU号进行搜索"/>
-                    <!--<input type="text">-->
+                    &lt;!&ndash;<input type="text">&ndash;&gt;
                     <div>
                         <select ng-model="filterRole" ng-change="onSearch(keyword,filterRole)">
                             <option value="all" selected="selected">全部角色</option>
@@ -1342,12 +1342,12 @@
                 <table class="role-info" ng-table="tableParams">
                     <thead>
                     <tr>
-                        <!-- <th width="64">
+                        &lt;!&ndash; <th width="64">
                              <lable class="check-act">
                                  <input type="checkbox" id="checkAll" ng-checked="isCheckAll" ng-click="doCheckAll()"/>
                                  <label for="checkAll"></label>
                              </lable>
-                             全选</th>-->
+                             全选</th>&ndash;&gt;
                         <th width="143">UU账号</th>
                         <th width="101">姓名</th>
                         <th width="67">性别</th>
@@ -1359,12 +1359,12 @@
                     </thead>
                     <tbody>
                     <tr class="role-filter" ng-show="addingUser">
-                        <!--<td>
+                        &lt;!&ndash;<td>
                             <lable class="check-act">
                                 <input type="checkbox" id="check0"/>
                                 <label for="check0"></label>
                             </lable>
-                        </td>-->
+                        </td>&ndash;&gt;
                         <td>系统生成</td>
                         <td>
                             <input type="text" ng-model="newUser.userName" required placeholder="用户名">
@@ -1395,12 +1395,12 @@
                         </td>
                     </tr>
                     <tr ng-repeat="user in users track by $index">
-                        <!-- <td>
+                        &lt;!&ndash; <td>
                              <lable class="check-act">
                                  <input type="checkbox" id="{{'check1'+$index+1}}" ng-checked="user.checked" ng-click="checkUser(user)"/>
                                  <label for="{{'check1'+$index+1}}"></label>
                              </lable>
-                         </td>-->
+                         </td>&ndash;&gt;
                         <td>{{user.userUU}}</td>
                         <td>{{user.userName}}</td>
                         <td>{{user.userSex == 'M'?'男':'女'}}</td>
@@ -1410,12 +1410,12 @@
                             <span ng-repeat="role in user.roles track by $index" ng-if="$index < 6 || user.roles.length == 7" class="role-tag bgcolor-{{role.color || 1}}">{{role.desc.substring(0,1)}}</span>
                             <span class="role-tag bgcolor-6" ng-if="user.roles.length > 7">...</span>
                         </td>
-                        <!--<td class="edit-btn-area">
+                        &lt;!&ndash;<td class="edit-btn-area">
                             <a>编辑 </a><span>|</span><a> 删除</a>
-                        </td>-->
+                        </td>&ndash;&gt;
                         <td class="edit-btn-area">
-                            <!--<a class="operator-trigger" href="javascript:void(0);"><i class="fa fa-pencil fa-lg" ng-show="(userInfo.sys && enterprise.enAdminuu != user.userUU) || users.length == 1"></i></a>-->
-                            <div>  <!--&& enterprise.enAdminuu != user.userUU-->
+                            &lt;!&ndash;<a class="operator-trigger" href="javascript:void(0);"><i class="fa fa-pencil fa-lg" ng-show="(userInfo.sys && enterprise.enAdminuu != user.userUU) || users.length == 1"></i></a>&ndash;&gt;
+                            <div>  &lt;!&ndash;&& enterprise.enAdminuu != user.userUU&ndash;&gt;
                                 <span ng-click="editUserRole(user)" ng-show="user.userUU != userInfo.userUU" title="编辑"><i></i>编辑 | </span>
                                 <span ng-click="setShowDelUserFlag(true, user)" ng-show="user.userUU != userInfo.userUU" title="删除"><i></i>删除</span>
                                 <span ng-show="user.userUU == userInfo.userUU" disabled="false" title="编辑" style="color: #606168; cursor: not-allowed;"><i></i>编辑 | </span>
@@ -1444,9 +1444,9 @@
                     <div><a ng-click="setShowDelUserFlag(false)">取消</a><a ng-click="removeUser(delUser)">确认</a></div>
                 </div>
             </div>
-        </div>
+        </div>-->
         <!-- 角色管理 -->
-        <div class="count01 clearfix role-manage" ng-if="tab=='role'" >
+        <!--<div class="count01 clearfix role-manage" ng-if="tab=='role'" >
             <p>默认角色</p>
             <div class="default-role-area">
                 <div class="{{'default-role-box bgimg-'+ role.color || 1}}" ng-repeat="role in roles.defaults track by role.id" ng-click="editRole(role)">
@@ -1470,7 +1470,7 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div>-->
     </div>
       <!--申请绑定-->
     <div class="clearfix bind-en" ng-if="tab=='bind'">