企业圈

src/main/webapp/resources/css/b2bPublic.css

@@ -274,4 +274,58 @@ tbody td.enddate span{
 #public .text-muted {
     color: #666 !important;
     font-size: 14px;
+}
+
+.block{
+    width: 1026px;
+}
+.search {
+    background: #fff;
+    overflow: hidden;
+}
+.search .form-group{
+    padding: 10px 0;
+    margin-bottom: 0;
+    float: right;
+    width: 325px;
+}
+.search .form-group input {
+    float: left;
+    width: 267px;
+    height: 32px;
+    background-color: #ffffff;
+    border: solid 1px #5078cb;
+}
+.search .form-group a{
+    display: inline-block;
+    float: left;
+    width: 58px;
+    height: 32px;
+    font-size: 14px;
+    color: #fff;
+    background-color: #5078cb;
+}
+.order-table .order-hd span.margin-left20 img{
+    margin: -3px 5px 0 0;
+}
+.order-table .order-hd span.margin-left20 span{
+    font-size: 14px;
+    color: #333;
+}
+.order-table .text-muted{
+    font-size: 14px;
+    color: #999;
+}
+.order-table .col-md-3 span:last-child {
+    font-size: 14px;
+    color: #333;
+}
+.order-table .order-hd, .customer-hd{
+    width: 1026px !important ;
+    height: 40px!important;
+    line-height: 40px!important;
+    background: #f4f7fe!important ;
+}
+.order-table .order-hd.height72{
+    background: #fff !important ;
 }

src/main/webapp/resources/css/common.css

@@ -1215,7 +1215,7 @@ select {
 	border-right: 1px solid #f15601;
 	border-bottom: 1px solid #fff;
 	/*padding: 0 8px;*/
-	color: #f15601
+	color: #f15601!important;
 }
 .oder01 ul li a em{
 	color: #323232
@@ -1485,4 +1485,60 @@ i.must {
 }
 .com_tab:nth-of-type(1) ul li.active:after{
 	display: block
+}
+
+/*开关按钮*/
+.checkbox{
+	width:54px;
+	margin:0px auto;
+	text-align: center;
+}
+.checkbox span{
+	width: 38px;
+	height: 19px;
+	display: inline-block;
+	border-radius: 18px;
+	border: #e4e4e4 1px solid;
+	background-color: #fff;
+	cursor: pointer;
+	position: relative;
+	box-shadow: 1px 1px 5px #eee;
+	transition: background-color .1s ease-out;
+}
+.checkbox span:after{
+	content: "";
+	position: absolute;
+	width: 19px;
+	top: -3px;
+	left: 0;
+	height: 19px;
+	line-height: 19px;
+	background-color: #fff;
+	border: #eee 1px solid;
+	border-radius: 50%;
+	box-shadow: -1px 2px 1px #999;
+	transition: background-color .1s ease-out;
+	color: #666;
+	font-size: 12px;
+}
+.checkbox span.off{
+	background-color: #4bd562;
+	transition: background-color .1s ease-in;
+	border: #4bd562 1px solid;
+}
+.checkbox span.off:after{
+	content: "";
+	left: 20px;
+	transition: left .1s ease-in;
+	box-shadow: 1px 1px -1px #ccc;
+}
+.switch .checkbox{
+	padding-top: 6px;
+}
+.switch{
+	padding-left: 48px;
+	line-height: 35px;
+}
+.switch span:first-child{
+	font-size: 14px;
 }

src/main/webapp/resources/js/common/b2bServices.js

@@ -2637,5 +2637,116 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
                 }
             }
         })
-    }]);
+    }])
+        .factory('B2bAddPartnerMyRequest', ['$resource', 'BaseService', function($resource, BaseService) {
+            var b2bUrl = BaseService.getB2bUrl();
+            return $resource(b2bUrl + '/addpartner/request', {}, {
+            getAllRequest: {
+                url: b2bUrl + '/addpartner/request'
+            },
+            getRequestTodo: {
+                url: b2bUrl + '/addpartner/request',
+                params: {
+                    _state: 'todo'
+                }
+            },
+            getRequestDone: {
+                url: b2bUrl + '/addpartner/request',
+                params: {
+                    _state: 'done'
+                }
+            },
+            getRequestEnd: {
+                url: b2bUrl + '/addpartner/request',
+                params: {
+                    _state: 'end'
+                }
+            },
+            requestAmount: {
+                url: b2bUrl + '/addpartner/requestamount',
+                method: 'GET'
+            }
+        })
+        }])
+        .factory('B2bAddPartner', ['$resource', 'BaseService', function($resource, BaseService) {
+            var b2bUrl = BaseService.getB2bUrl();
+            return $resource(b2bUrl + '/addpartner', {}, {
+                addPartner: {
+                    url: b2bUrl + '/addpartner/request/nameAndBusCode',
+                    method : 'POST',
+                },
+                agreeRequest: {
+                    url: b2bUrl + '/addpartner/agree/:id',
+                    method: 'POST'
+                },
+                refuseRequest: {
+                    url: b2bUrl + '/addpartner/refuse/:id',
+                    method: 'POST'
+                },
+                reapply: {
+                    url: b2bUrl + '/addpartner/reapply/:id',
+                    method: 'POST'
+                },
+                addSupplier: {
+                    url: b2bUrl + '/addpartner/addSupplier/:businessCode',
+                    method: 'POST'
+                },
+                addServicer: {
+                    url: b2bUrl + '/addpartner/addServicer/:businessCode',
+                    method: 'POST'
+                },
+                addCust: {
+                    url: b2bUrl + '/addpartner/addCust/:businessCode',
+                    method: 'POST'
+                }
+            })
+        }])
+        .factory('B2bInvitationRecord', ['$resource', 'BaseService', function($resource, BaseService) {
+            var b2bUrl = BaseService.getB2bUrl();
+            return $resource(b2bUrl + '/invitationrecord', {}, {
+                invite: {
+                    url: b2bUrl + '/invitationrecord/invite',
+                    method: 'POST'
+                },
+                records: {
+                    url: b2bUrl + '/invitationrecord/records',
+                    method: 'GET'
+                },
+                getRecordsByEn: {
+                    url: b2bUrl + '/invitationrecord/recordsByEn',
+                    method: 'GET'
+                },
+                getActiveRecordsByEn: {
+                    url: b2bUrl + '/invitationrecord/activeRecordsByEn',
+                    method: 'GET'
+                },
+                enterpriseList: {
+                    url: b2bUrl + '/invitationrecord/enterpriseList/:name',
+                    method: 'GET',
+                    isArray: true
+                },
+                reInvite: {
+                    url: b2bUrl + '/invitationrecord/reInvite/:id',
+                    method: 'POST'
+                },
+                getRecordById: {
+                    url: b2bUrl + '/invitationrecord/record/:id',
+                    method: 'GET'
+                },
+                /**
+                 * 获取邀请链接
+                 */
+                getInviteUrl: {
+                    url: b2bUrl + '/invitationrecord/inviteUrl',
+                    method: 'GET'
+                },
+                /**
+                 * 添加合作伙伴
+                 */
+                addPart: {
+                    url: b2bUrl + '/invitationrecord/addPart',
+                    method: 'POST'
+                }
+            })
+        }]);
 });

src/main/webapp/resources/js/common/controllers/b2bCommonCtrls.js

@@ -464,5 +464,39 @@ define([ 'app/app' ], function(app) {
         };
 
     }]);
+    // 企业圈查询收到待处理的数目
+    app.controller('RequestAmountCtrl', ['$scope', 'B2bAddPartnerMyRequest', '$modal', 'B2bInvitationRecord', 'toaster', function ($scope, AddPartnerMyRequest, $modal, InvitationRecord, toaster) {
+        AddPartnerMyRequest.requestAmount({}, function (data) {
+            $scope.requestTodo = data;
+        });
 
+        /**
+         * 邀请注册商务平台
+         */
+        $scope.invite = function () {
+            var modalInstance = $modal.open({
+                animation: true,
+                templateUrl: 'static/tpl/index/search/enterpirseInfo.html',
+                controller: 'InviteCtrl',
+                resolve: {
+                    enname: function () {
+                        return null
+                    }
+                }
+            });
+            modalInstance.result.then(function (data) {
+                InvitationRecord.invite({formStore: data}, {}, function (data) {
+                    if (data.success) {
+                        toaster.pop('success', '提示', data.success);
+                        $scope.tableParams.reload();
+                    }
+                    if (data.error) {
+                        toaster.pop('error', '提示', data.error);
+                    }
+                }, function (response) {
+                    toaster.pop('error', '提示', response.data);
+                });
+            });
+        }
+    }]);
 });

src/main/webapp/resources/js/vendor/app.js

@@ -806,7 +806,25 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
       templateUrl: 'static/view/vendor/b2b/sale/sale_make_accept.html',
       controller: 'MakeAcceptCtrl',
       controllerUrl: 'app/controllers/b2b/sale/sale_make_accept'
-    })).state('sale_quotation_new', angularAMD.route({
+    })).state('baseInfo_myRequest', angularAMD.route({
+		url: "/myRequest",
+		title: 'b2b企业圈-我的合作伙伴(全部)',
+		templateUrl: 'static/view/vendor/b2b/baseInfo/myRequest.html',
+		controller: 'AddPartnerRequestCtrl',
+		controllerUrl: 'app/controllers/b2b/baseInfo/addPartnerRequestCtrl'
+	})).state('baseInfo_vendorInfo', angularAMD.route({
+		url: "/enume/vendorInfo",
+		title: 'b2b企业圈-我的合作伙伴(供应商)',
+		templateUrl: 'static/view/vendor/b2b/baseInfo/vendorsInfo.html',
+		controller: 'VendorsInfoCtrl',
+		controllerUrl: 'app/controllers/b2b/baseInfo/vendorsInfoCtrl'
+	})).state('baseInfo_customerInfo', angularAMD.route({
+		url: "/enume/customerInfo",
+		title: 'b2b企业圈-我的合作伙伴(客户)',
+		templateUrl: 'static/view/vendor/b2b/baseInfo/customersInfo.html',
+		controller: 'CustomersInfoCtrl',
+		controllerUrl: 'app/controllers/b2b/baseInfo/customersInfoCtrl'
+	})).state('sale_quotation_new', angularAMD.route({
 			url: "/sale/quotation/new",
 			templateUrl: "static/view/vendor/b2b/sale/quotation_new.html",
 			controller: 'SaleQuotationNewCtrl',

src/main/webapp/resources/js/vendor/controllers/b2b/baseInfo/addPartnerRequestCtrl.js

@@ -0,0 +1,249 @@
+
+define(['app/app'], function (app) {
+    "use strict";
+  /**
+   * 建立合作关系申请 (我的合作伙伴)
+   */
+  app.register.controller('AddPartnerRequestCtrl', ['$scope', 'B2bAddPartnerMyRequest', 'toaster', 'BaseService', 'ngTableParams', 'B2bAddPartner', '$timeout', '$rootScope', 'B2bVendorInfo', '$window', function ($scope, AddPartnerMyRequest, toaster, BaseService, ngTableParams, AddPartner, $timeout, $rootScope, VendorInfo, $window) {
+      $rootScope.active = 'baseInfo_myRequest';
+      BaseService.scrollBackToTop();
+      $scope.status = "partner";
+      $scope.active = 'done';
+
+      var getRequestStatus = function (active) {
+          var fn = 'getAllRequest';
+          switch (active) {
+              case 'done':
+                  fn = 'getRequestDone';
+                  break;
+              case 'todo':
+                  fn = 'getRequestTodo';
+                  break;
+              case 'end':
+                  fn = 'getRequestEnd';
+                  break;
+          }
+          return fn;
+      }
+      // 切换单据类型
+      $scope.setActive = function (state) {
+          if ($scope.active != state) {
+              $scope.active = state;
+              if ($scope.tableParams.page() == 1)
+                  $scope.tableParams.reload();
+              else
+                  $scope.tableParams.page(1);
+          }
+      };
+
+      // 切换数据来源（正常数据 or 历史数据）
+      var getService = function () {
+          return AddPartnerMyRequest;
+      };
+      $scope.tableParams = new ngTableParams({ // ng-Table参数
+          page: 1,
+          count: 20,
+          sorting: {}
+      }, {
+          total: 0,
+          counts: [],
+          getData: function ($defer, params) { // 获取数据的方法
+              $scope.loading = true;
+              var pageParams = params.url();
+              pageParams.keyword = $scope.keyword;
+              if ($rootScope.vendName) {
+                  pageParams.keyword = $rootScope.vendName;
+                  $scope.keyword = $rootScope.vendName;
+                  $rootScope.vendName = null;
+              }
+              $scope.tip = $scope.keyword;
+              getService()[getRequestStatus($scope.active)].call(null, BaseService.parseParams(pageParams), function (page) {
+                  $scope.loading = false;
+                  if (page) {
+                      params.total(page.totalElement);
+                      $defer.resolve(page.content);
+                      $scope.keywordXls = angular.copy(pageParams.keyword);//保存当前取值的关键词
+                  }
+              }, function (response) {
+                  $scope.loading = false;
+                  toaster.pop('error', '数据加载失败', response.data);
+              });
+          }
+      });
+
+      // 再次申请
+      $scope.addAgain = function (name, businessCode) {
+          AddPartner.addPartner({name: name, businessCode: businessCode}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop("success", '添加成功', data.success);
+                  $scope.tableParams.reload();
+              }
+              if (data.error) {
+                  toaster.pop("error", '添加失败', data.error);
+              }
+          }, function (response) {
+              toaster.pop('error', '失败', response.data);
+          });
+      }
+
+      // 添加为供应商
+      $scope.addSupplier = function (vendUID) {
+          AddPartner.addSupplier({businessCode: vendUID}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', data.success);
+                  $scope.tableParams.reload();
+              }
+              if (data.error) {
+                  toaster.pop('error', '提示', data.error);
+              }
+          }, function (response) {
+              toaster.pop('error', '失败', response.data);
+          })
+      };
+
+      // 添加为供应商
+      $scope.addServicer = function (vendUID) {
+          AddPartner.addServicer({businessCode: vendUID}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', data.success);
+                  $scope.tableParams.reload();
+              }
+              if (data.error) {
+                  toaster.pop('error', '提示', data.error);
+              }
+          }, function (response) {
+              toaster.pop('error', '失败', response.data);
+          })
+      };
+
+      // 添加客户
+      $scope.addCust = function (vendUID) {
+          AddPartner.addCust({businessCode: vendUID}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', data.success);
+                  $scope.tableParams.reload();
+              }
+              if (data.error) {
+                  toaster.pop('error', '提示', data.error);
+              }
+          }, function (response) {
+              toaster.pop('error', '失败', response.data);
+          })
+      };
+
+      // 搜索框回车
+      $scope.onSearch = function () {
+          $scope.tableParams.page(1);
+          $scope.tableParams.reload();
+      };
+
+      // 同意申请
+      $scope.agree = function (id) {
+          AddPartner.agreeRequest({id: id}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', '操作成功');
+              }
+              if (data.error) {
+                  toaster.pop('error', '提示', '操作失败');
+              }
+              // $scope.tableParams.reload();
+              $window.location.reload();
+          }, function (response) {
+              toaster.pop('error', '提示', response.data);
+          });
+      };
+
+      // 拒绝申请
+      $scope.refuse = function (id, reason) {
+          AddPartner.refuseRequest({id: id, reason: reason}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', '操作成功');
+              }
+              if (data.error) {
+                  toaster.pop('error', '提示', '操作失败');
+              }
+              // $scope.tableParams.reload();
+              $window.location.reload();
+          }, function (response) {
+              toaster.pop('error', '提示', response.data);
+          });
+      };
+
+      // 取消供应商关系
+      $scope.relieve = function (id) {
+          VendorInfo.relieve({id: id}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', data.success);
+              }
+              // $scope.tableParams.page(1);
+              $scope.tableParams.reload();
+          }, function (response) {
+              toaster.pop('error', '提示', response.data);
+          });
+      };
+
+      // 建立供应商关系
+      $scope.activeVend = function (id) {
+          VendorInfo.activeVend({id: id}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', data.success);
+              }
+              // $scope.tableParams.page(1);
+              $scope.tableParams.reload();
+          }, function (response) {
+              toaster.pop('error', '提示', response.data);
+          });
+      };
+
+      // 取消服务商
+      $scope.relieveServicer = function (id) {
+          VendorInfo.relieveServicer({id: id}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', data.success);
+              }
+              $scope.tableParams.reload();
+          }, function (response) {
+              toaster.pop('error', '提示', response.data);
+          });
+      };
+
+      // 启用服务商
+      $scope.activeServicer = function (id) {
+          VendorInfo.activeServicer({id: id}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', data.success);
+              }
+              $scope.tableParams.reload();
+          }, function (response) {
+              toaster.pop('error', '提示', response.data);
+          });
+      };
+
+      // 取消客户关系
+      $scope.disableCust = function (id) {
+          VendorInfo.disableCust({id: id}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', data.success);
+              }
+              $scope.tableParams.page(1);
+              $scope.tableParams.reload();
+          }, function (response) {
+              toaster.pop('error', '提示', response.data);
+          });
+      };
+
+      // 激活客户关系
+      $scope.activeCust = function (id) {
+          VendorInfo.activeCust({id: id}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', data.success);
+              }
+              $scope.tableParams.page(1);
+              $scope.tableParams.reload();
+          }, function (response) {
+              toaster.pop('error', '提示', response.data);
+          });
+      }
+  }]);
+
+});

src/main/webapp/resources/js/vendor/controllers/b2b/baseInfo/customersInfoCtrl.js

@@ -0,0 +1,81 @@
+
+define(['app/app'], function (app) {
+    "use strict";
+  /**
+   * 客户
+   */
+  app.register.controller('CustomersInfoCtrl', ['$scope', 'B2bVendorService', 'BaseService', 'AuthenticationService', 'ngTableParams', '$modal', 'toaster', 'B2bVendorInfo', function ($scope, VendorService, BaseService, AuthenticationService, ngTableParams, $modal, toaster, VendorInfo) {
+      BaseService.scrollBackToTop();
+      $scope.status = 'customer';
+      $scope.userInfoResult = true;
+      AuthenticationService.getAuthentication().success(function (data) {
+          $scope.loading = false;
+          $scope.thisUser = data;
+      });
+
+      $scope.customerParams = new ngTableParams({
+          page: 1,
+          count: 20
+      }, {
+          total: 0,
+          counts: [],
+          getData: function ($defer, params) {
+              $scope.loading = true;
+              var pageParams = params.url();
+              pageParams.keyword = $scope.keyword;
+              VendorService.customer.get.call(null, BaseService.parseParams(pageParams), function (page) {
+                  $scope.loading = false;
+                  if (page) {
+                      params.total(page.totalElement);
+                      $scope.total = page.totalElement;
+                      $defer.resolve(page.content);
+                  }
+                  $scope.totalCount = page.totalElement;
+              }, function (response) {
+                  $scope.loading = false;
+                  toaster.pop('error', '数据加载失败', response.data);
+              });
+          }
+      });
+
+      // 搜索框回车
+      $scope.onSearch = function (keyword) {
+          $scope.customerParams.page(1);
+          $scope.customerParams.reload();
+          $scope.tip = keyword;
+      };
+
+      // 查看详情
+      $scope.viewDetail = function (id) {
+          window.location.hash = "#/sale/customer/" + id;
+      }
+
+      // 取消合作关系
+      $scope.disableCust = function (id) {
+          VendorInfo.disableCust({id: id}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', data.success);
+              }
+              // $scope.customerParams.page(1);
+              $scope.customerParams.reload();
+          }, function (response) {
+              toaster.pop('error', '提示', response.data);
+          });
+      }
+
+      // 解除禁用
+      $scope.activeCust = function (id) {
+          VendorInfo.activeCust({id: id}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', data.success);
+              }
+              // $scope.customerParams.page(1);
+              $scope.customerParams.reload();
+          }, function (response) {
+              toaster.pop('error', '提示', response.data);
+          });
+      }
+
+  }]);
+
+});

src/main/webapp/resources/js/vendor/controllers/b2b/baseInfo/vendorsInfoCtrl.js

@@ -0,0 +1,83 @@
+
+define(['app/app'], function (app) {
+    "use strict";
+  /**
+   * 供应商
+   */
+  app.register.controller('VendorsInfoCtrl', ['$scope', 'B2bVendor', 'BaseService', 'AuthenticationService', 'ngTableParams', '$modal', 'toaster', '$rootScope', 'B2bVendorInfo', function ($scope, Vendor, BaseService, AuthenticationService, ngTableParams, $modal, toaster, $rootScope, VendorInfo) {
+      BaseService.scrollBackToTop();
+      $rootScope.active = 'baseInfo_myRequest';
+      $scope.status = 'vendor';
+      // 搜索框回车
+      $scope.onSearch = function () {
+          $scope.customerParams.page(1);
+          $scope.customerParams.reload();
+      };
+
+      $scope.customerParams = new ngTableParams({
+          page: 1,
+          count: 20
+      }, {
+          total: 0,
+          counts: [],
+          getData: function ($defer, params) {
+              $scope.loading = true;
+              var pageParams = params.url();
+              pageParams.keyword = $scope.keyword;
+              Vendor.getVendor.call(null, BaseService.parseParams(pageParams), function (page) {
+                  $scope.loading = false;
+                  if (page) {
+                      params.total(page.totalElement);
+                      $scope.total = page.totalElement;
+                      $defer.resolve(page.content);
+                  }
+                  $scope.totalCount = page.totalElement;
+              }, function (response) {
+                  $scope.loading = false;
+                  toaster.pop('error', '数据加载失败', response.data);
+              });
+          }
+      });
+
+      // 查看供应商详情
+      $scope.VendorDetail = function (id, uu) {
+          $rootScope.vendorId = id;
+          $rootScope.vendoruu = uu;
+          window.location.hash = "#/purc/vendor/" + $rootScope.vendorId;
+      }
+
+      // 向企业购买
+      $scope.purcByEn = function (businessCode) {
+          $rootScope.businessCode = businessCode;
+          window.location.hash = "#/purc/addOrder";
+      }
+
+      // 取消合作关系
+      $scope.relieve = function (id) {
+          VendorInfo.relieve({id: id}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', data.success);
+              }
+              // $scope.customerParams.page(1);
+              $scope.customerParams.reload();
+          }, function (response) {
+              toaster.pop('error', '提示', response.data);
+          });
+      }
+
+      // 建立合作关系
+      $scope.activeVend = function (id) {
+          VendorInfo.activeVend({id: id}, {}, function (data) {
+              if (data.success) {
+                  toaster.pop('success', '提示', data.success);
+              }
+              // $scope.customerParams.page(1);
+              $scope.customerParams.reload();
+          }, function (response) {
+              toaster.pop('error', '提示', response.data);
+          });
+      }
+
+  }]);
+
+});

src/main/webapp/resources/view/vendor/b2b/baseInfo/customersInfo.html

@@ -0,0 +1,241 @@
+<style>
+	#customer-tab .header th,#customer-tab tbody tr.header,#customer-tab tbody tr.header th{
+		height: 38px;
+		text-align: center;
+		padding: 0;
+		line-height: 38px;
+		border-bottom-width: 0;
+		/*background: #f5f5f5;*/
+		border: none;
+		font-size: 14px;
+	}
+	#customer-tab tbody tr.header:hover{
+		border: none;
+	}
+	.pane .pane-header{
+		border-radius: 0px 0 0px 0px;
+		box-shadow: 0 0 3px #ccc;
+		background: linear-gradient(to top, #e7e7e7 0%,#ffffff 100%);
+		height: 40px;
+		font-size: 14px;
+		line-height: 40px;
+	}
+	.table>tbody+tbody{
+		border-top: none;
+	}
+	#customer-tab tbody td{
+		border: none;
+	}
+	#customer-tab .pane-body{
+		padding: 0;
+	}
+	#customer-tab tbody tr{
+		background: none;
+		height: 80px;
+		border-top: #e8e8e8 1px solid;
+	}
+	#customer-tab tbody tr td{
+		text-align: center;
+		line-height: 20px;
+		vertical-align: inherit;
+		font-size: 14px;
+	}
+
+	#customer-tab tbody tr:hover{
+		/*border: #d32526 2px solid;*/
+	}
+	#customer-tab .form-horizontal .form-control{
+		height: 36px;
+		line-height: 36px;
+		border: #3f84f6 1px solid;
+		border-radius: 0px;
+		font-size: 14px;
+	}
+	#customer-tab .form-horizontal .form-group{
+		margin: 0;
+		padding: 10px 0;
+	}
+	#customer-tab .form-horizontal .form-group .input-group-addon{
+		width: 85px;
+		height: 36px;
+		display: inline-block;
+		background: #3f84f6;
+		font-size: 16px;
+		text-align: center;
+		line-height: 36px;
+		color: #fff;
+		padding: 0;
+		border: none;
+		border-radius: 0;
+		position: absolute;
+		top: 0;
+		right: 15px;
+	}
+	#customer-tab table tr td a{
+		color: #5078cb;
+	}
+	.form-horizontal #topSearch{
+		font-size: 16px;
+		line-height: 55px;
+	}
+	/*.ng-isolate-scope{
+        display : none;
+    }*/
+	.pane{
+		background: none;
+	}
+	.table{
+		margin-bottom: 0;
+	}
+	#myquest-public .customer-tab .customer-hd .checkbox,#myquest-public .customer-tab .customer-hd .checkbox span{
+		margin-left: 0 !important;
+	}
+	#myquest-public .customer-tab .customer-hd span{
+		margin-left: 20px;
+	}
+
+	#myquest-public .customer-tab .customer-bd div {
+		margin-left: 0;
+		line-height: 30px;
+		text-align: left;
+	}
+	.order-table .company-list tr .first{
+		border-bottom: #e8e8e8 1px solid;
+	}
+	#customer-tab tbody tr.height16{
+		height: 16px;
+		border-left: #f5f5f5 2px solid;
+		border-right: #f5f5f5 2px solid;
+	}
+	#customer-tab tbody tr.height16 td{
+		background: #f5f5f5;
+	}
+	#myquest-public .customer-tab tbody{
+		border-bottom: none;
+	}
+	.customer-hd{
+		border-top: 1px solid #e8e8e8;
+		border-bottom: 1px solid #e8e8e8;
+	}
+	.customer-bd{
+		background: #fff;
+	}
+	.col-md-3 .text-muted{
+		text-align: left;
+	}
+	.table-hover>tbody>tr:hover {
+		background-color: #fff;
+	}
+
+	.all-btn a {
+		display: inline-block;
+		width: 84px;
+		height: 24px;
+		background-color: #ffffff;
+		border-radius: 2px;
+		border: solid 1px #5078cb;
+		color: #5078cb;
+		font-size: 14px;
+	}
+	.all-btn a:first-child {
+		margin-bottom: 10px;
+	}
+	.all-btn a:hover {
+		background-color: #5078cb;
+		border-radius: 2px;
+		border: solid 1px #5078cb;
+		color: #ffffff !important ;
+	}
+</style>
+<link rel="stylesheet" href="static/css/b2bPublic.css">
+<div style="background: #fff;" id="myquest-public" class="block fr">
+	<div ng-include src="'static/view/vendor/b2b/baseInfo/vendorAndCustomer.html'"></div>
+	<div>
+		<div class="search">
+			<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+				<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称等关键词进行搜索" />
+				<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+			</div>
+		</div>
+	</div>
+	<div class="pane base-info" id="customer-tab">
+		<!--<form class="form-horizontal">
+            <div class="myReuest form-group" style="background: #f5f5f5;">
+                <div class="row">
+                    <div class="col-xs-5">
+                        <div class="search">
+                            <input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称搜索" />
+                            <a class="btn  input-group-addon" ng-click="onSearch()">搜索</a>
+                        </div>
+                    </div>
+                    <div class="col-xs-4">
+                        <p style="margin: 0;">搜索到<em>{{customerParams.total()}}</em>条</p>
+                    </div>
+                </div>
+            </div>
+        </form>-->
+		<div class="pane-body">
+			<table class="customer-tab table table-bordered table-striped table-hover"
+				   ng-table="customerParams">
+				<tbody ng-repeat="customer in $data" ng-if="customerParams.total() > 0">
+				<tr class="customer-hd">
+					<td colspan="4" class="text-left"><span ng-bind="::customer.myEnterprise.enName"></span></td>
+					<td>
+							<span class="checkbox" style="width: 100%; margin: 0; height: 26px;">
+								<span class="off" ng-if="customer.custswitch == 1 " ng-click="disableCust(customer.id)" title="已启用"></span>
+								<span class="" ng-if="customer.custswitch == 0 " ng-click="activeCust(customer.id)" title="已禁用"></span>
+							</span>
+					</td>
+					<!--<td width="200" class="text-center" ng-if="customer.custswitch == 1 "><a ng-click="disableCust(customer.id)">已启用</a></td>
+                    <td width="200" class="text-center" ng-if="customer.custswitch == 0 "><a ng-click="activeCust(customer.id)">已禁用</a></td>-->
+				</tr>
+				<tr class="customer-bd">
+					<td  class="first" colspan="4" style="padding-left: 30px;">
+						<div class="row">
+							<div class="col-md-3"><span class="text-muted">营业执照：</span><span ng-bind="::customer.myEnterprise.enBussinessCode"></span></div>
+							<div class="col-md-3"><span class="text-muted">法定代表人：</span><span ng-bind="::customer.myEnterprise.enCorporation"></span></div>
+							<div class="col-md-3"><span class="text-muted">企业UU：</span><span ng-bind="::customer.myEnterprise.uu"></span></div>
+						</div>
+						<div class="row">
+							<div class="col-md-3"><span class="text-muted">联系人：</span><span ng-bind="::customer.myUser.userName"></span></div>
+							<div class="col-md-3"><span class="text-muted">电话：</span><span ng-bind="::customer.myUser.userTel"></span></div>
+							<div class="col-md-3"><span class="text-muted">邮箱：</span><span ng-bind="::customer.myUser.userEmail"></span></div>
+						</div>
+						<div class="row">
+							<div class="col-md-3"><span class="text-muted">行业：</span><span ng-bind="::customer.myEnterprise.profession"></span></div>
+							<div class="col-md-7"><span class="text-muted">经营范围：</span><span ng-bind="::customer.myEnterprise.tags"></span></div>
+						</div>
+						<div class="row">
+							<div class="col-md-12">
+								<span class="text-muted">企业地址：</span><span ng-bind="::customer.myEnterprise.enAddress"></span>
+							</div>
+						</div>
+					</td>
+					<td width="120" class="text-center all-btn">
+						<a ng-if="vendor.vendswitch == 1" href="#/purc/purcinquiry/{{vendor.vendorEnterprise.enBussinessCode}}" class="btn01">立即询价</a><br/>
+						<a ng-if="vendor.vendswitch == 1" ng-click="purcByEn(vendor.vendorEnterprise.enBussinessCode)" class="btn02">下采购单</a>
+					</td>
+				</tr>
+				<tr class="height16">
+					<td colspan="5"></td>
+				</tr>
+				</tbody>
+				<tbody ng-if="customerParams.total() == 0" class="no-record-tab">
+				<tr>
+					<td colspan="5">
+						<div id="empty">
+							<div class="left_img">
+								<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+								<a href="#/index" title="B2B商务首页">B2B 商务</a>
+							</div>
+							<div class="right_link">
+								<p>暂无客户信息</p>
+							</div>
+						</div>
+					</td>
+				</tr>
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>

src/main/webapp/resources/view/vendor/b2b/baseInfo/enMenu.html

@@ -0,0 +1,37 @@
+<style>
+	.row a {
+		 text-decoration: none;
+	}
+	.tab-menu{
+		width: 1026px;
+		margin: 0 auto;
+		height: 40px;
+		line-height: 40px;
+		background: #fff;
+	}
+	.tab-menu a{
+		margin-left: 0;
+		position: relative;
+		text-align: center;
+		font-size: 14px;
+		height: 40px;
+		min-width: 110px;
+		padding: 0 20px;
+		display: inline-block;
+	}
+	.tab-menu a.active{
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff !important;
+	}
+</style>
+<div class="tab-first" ng-controller="RequestAmountCtrl">
+	<div class="row">
+		<div class="tab-menu">
+			<a type="button" ui-sref="baseInfo_myRequest" ng-class="{'active':status=='servicer' || status=='vendor' || status=='customer' || status=='partner' && active=='done'}" class="tab-btn">我的合作伙伴</a>
+			<!-- <a type="button" ui-sref="baseInfo.myRequest" ng-class="{'active':status=='send'}" class="tab-btn">新的合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a> -->
+			<a type="button" ui-sref="baseInfo.newPartner" class="tab-btn" ng-class="{'active':status=='add' || status=='invitation' && status!='send' && status!='add' || status=='partner' && active == 'all'}">新的合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0" ></b></a>
+			<!--<a type="button" ui-sref="baseInfo.partner_searchresult" class="tab-btn" ng-class="{'active':status=='add'}">新的合作伙伴</a>-->
+		</div>
+	</div>
+</div>

src/main/webapp/resources/view/vendor/b2b/baseInfo/myRequest.html

@@ -0,0 +1,477 @@
+<style>
+	.condition .more.open {
+		margin-top: 10px;
+		height: 36px;
+		opacity: 1;
+	}
+
+	.condition .more .form-group {
+		margin-bottom: 10px;
+	}
+
+	.order-table .header>th {
+		height: 38px;
+		text-align: center;
+		background: #f5f5f5;
+		border-top: 1px solid #e8e8e8;
+		border-bottom: 1px solid #e8e8e8;
+	}
+
+	.order-table .sep-row {
+		height: 10px;
+	}
+
+	.order-table .selector {
+		vertical-align: middle;
+		margin: 0 0 2px 0;
+	}
+
+	.toolbar label {
+		margin-right: 10px;
+		margin-bottom: 0;
+	}
+
+	.toolbar .select_all {
+		margin: 0 6px 0 10px;
+		line-height: 20px;
+	}
+
+	.toolbar .btn {
+		-moz-border-radius: 2px;
+		margin-right: 5px;
+		border: 1px solid #dcdcdc;
+		border-radius: 2px;
+		-webkit-border-radius: 2px;
+	}
+
+	.order-table .order-hd {
+		background: #fff;
+		height: 50px;
+		line-height: 50px;
+	}
+	.order-table .order-hd p{
+		line-height: 26px;
+		height: 26px;
+	}
+	.order-table .order-hd p.switch span:first-child{
+		line-height: 26px;
+	}
+	.order-table .order-hd p.switch{
+		padding-left: 10px;
+	}
+	.order-table .order-hd p.switch .checkbox{
+		padding-top: 0;
+		float: right;
+		margin-right: 30px;
+	}
+	/*.order-table .order-hd td{
+        padding-bottom: 10px;
+    }*/
+	.order-table .order-hd td.first {
+		padding-left: 20px;
+	}
+
+	.order-table .order-hd .order-main span {
+		margin-right: 8px;
+	}
+
+	.order-table .order-hd .order-code {
+		font-style: normal;
+		font-family: verdana;
+	}
+
+	.order-table .order-hd .order-sum {
+		padding: 0 5px;
+	}
+
+	.order-table>tbody {
+		border-bottom: 1px #e8e8e8 dotted;
+	}
+
+	.order-table>tbody:hover {
+		border: #fff 1px solid;
+		border-bottom: 20px solid #f5f5f5;
+	}
+	.order-table .operates {
+		display: none;
+	}
+
+	.order-table .operates i {
+		padding: 0 2px;
+	}
+
+	.order-table>tbody:hover .operates {
+		display: block;
+	}
+	.order-table>tbody:hover .operates-status {
+		display: none;
+	}
+
+
+	.order-table .order-bd {
+		border-bottom: 1px solid #e6e6e6;
+	}
+
+	.order-table .order-bd>td {
+		padding: 10px 5px;
+		vertical-align: top;
+		position: relative;
+	}
+
+	.order-table .order-bd .product {
+		padding-left: 20px;
+	}
+
+	.order-table .order-bd .order-number {
+		position: absolute;
+		top: -1px;
+		left: -1px;
+		width: 20px;
+		height: 20px;
+		line-height: 20px;
+		text-align: center;
+		background: #f5f5f5;
+		font-weight: 500;
+		border: solid 1px #d5d5d5;
+		border-radius: 0 0 10px 0;
+	}
+
+	.order-table .order-bd .order-number.key {
+		background: #56a022;
+		color: #ffffff;
+	}
+
+	.unPrinted {
+		color: #56a022;
+	}
+
+	.info-container .info:hover {
+		color: #CC3333;
+	}
+	.white{
+		color: #fff;
+	}
+	/*增加样式*/
+	.view-slide-in {
+		/*margin-top: 20px;*/
+	}
+	.view-slide-in .block {
+		background: #fff;
+	}
+	.view-slide-in .group-container {
+		background: #fff;
+		margin-bottom: 10px;
+	}
+	.view-slide-in .group-container .btn-group {
+		width: 190px;
+		border: none;
+		height: 45px;
+	}
+	.view-slide-in .group-container .btn-group .btn {
+		color: #000;
+	}
+	.view-slide-in .group-container .btn-group .btn-info {
+		color: #d32526;
+		background: #fff;
+		border: none;
+	}
+	.view-slide-in .group-container .btn-group .btn {
+		border: none;
+		font-size: 16px;
+		font-family: "Microsoft YaHei", "微软雅黑";
+	}
+	.view-slide-in .group-container .btn-group .btn em {
+		color: #d32526;
+		font-style: inherit;
+	}
+	.view-slide-in .group-container .btn-group .btn:hover {
+		background: #fff;
+		color: #d32526;
+	}
+	.view-slide-in .group-container {
+		padding: 0;
+	}
+	.view-slide-in .search-bg {
+		margin-top: 10px;
+		margin-bottom: 15px;
+	}
+	#topSearch {
+		font-size: 18px;
+	}
+	.view-slide-in #topSearch .search-bg i {
+		color: #999;
+		margin-left: 10px;
+	}
+	.form-group-sm .form-control-feedback {
+		width: 85px;
+		height: 36px;
+		line-height: 36px;
+		color: #fff;
+		background: #3f84f6;
+		text-align: center;
+		font-size: 14px;
+		cursor: pointer;
+	}
+
+	#topSearch .input-sm, .form-group-sm .form-control {
+		width: 325px;
+		height: 36px;
+		line-height: 36px;
+		border: #3f84f6 1px solid;
+		border-radius: 0px;
+		font-size: 14px;
+	}
+	.search-bg .col-xs-6,.search-bg .row {
+		padding-right: 0;
+	}
+	.order-table .company-list,.order-table .order-hd:first-child {
+		background: #fff;
+		font-size: 16px;
+		height: 40px;
+		line-height: 40px;
+		border-bottom: #ddd 1px solid;
+	}
+	.order-table .company-list {
+		width:100%;
+		height: 190px;
+		border-bottom: 20px solid #f5f5f5;
+	}
+	.order-table .order-hd span.margin-left20 {
+		margin-left: 35px;
+	}
+	.order-table .product {
+		line-height: 25px;
+		font-size: 14px;
+	}
+	.order-table .product span {
+		margin-right: 10px;
+	}
+	.grey01 {
+		color: #969595;
+		font-size: 14px;
+		text-align: center;
+	}
+	.order-table .btn {
+		width: 84px;
+		height: 24px;
+		line-height: 11px;
+		background-color: #ffffff;
+		border-radius: 2px;
+		border: solid 1px #5078cb;
+		font-size: 13px;
+		color: #5078cb;
+	}
+	.order-table .btn:hover{
+		background-color: #5078cb;
+		border: solid 1px #5078cb;
+		color: #fff;
+	}
+	.order-table .btn01 {
+		color: #3f84f6;
+		background: #fff;
+		border: none;
+		font-size: 16px;
+	}
+	.order-table .order-hd td.first {
+		line-height: 25px;
+		font-size: 14px;
+		padding-top: 10px;
+		padding-bottom: 10px;
+	}
+	.search-bg .input-group-addon{
+		width: 85px;
+		height: 36px;
+		display: inline-block;
+		background: #3f84f6;
+		font-size: 16px;
+		text-align: center;
+		line-height: 36px;
+		color: #fff;
+		padding: 0;
+		border: none;
+		border-radius: 0;
+		position: absolute;
+		top: 0;
+		right: 0;
+	}
+	.search-bg .form-group{
+		position: relative;
+	}
+	.order-table>tbody{
+		border-bottom: #f5f5f5 16px solid !important;
+		/*border: #f5f5f5 16px solid !important;*/
+	}
+	.label-success {
+		background: #27b6da;
+	}
+	.label-danger {
+		background: #3f84f6;
+	}
+	.order-table .order-hd .text-center p{
+		margin: 5px 0;
+	}
+	.new-dot{
+		top: 15px;
+	}
+	.order-table .company-list, .order-table .order-hd:first-child{
+		border-top:#e8e8e8 1px solid;
+	}
+
+	.order-table .first .row {
+		margin-left: 0;
+		line-height: 32px;
+	}
+	.order-table .company-list tr .first{
+		border-bottom: #e8e8e8 1px solid;
+	}
+	.order-table>tbody{
+		border-bottom: none !important;
+	}
+	.order-table>tbody .height16{
+		height: 16px;
+		border-left: #f5f5f5 2px solid;
+		border-right: #f5f5f5 2px solid;
+	}
+	.order-table>tbody .height16 td{
+		background: #f5f5f5;
+	}
+	.ng-table-pager{
+		/*background: #f5f5f5;*/
+	}
+	.block{
+		width: 1026px;
+	}
+	.search {
+		background: #fff;
+		overflow: hidden;
+	}
+	.search .form-group{
+		padding: 10px 0;
+		margin-bottom: 0;
+		float: right;
+		width: 325px;
+	}
+	.search .form-group input {
+		float: left;
+		width: 267px;
+		height: 32px;
+		background-color: #ffffff;
+		border: solid 1px #5078cb;
+	}
+	.search .form-group a{
+		display: inline-block;
+		float: left;
+		width: 58px;
+		height: 32px;
+		font-size: 14px;
+		color: #fff;
+		background-color: #5078cb;
+	}
+	.order-table .order-hd span.margin-left20 img{
+		margin: -3px 5px 0 0;
+	}
+	.order-table .order-hd span.margin-left20 span{
+		font-size: 14px;
+		color: #333;
+	}
+	.order-table .text-muted{
+		font-size: 14px;
+		color: #999;
+	}
+	.order-table .col-md-3 span:last-child {
+		font-size: 14px;
+		color: #333;
+	}
+	.order-table .order-hd{
+		width: 1026px !important ;
+		height: 40px!important;
+		line-height: 40px!important;
+		background: #f4f7fe!important ;
+	}
+	.order-table .order-hd.height72{
+		background: #fff !important ;
+	}
+</style>
+<div class="block fr" id="myquest-public">
+	<div ng-include src="'static/view/vendor/b2b/baseInfo/vendorAndCustomer.html'"></div>
+	<div>
+		<div class="search">
+			<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+				<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称等关键词进行搜索" />
+				<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+			</div>
+		</div>
+	</div>
+	<table class="order-table block" ng-table="tableParams">
+		<tbody ng-repeat="request in $data" class="company-list">
+		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
+			<td colspan="4" style="position: relative;"><span class="margin-left20"><img src="static/img/user/images/shop_home.png"><span ng-bind="request.vendName"></span></span><b class="new-dot" ng-if="request.statusCode==311 && request.method==0"></b><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
+			<td width="140" class="text-center">
+			</td>
+		</tr>
+		<tr class="height72 order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
+			<td class="first" colspan="4">
+				<div class="row">
+					<div class="col-md-3"><span class="text-muted">营业执照：</span><span ng-bind="::request.vendUID"></span></div>
+					<div class="col-md-3"><span class="text-muted">法定代表人：</span><span ng-bind="::request.enterprise.enCorporation"></span></div>
+					<div class="col-md-4"><span class="text-muted">企业UU：</span><span ng-bind="::request.enterprise.uu"></span></div>
+				</div>
+				<div class="row">
+					<div class="col-md-3"><span class="text-muted">联系人：</span><span ng-bind="::request.contact.userName"></span></div>
+					<div class="col-md-3"><span class="text-muted">联系电话：</span><span ng-bind="::request.contact.userTel"></span></div>
+					<div class="col-md-4"><span class="text-muted">邮箱：</span><span ng-bind="::request.contact.userEmail"></span></div>
+				</div>
+				<div class="row">
+					<div class="col-md-3"><span class="text-muted">行业：</span><span ng-bind="::request.enterprise.profession"></span></div>
+					<div class="col-md-7"><span class="text-muted">经营范围：</span><span ng-bind="::request.enterprise.tags"></span></div>
+				</div>
+				<div class="row col-md-12"><span class="text-muted">企业地址：</span><span ng-bind="::request.enterprise.enAddress"></span></div>
+			</td>
+			<td class="text-center">
+				<p ng-if="request.statusCode==313 && request.vendor != 1"><a class="btn label-success white" ng-click="addSupplier(request.vendUID)">添加供应商 </a></p>
+				<p class="switch"  ng-if="request.statusCode==313 && request.vendor == 1">
+					<span style="float: left;">供应商</span>
+					<span class="checkbox">
+						<span class="off" ng-if="request.vendor == 1 && request.vendswitch == 1" ng-click="relieve(request.vendorId)" title="已启用"></span>
+						<span class=""  ng-if="request.vendor == 1 && request.vendswitch != 1" ng-click="activeVend(request.vendorId)" title="已禁用"></span>
+					</span>
+				</p>
+				<p ng-if="request.statusCode==313 && request.servicer != 1"><a class="line24 btn label-success white" ng-click="addServicer(request.vendUID)">添加服务商</a></p>
+				<p class="switch"  ng-if="request.statusCode==313 && request.servicer == 1">
+					<span style="float: left;">服务商</span>
+					<span class="checkbox">
+						<span class="off" ng-if="request.servicer == 1 && request.servicerswitch == 1" ng-click="relieveServicer(request.vendorId)" title="已启用"></span>
+						<span class=""  ng-if="request.servicer == 1 && request.servicerswitch != 1" ng-click="activeServicer(request.vendorId)" title="已禁用"></span>
+					</span>
+				</p>
+				<p ng-if="request.statusCode==313 && request.customer != 1"><a class="line24 btn label-danger white" ng-click="addCust(request.vendUID)">添加客户</a></p>
+				<p class="switch"  ng-if="request.statusCode==313 && request.customer == 1">
+					<span style="float: left;">客户</span>
+					<span class="checkbox">
+						<span class="off" ng-if="request.customer == 1 && request.custswitch == 1" ng-click="disableCust(request.custId)" title="已启用"></span>
+						<span class=""  ng-if="request.customer == 1 && request.custswitch != 1" ng-click="activeCust(request.custId)" title="已禁用"></span>
+					</span>
+				</p>
+			</td>
+		</tr>
+		<!--<tr class="height16">-->
+			<!--<td colspan="5"></td>-->
+		<!--</tr>-->
+		</tbody>
+		<tbody ng-if="tableParams.total() == 0" class="no-record-tab">
+		<tr>
+			<td colspan="5">
+				<div id="empty">
+					<div class="left_img">
+						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					</div>
+					<div class="right_link">
+						<p>暂无合作伙伴</p>
+					</div>
+				</div>
+			</td>
+		</tr>
+		</tbody>
+	</table>
+</div>

src/main/webapp/resources/view/vendor/b2b/baseInfo/vendorAndCustomer.html

@@ -0,0 +1,87 @@
+<style>
+	.group-container .com-tab-menu{
+		width: 1026px;
+		margin: 8px auto 0px;
+		background: #fff;
+		height: 40px;
+		border-bottom: 1px solid #f15601;
+	}
+	.com-tab-menu ul {
+		overflow: hidden;
+		width: 1026px;
+	}
+	.com-tab-menu ul li:nth-child(1) {
+		margin-left: 0px;
+	}
+	.com-tab-menu ul li {
+		position: relative;
+		float: left;
+		min-width: 100px;
+		height: 40px;
+		line-height: 40px;
+		text-align: center;
+	}
+	.com-tab-menu ul li a{
+		display: inline-block;
+		min-width: 100px;
+		height: 40px;
+		line-height: 40px;
+		font-size: 13px;
+		font-weight: bold;
+		color: #333;
+	}
+	.com-tab-menu ul li.active {
+		border-bottom: 1px solid #fff;
+	}
+	.com-tab-menu ul li.active a{
+		border-top: 3px solid #f15601;
+		border-left: 1px solid #f15601;
+		border-right: 1px solid #f15601;
+		border-bottom: 1px solid #fff;
+		color: #f15601;
+	}
+</style>
+<div ng-include src="'static/view/vendor/b2b/baseInfo/enMenu.html'"></div>
+<div class="group-container condition">
+	<div class="row" ng-controller="RequestAmountCtrl">
+		<!--<div class="col-xs-6">
+			<div class="btn-group btn-group-sm btn-group-justified">
+				<div class="btn-group btn-group-sm">
+					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.myRequest"
+					   ng-class="{'btn-info':status=='partner'}">全部合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a>
+				</div>
+				<div class="btn-group btn-group-sm">
+					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.vendorInfo"
+						ng-class="{'btn-info':status=='vendor'}" >供应商</a>
+				</div>
+				<div class="btn-group btn-group-sm">
+					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.customerInfo"
+						ng-class="{'btn-info':status=='customer'}" >客户&lt;!&ndash; （<em>5</em>） &ndash;&gt;</a>
+				</div>
+			</div>
+		</div>-->
+		<div class="com-tab-menu">
+			<ul>
+				<li ng-class="{'active':status=='partner'}"><a ui-sref="baseInfo_myRequest" >全部合作伙伴</a></li>
+				<li ng-class="{'active':status=='vendor'}"><a  ui-sref="baseInfo_vendorInfo">供应商</a></li>
+				<li ng-class="{'active':status=='customer'}"><a ui-sref="baseInfo_customerInfo">客户</a></li>
+				<li ng-class="{'active':status=='servicer'}"><a ui-sref="baseInfo.servicerInfo">服务商</a></li>
+			</ul>
+		</div>
+		<!--<div class="form-input col-xs-6 myReuest search-bg">
+			<div class="row">
+				<div class="col-xs-9">
+					<div class="search">
+						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称或申请人搜索" />
+							<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+						</div>
+					</div>
+				</div>
+				<div class="col-xs-3" style="padding-left: 0;">
+					<p>搜索到<em>{{tableParams.total()}}</em>条</p>
+				</div>
+			</div>
+		</div>-->
+	</div>
+</div>

src/main/webapp/resources/view/vendor/b2b/baseInfo/vendorsInfo.html

@@ -0,0 +1,260 @@
+<style>
+	.wrap-content table{
+		background-color: #fff;
+	}
+
+	.wrap-content table .table-hover {
+		border: 1px red solid;
+	}
+	#customer-tab .header th,#customer-tab tbody tr.header,#customer-tab tbody tr.header th{
+		height: 38px;
+		text-align: center;
+		padding: 0;
+		line-height: 38px;
+		border-bottom-width: 0;
+		background: #f5f5f5;
+		border: none;
+		font-size: 12px;
+	}
+	#customer-tab tbody tr.header:hover{
+		border: none;
+	}
+	.pane-header{
+		/*border-radius: 0px 0 0px 0px;
+        box-shadow: 0 0 3px #ccc;
+        background: linear-gradient(to top, #e7e7e7 0%,#ffffff 100%);*/
+		height: 40px;
+		font-size: 14px;
+		line-height: 40px;}
+	#customer-tab .pane-header th{
+		border-bottom: none;
+	}
+	.table>tbody+tbody{
+		border-top: none;
+	}
+	#customer-tab tbody td{
+		border: none;
+	}
+	#customer-tab .pane-body{
+		padding: 0;
+	}
+	/*#customer-tab tbody tr{*/
+		/*background: none;*/
+		/*height: 100px;*/
+		/*border-top: #e8e8e8 1px solid;*/
+		/*line-height: 100px;*/
+	/*}*/
+	#customer-tab tbody tr td{
+		text-align: center;
+		line-height: 20px;
+		vertical-align: inherit;
+		font-size: 14px;
+	}
+	/*#customer-tab tbody tr:first-child td{
+        padding: 0;
+    }*/
+	/*#customer-tab tbody tr:hover{
+        border: #d32526 2px solid;
+    }*/
+	#customer-tab .com_title{
+		margin-bottom: 10px;
+	}
+	#customer-tab tbody tr td a{
+		color: #3578ba;
+	}
+	#customer-tab tbody tr td a:hover{
+		color: #d32526;
+	}
+	#customer-tab .content{
+		width: 100%;
+	}
+	#myquest-public .group-container{
+		width: 100%;
+	}
+	#myquest-public .group-container .btn-group {
+		width: 160px;
+		border: none;
+		height: 45px;
+	}
+	#myquest-public .group-container .btn-group .btn {
+		border: none;
+		font-size: 16px;
+	}
+	#myquest-public  .group-container .btn-group .btn em {
+		color: #d32526;
+		font-style: inherit;
+	}
+	#myquest-public .group-container .btn-group .btn:hover {
+		background: #fff;
+		color: #d32526;
+	}
+	#myquest-public .group-container .btn-group .btn-info {
+		color: #d32526;
+		background: #fff;
+		border: none;
+	}
+	#myquest-public .margin-bot{
+		margin-bottom: 10px;
+	}
+	#myquest-public .group-container{
+		/*height: 45px;*/
+		padding: 0;
+		background: #fff;
+	}
+	#myquest-public #public .search-bg .input-group-addon{
+		width: 85px;
+	}
+	#myquest-public .customer-tab .customer-hd .checkbox,#myquest-public .customer-tab .customer-hd .checkbox span{
+		margin-left: 0 !important;
+	}
+	#myquest-public .customer-tab .customer-hd span{
+		margin-left: 20px;
+	}
+
+	#myquest-public .customer-tab .customer-bd div {
+		/*margin-left: 0px;*/
+		line-height: 30px;
+		text-align: left;
+	}
+	.order-table .company-list tr .first{
+		border-bottom: #e8e8e8 1px solid;
+	}
+	#customer-tab tbody tr.height16{
+		height: 16px;
+		border-left: #f5f5f5 2px solid;
+		border-right: #f5f5f5 2px solid;
+	}
+	#customer-tab tbody tr.height16 td{
+		background: #f5f5f5;
+	}
+	#myquest-public .customer-tab tbody{
+		border-bottom: none;
+	}
+	.customer-hd{
+	border-top: 1px solid #e8e8e8;
+	border-bottom: 1px solid #e8e8e8;
+	}
+	.customer-bd{
+		background: #fff;
+	}
+	.col-md-3 .text-muted{
+		text-align: left;
+	}
+	.table-hover>tbody>tr:hover {
+		background-color: #fff;
+	}
+
+	.all-btn a {
+		display: inline-block;
+		width: 84px;
+		height: 24px;
+		background-color: #ffffff;
+		border-radius: 2px;
+		border: solid 1px #5078cb;
+		color: #5078cb;
+		font-size: 14px;
+	}
+	.all-btn a:first-child {
+		margin-bottom: 10px;
+	}
+	.all-btn a:hover {
+		background-color: #5078cb;
+		border-radius: 2px;
+		border: solid 1px #5078cb;
+		color: #ffffff !important ;
+	}
+
+</style>
+<div style="background: #fff;" id="myquest-public" class="block fr">
+	<div ng-include src="'static/view/vendor/b2b/baseInfo/vendorAndCustomer.html'"></div>
+	<link rel="stylesheet" href="static/css/b2bPublic.css">
+	<div id="public">
+		<div class="condition" style="padding: 0;">
+			<!--<div class="myReuest search-bg condition" >
+                <div class="row">
+                    <div class="col-xs-5">
+                        <div class="search">
+                            <div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+                                <input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称、简称或申请人搜索"  style="width: 100%"/>
+                                <a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-xs-4">
+                        <p>搜索到<em>{{total}}</em>条</p>
+                    </div>
+                </div>
+            </div>-->
+		</div>
+	</div>
+	<div>
+		<div class="search">
+			<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+				<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称等关键词进行搜索" />
+				<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
+			</div>
+		</div>
+	</div>
+	<div class="wrap-content" id="customer-tab">
+		<div class="content">
+			<!--供应商列表-->
+			<table class="table order-table table-hover customer-tab" ng-table="customerParams">
+				<tbody ng-repeat="vendor in $data">
+				<tr class="customer-hd">
+					<td colspan="4" class="text-left"><span><img src="static/img/user/images/shop_home.png"><span ng-bind="::vendor.vendorEnterprise.enName" style="margin-left: 3px;"></span></span></td>
+					<td>
+							<span class="checkbox" style="width: 100%; margin: 0; height: 26px;">
+								<span class="off" ng-if="vendor.vendswitch == 1" ng-click="relieve(vendor.id)" title="已启用"></span>
+								<span class="" ng-if="vendor.vendswitch == 0" ng-click="activeVend(vendor.id)" title="已禁用"></span>
+							</span>
+					</td>
+					<!--<td width="200" class="text-center" ng-if="vendor.vendswitch == 1"><a ng-click="relieve(vendor.id)">已启用</a></td>
+                    <td width="200" class="text-center" ng-if="vendor.vendswitch == 0"><a ng-click="activeVend(vendor.id)">已禁用</a></td>-->
+				</tr>
+				<tr class="customer-bd">
+					<td  class="first" colspan="4" style="padding-left: 30px;">
+						<div class="row">
+							<div class="col-md-3"><span class="text-muted">营业执照：</span><span ng-bind="::vendor.vendorEnterprise.enBussinessCode"></span></div>
+							<div class="col-md-3"><span class="text-muted">法定代表人：</span><span ng-bind="::vendor.vendorEnterprise.enCorporation"></span></div>
+							<div class="col-md-3"><span class="text-muted">企业UU：</span><span ng-bind="::vendor.vendorEnterprise.uu"></span></div>
+						</div>
+						<div class="row">
+							<div class="col-md-3"><span class="text-muted">联系人：</span><span ng-bind="::vendor.vendorUser.userName"></span></div>
+							<div class="col-md-3"><span class="text-muted">电话：</span><span ng-bind="::vendor.vendorUser.userTel"></span></div>
+							<div class="col-md-3"><span class="text-muted">邮箱：</span><span ng-bind="::vendor.vendorUser.userEmail"></span></div>
+						</div>
+						<div class="row">
+							<div class="col-md-3"><span class="text-muted">行业：</span><span ng-bind="::vendor.vendorEnterprise.profession"></span></div>
+							<div class="col-md-7"><span class="text-muted">经营范围：</span><span ng-bind="::vendor.vendorEnterprise.tags"></span></div>
+						</div>
+						<div class="row">
+							<div class="col-md-12">
+								<span class="text-muted">企业地址：</span><span ng-bind="::vendor.vendorEnterprise.enAddress"></span>
+							</div>
+						</div>
+					</td>
+					<td width="120" class="text-center all-btn">
+						<a ng-if="vendor.vendswitch == 1" href="#/purc/purcinquiry/{{vendor.vendorEnterprise.enBussinessCode}}" class="btn01">立即询价</a><br/>
+						<a ng-if="vendor.vendswitch == 1" ng-click="purcByEn(vendor.vendorEnterprise.enBussinessCode)" class="btn02">下采购单</a>
+					</td>
+				</tr>
+				</tbody>
+				<tbody ng-if="customerParams.total() == 0" class="no-record-tab">
+				<tr>
+					<td colspan="5">
+						<div id="empty">
+							<div class="left_img">
+								<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+								<a href="#/index" title="B2B商务首页">B2B 商务</a>
+							</div>
+							<div class="right_link">
+								<p>暂无供应商信息</p>
+							</div>
+						</div>
+					</td>
+				</tr>
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>

src/main/webapp/resources/view/vendor/b2b/sale_inquiry.html

@@ -216,11 +216,6 @@
 	#public .ng-table-pager{
 		margin-top: 20px;
 	}
-	.order-table .order-hd .order-main span.icon{
-		position: absolute;
-		top: 0;
-		left: 0;
-	}
 	.no-circle-icon {
 		display: inline-block;
 		padding: 0 5px;

src/main/webapp/resources/view/vendor/left_nav.html

@@ -72,6 +72,7 @@
 	<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><span  ui-sref="vendor_logistics">物流管理</span></li>-->
 		<li ng-class="{'active' : active == 'vendor_brand_apply'}" ng-if="!isPcbStore"><span  ui-sref="vendor_brand_apply">品牌申请</span></li>
 		<li ng-class="{'active' : active == 'vendor_component_apply'}" ng-if="!isPcbStore"><span  ui-sref="vendor_component_apply">器件申请</span></li>
+			<li ng-class="{'active' : active == 'baseInfo_myRequest'}"><span ui-sref="baseInfo_myRequest">企业圈</span></li>
 
 		<!--<li ng-class="{'active' : active == 'vendor_repository'}"><span  ui-sref="vendor_repository">仓库管理</span></li>-->
 		<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->