Browse Source

用户绑定企业

liuam 7 years ago
parent
commit
e1274e32f5

+ 9 - 2
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -21,12 +21,19 @@ define(['app/app'], function(app) {
         var applyToEnterpriseTableParams = function () {
             $scope.applyToEnterpriseTableParams = new ngTableParams({
                 page : 1,
-                count : 10
+                count : 1
             }, {
                 total : 0,
                 getData : function ($defer, params) {
                     var param = BaseService.parseParams(params.url());
-                    param.page = param.page;
+                    if ($scope.page.totalElements) {
+                        console.log($scope.page.totalElements);
+                        if (param.page < 1 || param.page > $scope.page.totalElements) {
+                            toaster.pop('error', '请输入正确的页数!');
+                            return;
+                        }
+                    }
+                    //param.page = param.page;
                     param.size = param.count;
                     param.spaceUU = $scope.userInfo.enterprise.uu;
                     if (!($scope.searchParams.keyword.trim() == '')) {

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

@@ -775,10 +775,10 @@
           </thead>
           <tbody>
           <tr class="default-row" ng-repeat="item in content">
-            <td class="user-name" ng-bind="item.user.vipName"></td>
-            <td style="text-align: left;" ng-bind="item.user.userUU"></td>
-            <td ng-bind="item.user.mobile"></td>
-            <td ng-bind="item.user.email"></td>
+            <td class="user-name" ng-bind="item.user.vipName || '-'"></td>
+            <td ng-bind="item.user.userUU || '-'"></td>
+            <td ng-bind="item.user.mobile || '-'"></td>
+            <td ng-bind="item.user.email || '-'"></td>
             <td>
               <a class="operate-btn" ng-click="auditApply(1, item.id, item.user.userUU)">同意</a>
               <a class="operate-btn" ng-click="auditApply(0, item.id, item.user.userUU)">|&nbsp;拒绝</a>

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

@@ -129,10 +129,10 @@
                 </thead>
                 <tbody>
                 <tr ng-repeat="item in content" class="default-row">
-                    <td class="user-name" ng-bind="item.user.vipName"></td>
-                    <td ng-bind="item.user.userUU"></td>
-                    <td ng-bind="item.user.mobile"></td>
-                    <td ng-bind="item.user.email"></td>
+                    <td class="user-name" ng-bind="item.user.vipName || '-'"></td>
+                    <td ng-bind="item.user.userUU || '-'"></td>
+                    <td ng-bind="item.user.mobile || '-'"></td>
+                    <td ng-bind="item.user.email || '-'"></td>
                     <td class="operate">
                         <a class="operate-btn" ng-click="auditApply(1, item.id, item.user.userUU)">同意</a>
                         <a class="operate-btn" ng-click="auditApply(0, item.id, item.user.userUU)">|&nbsp;拒绝</a>