Explorar el Código

处理供应商增加分配与转移接口问题

wangcz hace 7 años
padre
commit
da07bb9e66

+ 1 - 1
src/main/java/com/uas/platform/b2b/controller/VendorDistributeController.java

@@ -55,7 +55,7 @@ public class VendorDistributeController {
      * @return 绑定结果
      */
     @RequestMapping(value = "/bindUserToVendor/{id}", method = RequestMethod.POST)
-    public ResultMap bindUserToVendor(@PathVariable("uu") Long id, @RequestBody String json) {
+    public ResultMap bindUserToVendor(@PathVariable("id") Long id, @RequestBody String json) {
         List<User> users = FlexJsonUtils.fromJsonArray(json, User.class);
         boolean result = vendorService.transferVendorToUser(id, users);
         String resultInfo = result ? "成功" : "失败";

+ 1 - 1
src/main/webapp/resources/js/common/services.js

@@ -383,7 +383,7 @@ define(['angular', 'toaster', 'big'], function(angular, big) {
                 method: 'POST'
             },
             transferSaleUserToVendor: {
-                url: 'vendorDistribute/bindUserToVendor/:uu',
+                url: 'vendorDistribute/bindUserToVendor/:id',
                 method: 'POST'
             },
             transferUserToVendor: {

+ 2 - 2
src/main/webapp/resources/js/index/app.js

@@ -2555,7 +2555,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     });
                     if (chooseResult.length > 0) {
                         $scope.loading = true;
-                        AccountUser[urlSaveData]({uu: uuData}, chooseResult, function (data) {
+                        AccountUser[urlSaveData](params, chooseResult, function (data) {
                             $scope.loading = false;
                             toaster.pop('success', '提示', '保存成功');
                             $modalInstance.close(false);
@@ -2687,7 +2687,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         });
                         if (chooseResult.length > 0) {
                             $scope.loading = true;
-                            AccountUser[urlSaveData]({uu: uuData}, chooseResult, function (data) {
+                            AccountUser[urlSaveData](params, chooseResult, function (data) {
                                 $scope.loading = false;
                                 toaster.pop('success', '提示', '保存成功');
                                 $modalInstance.close(false);

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/vendor.html

@@ -140,7 +140,7 @@
 						<td class="text-center" ng-bind="::vendor.vendorEnterprise.enAddress"></td>
 						<td class="text-center" ng-bind="::vendor.vendorUser.userName"></td>
 						<td class="text-center" ng-bind="::vendor.vendorUser.userTel"></td>
-						<td class="text-center">
+						<td class="text-center" title="{{vendor.saleContacts.toString()}}">
 							<span ng-repeat="users in vendor.saleContacts | limitTo: 3">{{users}}<br/></span>
 							<span ng-if="vendor.saleContacts.length > 3">...</span>
 							<span ng-if="!vendor.saleContacts || vendor.saleContacts.length === 0">-</span>

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/customer.html

@@ -133,7 +133,7 @@
 						<td class="text-center" ng-bind="::customer.myEnterprise.enAddress"></td>
 						<td class="text-center" ng-bind="::customer.myUser.userName"></td>
 						<td ng-bind="::customer.myUser.userTel"></td>
-						<td class="text-center">
+						<td class="text-center" title="{{customer.purchaseContacts.toString()}}">
 							<span ng-repeat="users in customer.purchaseContacts | limitTo: 3">{{users}}<br/></span>
 							<span ng-if="customer.purchaseContacts.length > 3">...</span>
 							<span ng-if="!customer.purchaseContacts || customer.purchaseContacts.length === 0">-</span>