平台采购和供应商UI调整

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7492 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/css/index.css

@@ -899,7 +899,7 @@ ul>li.item-link>a {
 #header .navbar-header .navbar-brand {
 	background: url("../img/logo/logo.png") no-repeat bottom;
 	width: 218px;
-	margin: 0
+	margin: 0;
 }
 
 #header .dropdown:hover>.dropdown-menu {

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

@@ -141,6 +141,16 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             url : "/evaluation/:id",
             templateUrl : "static/tpl/index/purc/tender_evaluation.html",
             controller : 'PurcEvaluationCtrl'
+            /* 采购供应商资料 */
+        }).state('purc.vendor', {
+            url : "/vendor",
+            templateUrl : "static/tpl/index/purc/vendor.html",
+            controller : 'PurcVendorCtrl'
+            /* 采购供应商资料 */
+        }).state('purc.vendordetail', {
+            url : "/vendor/:id",
+            templateUrl : "static/tpl/index/purc/vendor_detail.html",
+            controller : 'PurcVendorDetailCtrl'
             /* 客户指定招标列表 */
         }).state('sale.tenderlist', {
             url : "/tender",
@@ -773,7 +783,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
     	}
     }]);
     
-        // TODO
+    /**
+     * 顶部搜索
+     */
 	app.controller('TopSearchCtrl', ['$scope', '$rootScope', 'getAccountUserSpace', 'ngTableParams', 'toaster', 'BaseService', 'AddPartner', '$filter', '$stateParams', 'SearchProd', '$sce', function($scope, $rootScope, getAccountUserSpace, ngTableParams, toaster, BaseService, AddPartner, $filter, $stateParams, SearchProd, $sce) {
 		$scope.active = 'all';
 		$scope.tip = $rootScope.searchKeyword;
@@ -7933,7 +7945,14 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 	/**
 	 * 新增采购单
 	 */
-	app.controller('PurcNewOrderCtrl',['$scope', '$modal', 'toaster', '$filter', 'addtoCart', '$rootScope', 'VendorInfo', 'ngTableParams', 'BaseService', 'Product', 'newPurcOrder', 'cartOperation', function($scope, $modal, toaster, $filter, addtoCart, $rootScope, VendorInfo, ngTableParams, BaseService, Product, newPurcOrder, cartOperation) {
+	app.controller('PurcNewOrderCtrl',['$scope', '$modal', 'toaster', '$filter', 'addtoCart', '$rootScope', 'VendorInfo', 'ngTableParams', 'BaseService', 'Product', 'newPurcOrder', 'cartOperation', 'ShipAddress', 'Vendor', function($scope, $modal, toaster, $filter, addtoCart, $rootScope, VendorInfo, ngTableParams, BaseService, Product, newPurcOrder, cartOperation, ShipAddress, Vendor) {
+		
+		// 获取收货地址列表
+		ShipAddress.shipAddList({}, function(data) {
+			$scope.ships = data;
+			$scope.order.shipadd = $scope.ships[0];
+		});
+		
 		$scope.order = {
 				date : new Date(),
 				cust : {
@@ -7945,13 +7964,11 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				code : $filter('date')(new Date(), 'yyMMddHHmmss_sss'),
 				orderItems : {
 					product : {},
-					$endDateOpen: false
 				},
 		};
 		
 		// 获取供应商列表
 		cartOperation.vendorInfo({}, function(data) {
-			console.log(data);
 		});
 		
 		if($rootScope.businessCode) {
@@ -7959,8 +7976,10 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				$scope.order.cust.enName = data.vendorEnterprise.enName;
 				$scope.order.cust.enAddress = data.vendorEnterprise.enAddress;
 				$scope.order.cust.uu = data.vendorEnterprise.uu;
-				$scope.order.custUser.userName = data.vendorUser.userName;
-				$scope.order.custUser.userTel = data.vendorUser.userTel;
+				Vendor.contacts({venduu: $scope.order.cust.uu}, {}, function(data) {
+					$scope.contacts = data;
+					$scope.order.vendor = $scope.contacts[0];
+				});
 			}, function(response) {
 				
 			});
@@ -7992,6 +8011,10 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 						delivery: null,
 						};
 //				$scope.order.orderItems.push(item);
+				Vendor.contacts({venduu: $scope.order.cust.uu}, {}, function(data) {
+					$scope.contacts = data;
+					$scope.order.vendor = $scope.contacts[0];
+				});
 				
 			}, function(){
 				
@@ -8011,7 +8034,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				price: null,
 				remark: null, 
 				delivery: null,
-				id: null
+				id: null,
 				};
 //		$scope.order.orderItems.push(item);
 		if($rootScope.prodId) {
@@ -8031,7 +8054,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 			if($scope.order.orderItems[index].code == null) {
 				toaster.pop('info', '提示', '请先选择商品');
 			} else {
-				$scope.order.orderItems.push({code: null, title: null, spec: null, unit: null, qty: null, price: null, remark: null, delivery: null});
+				$scope.order.orderItems.push({code: null, title: null, spec: null, unit: null, qty: null, price: null, remark: null, delivery: null, $endDateOpen: false});
 			}
 		};
 		//删除商品
@@ -8039,6 +8062,13 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 			$scope.order.orderItems.splice(index, 1);
 		};
 		
+		// 搜索框回车
+		$scope.onSearch = function(keyword) {
+			$scope.keyword = keyword;
+			$scope.tableParams.page(1);
+			$scope.tableParams.reload();
+		};
+		
 		$scope.tableParams = new ngTableParams({
 			page : 1, 
 			count : 10
@@ -8072,12 +8102,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
   			$scope.order.orderItems.push({code: data.code, title: data.title, spec: data.spec, unit: data.unit, qty: null, price: null, remark: null, delivery: null, id: data.id});
   		};
   		
-  		// 搜索框回车
-		$scope.onSearch = function() {
-			$scope.tableParams.page(1);
-			$scope.tableParams.reload();
-		};
-		
+		// 监听custuu发生变化，重新加载物料信息
 		$scope.$watch('order.cust.uu', function(n, o) {
 			if(n==o) {
 				return;
@@ -8128,8 +8153,9 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		
 		// 添加到购物车
 		$scope.addToCart = function(order) {
-			console.log(order);
 			$scope.loading = true;
+			$scope.order.venduser = order.vendor.venduser + '' + order.vendor.tel;
+			$scope.order.shipaddress = order.shipadd.addressdet + '' + order.shipadd.receiver + '' + order.shipadd.usertel;
 			$scope.order.custUU = $scope.order.cust.uu;
 			$scope.order.custUserUU = $scope.order.custUser.userUU;
 			if($scope.order.date instanceof Date) {
@@ -8154,6 +8180,8 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		// 立即购买
 		$scope.addToOrder = function(order) {
 			$scope.loading = true;
+			$scope.order.venduser = order.vendor.venduser + '' + order.vendor.tel;
+			$scope.order.shipaddress = order.shipadd.addressdet + '' + order.shipadd.receiver + '' + order.shipadd.usertel;
 			$scope.order.custUU = $scope.order.cust.uu;
 			$scope.order.custUserUU = $scope.order.custUser.userUU;
 			if($scope.order.date instanceof Date) {
@@ -8173,6 +8201,18 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				toaster.pop('error', '保存失败', response.data);
 			});
 		};
+		
+		// 新增收货地址保存
+		$scope.saveShipAddress = function(ship) {
+			ShipAddress.saveAddress( {}, ship, function(data) {
+				if(data.success) {
+					toaster.pop('success', '提示', data.success);
+				}
+				if(data.error) {
+					toaster.pop('error', '提示', data.error);
+				}
+			});
+		}
 	}]);
 	
 	/**
@@ -8279,80 +8319,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 	/**
 	 * 我的供应商
 	 */
-	app.controller('MySupplierCtrl', ['$scope', 'VendorService', 'BaseService','AuthenticationService', 'ngTableParams', '$modal','toaster', function($scope, VendorService, BaseService, AuthenticationService,ngTableParams,$modal, toaster){
-		$scope.userInfoResult = true;
-		AuthenticationService.getAuthentication().success(function(data) {
-			$scope.loading = false;
-			$scope.thisUser = data;
-		});
-		var getCustInfos = function(custuu) {
-			if(custuu) {
-				VendorService.userInfo.query({uu:custuu},null,function(data) {
-					$scope.custInfos = data;
-					var getPage = function(page, size){
-						if($scope.custInfos) {
-							var result = {};
-							result.totalCount = $scope.custInfos.length;
-							result.content = $scope.custInfos.slice((page - 1)*size, page * size);
-							if($scope.custInfos.length % size == 0) {
-								result.totalPage = ($scope.custInfos.length - $scope.custInfos.length % size) / size;
-							}else {
-								result.totalPage = ($scope.custInfos.length - $scope.custInfos.length % size) / size + 1;
-							}
-							result.first = page == 1;
-							result.last = page == result.totalPage;
-							result.page = page;
-							result.next = page - 0 + 1;
-							result.pre = page - 1;
-							return result;
-						}
-					}
-					$scope.userdata = getPage(1,4);
-					$scope.first = function (){
-						$scope.userdata = getPage($scope.userdata.pre,4);
-					}
-					$scope.last = function (){
-						$scope.userdata = getPage($scope.userdata.next,4);
-					}
-				}, function(response){
-					$scope.loading = false;
-					toaster.pop('error', '数据加载失败', response.data);
-				});
-			}
-		}
-		$scope.addUserInfo = function(customer) {
-			//TODO
-			if ($scope.thisUser.sys) {
-				var modalInstance = $modal.open({
-					animation: true,
-					templateUrl: 'static/tpl/index/account/add_userInfo.html',
-					controller: 'AddUserInfoCtrl',
-					resolve: {
-						customer: function() {
-							return customer;
-						}
-					}
-				});
-				modalInstance.result.then(function(changed, checked){
-					if(changed) {
-						if(checked)
-							$scope.newUser.roles = checked;
-						else 
-							loadUsers();
-					}
-				});
-				
-			} else {
-				toaster.pop('error', '您不是管理员，无权限分配用户！');
-			}
-		}
-		$scope.showUserInfo = function(customer,boo) {
-			$scope.custInfo = customer;
-			if(boo) {
-				getCustInfos(customer.myEnterprise.uu);
-				$scope.userInfoResult = true;
-			}
-		}
+	app.controller('PurcVendorCtrl', ['$scope', 'Vendor', 'BaseService','AuthenticationService', 'ngTableParams', '$modal','toaster', '$rootScope', function($scope, Vendor, BaseService, AuthenticationService,ngTableParams,$modal, toaster, $rootScope){
 		$scope.customerParams = new ngTableParams({
 			page : 1, 
 			count : 10
@@ -8361,7 +8328,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 			counts: [5, 10, 25, 50],
 			getData : function($defer, params) {
 				$scope.loading = true;
-				VendorService.customer.get(BaseService.parseParams(params.url()), function(page){
+				Vendor.getVendor(BaseService.parseParams(params.url()), function(page){
 					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElements);
@@ -8374,6 +8341,116 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				});
 			}
 		});
+		
+		// 查看供应商详情
+		$scope.VendorDetail = function(id) {
+			console.log(id);
+		}
+		
+		// 向企业购买
+		$scope.purcByEn = function(businessCode) {
+			console.log(businessCode);
+			$rootScope.businessCode = businessCode;
+			window.location.hash = "#/purc/addOrder";
+		}
+	}]);
+	
+	/**
+	 * 供应商详情
+	 */
+	app.controller('PurcVendorDetailCtrl', ['$scope', 'toaster', '$stateParams', 'Vendor', '$modal', function($scope, toaster, $stateParams, Vendor, $modal) {
+		$scope.vendorContacts = [];
+		var loadData = function() {
+			Vendor.getVendorDetail({id: $stateParams.id}, {}, function(data) {
+				$scope.vendor = data.vendorEnterprise;
+				Vendor.contacts({venduu: $scope.vendor.uu}, {}, function(data) {
+					$scope.vendorContacts = data;
+				});
+			});
+		};
+		
+		// 新增供应商联系人
+		$scope.addContact = function(uu) {
+			var modalInstance = $modal.open({
+				animation: true,
+				templateUrl: 'static/tpl/index/purc/modal/contact_person_modal.html',
+				controller: 'AddContacCtrl',
+				resolve: {
+				}
+			});
+			modalInstance.result.then(function(data) {
+				$scope.contact = data;
+				$scope.contact.venduu = uu;
+				Vendor.saveContact({}, $scope.contact, function(data) {
+					toaster.pop('success', '提示', '联系人保存成功');
+					$scope.vendorContacts.push(data);
+				}, function(response) {
+					toaster.pop('error', '失败', response.data);
+				});
+			});
+		}
+		
+		// 编辑供应商联系人
+		$scope.edit = function(contact) {
+			var modalInstance = $modal.open({
+				animation: true,
+				templateUrl: 'static/tpl/index/purc/modal/contact_person_modal.html',
+				controller: 'EditContacCtrl',
+				resolve: {
+					contact: function() {
+						return contact;
+					}
+				}
+			});
+			modalInstance.result.then(function(data) {
+				$scope.contact = data;
+				Vendor.saveContact({}, $scope.contact, function(data) {
+					toaster.pop('success', '提示', '联系人修改成功');
+				}, function(response) {
+					toaster.pop('error', '失败', response.data);
+				});
+			});
+		}
+		
+		// 删除供应商联系人
+		$scope.deleteById = function(id, index) {
+			Vendor.deleteContact({id: id}, {}, function(data) {
+				toaster.pop('success', '提示', '供应商联系人删除成功');
+				$scope.vendorContacts.splice(1, index);
+			}, function(response) {
+				toaster.pop('error', '提示', response.data);
+			});
+		}
+		loadData();
+	}]);
+	
+	/**
+	 * 编辑供应商联系人
+	 */
+	app.controller('EditContacCtrl', ['$scope', 'toaster', '$modalInstance', 'contact', function($scope, toaster, $modalInstance, contact) {
+		
+		$scope.contact = contact;
+		
+		$scope.save = function(contact) {
+			$modalInstance.close(contact);
+		}
+		
+		$scope.cancel = function() {
+			$modalInstance.dismiss();
+		}
+	}]);
+	
+	/**
+	 * 新增供应商联系人
+	 */
+	app.controller('AddContacCtrl', ['$scope', 'toaster', '$modalInstance', function($scope, toaster, $modalInstance) {
+		$scope.save = function(contact) {
+			$modalInstance.close(contact);
+		}
+		
+		$scope.cancel = function() {
+			$modalInstance.dismiss();
+		}
 	}]);
 	
 	/**
@@ -9961,5 +10038,6 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
             item[openParam] = !item[openParam];
         };
     }]);
+
         return app;
 });

src/main/webapp/resources/js/index/services/Purc.js

@@ -604,6 +604,23 @@ define([ 'ngResource'], function() {
 			},
 			getVendor: {
 				url: 'vendor',
+			},
+			getVendorDetail: {
+				url: 'vendor/:id',
+				method: 'GET'
+			},
+			saveContact: {
+				url: 'vendor/savecontact',
+				method: 'POST'
+			},
+			contacts: {
+				url: 'vendor/contacts/:venduu',
+				method: 'GET',
+				isArray: true
+			},
+			deleteContact: {
+				url: 'vendor/deleteContact/:id',
+				method: 'DELETE'
 			}
 		});
 	}]).factory('Quotation', ['$resource', function($resource){
@@ -651,5 +668,21 @@ define([ 'ngResource'], function() {
 				method: 'GET'
 			}
 		});
+	}]).factory('ShipAddress', ['$resource', function($resource){
+		return $resource('account/enterprise', {}, {
+			saveAddress: {
+				url: 'account/enterprise/saveShipAddress',
+				method: 'POST'
+			},
+			shipAddList: {
+				url: 'account/enterprise/shipAddList',
+				method: 'GET',
+				isArray: true
+			},
+			removeShipAddress: {
+				url: 'account/enterprise/removeShipAddress/:id',
+				method: 'DELETE'
+			}
+		});
 	}]);
 });

src/main/webapp/resources/tpl/index/home/left.html

@@ -62,7 +62,7 @@
 			</ul>
 		</div>
 	</div>
-	<div class="pane service" ng-controller="TenderCtrl">
+<!-- 	<div class="pane service" ng-controller="TenderCtrl">
 		<div class="pane-header">
 			<img src="resources/img/home/target.png"> 认证供应商招标<a href="serve" class="pull-right text-muted"></a>
 		</div>
@@ -87,7 +87,7 @@
 		</div>
 	</div>
 	</div>
-</div>
+</div> -->
 <!-- 常用操作 End -->
 <!--
 <div class="pane service" ng-controller="TenderCtrl">

src/main/webapp/resources/tpl/index/home/right.html

@@ -78,7 +78,7 @@
 						</li>
 					</ul>
 					<div id="operateTips" ng-controller="VendCountCtrl">
-						<a class="col-xs-4" href="">我的供应商（<span ng-class="{'text-inverse': count.vendor>0}">{{count.vendor || 0}}</span>）</a>
+						<a class="col-xs-4" ui-sref="purc.vendor">我的供应商（<span ng-class="{'text-inverse': count.vendor>0}">{{count.vendor || 0}}</span>）</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/baseInfo/myRquest"><i class="fa fa-plus"></i> 添加供应商</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/purc/addOrder"><i class="fa fa-plus"></i> 新增采购单</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/sale/quotation/new"><i class="fa fa-plus"></i> 新增报价单</a>

src/main/webapp/resources/tpl/index/purc/addOrder.html

@@ -1,335 +1,140 @@
-<style>
-#orderItems {
-	padding-left: 10px
-}
-
-#orderItem input {
-	border-radius: 0px;
-	background-color: #ffffff;
-}
-
-#prodSearch input{
-	border-radius: 0px;	
-	border-color: #327ebe;
-}
-
-#prodSearch a {
-	border-radius: 0px;	
-	color: #ffffff;
-	background-color: #327ebe;
-}
-
-#prodSearch span {
-	font-size: 18px;
-}
-.pane-body .modal-body {
-	border: 1px solid #e8e8e8;
-	margin-top: 20px;
-}
-
-.pane-body #orderForm {
-	border: 1px solid #e8e8e8;
-	padding-top: 20px;
-}
-
-.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: #f5f5f5;
-	height: 40px;
-	line-height: 40px;
-}
-
-.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:hover {
-	border: 1px solid  #6f6f6f;
-	border-width: 2px;
-}
-
-.order-table .operates {
-	display: none;
-}
-
-.order-table .operates i {
-	padding: 0 2px;
-}
-
-.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;
-}
-
-#orderItems thead td {
-	font-size: 14px;
-}
-
-#currency select {
-	width: 100px;
-	height: 30px;
-}
-
-</style>
-<div class="loading" ng-class="{'in': loading}">
-	<i></i>
-</div>
-<div class="pane">
-	<div class="pane-header f16">
-		采购单
-	</div>
-	<div class="pane-body" id="orderItem">
-		<div class="headerline">
-				<div class="content">新增采购单</div>
-				<div class="end">
-					<i class="fa fa-angle-down"></i>&nbsp;&nbsp;
-				</div>
-			</div>
-		<div class="block new">
-			<form class="form-horizontal" name="orderForm" id="orderForm">
-				<div class="form-group form-group-sm" ng-if="order.code">
-					<label for="code" class="col-sm-2 text-right">流水号：</label>
-					<div class="col-sm-4">
-						<div class="">
-							{{::order.code}}
-						</div>
-					</div>
-					<label class="col-sm-2 text-right">录入时间：</label>
-					<div class="col-sm-2">
-						<div class="">
-							{{::order.date | date:'yyyy-MM-dd HH:mm:ss'}}
-						</div>
-					</div>
-				</div>
-				<div class="form-group form-group-sm has-feedback">
-					<label for="customer" class="col-sm-2 text-right"><span class="text-inverse text-bold">* </span>供应商:</label>
-					<div class="col-sm-4">
-						<div id="">
-							<input ng-model="order.cust.enName" readonly="readonly" type="text" class="form-control" id="customer" 
-								placeholder="点击选择供应商" style="cursor: pointer;" ng-click="dbfindCust()" ng-required="true">
-							<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
-							<!-- <input ng-model="order.cust.enName" list="vendors">
-							<datalist id="vendors" >
-								<option ng-repeat="vendor in vendors" value="{{vendor.vendorEnterprise.enName}}"></option>
-							</datalist> -->
-						</div>
-					</div>
-					<label class="col-sm-2 text-right" ng-if="order.custUser.userName">供应商联系人:</label>
-					<span ng-bind="order.custUser.userName"></span> {{::order.custUser.userTel}}
-				</div>
-				<div class="form-group form-group-sm has-feedback">
-					<label for="customer" class="col-sm-2 text-right"><span class="text-inverse text-bold">* </span>付款方式:</label>
-					<div class="col-sm-4">
-						<div id="">
-							<input ng-model="order.payments" type="text" class="form-control"  
-								placeholder="请填写付款方式" style="cursor: pointer;" ng-required="true">
-						</div>
-					</div>
-					<label for="customer" class="col-sm-2 text-right"><span class="text-inverse text-bold">* </span>交易币别:</label>
-					<div class="col-sm-4">
-						<div id="currency">
-							<select name="" class="select" ng-model="order.currency" ng-init="order.currency = 'RMB'">
-                                <option value="USD">USD</option>
-                                <option value="HDK">HDK</option>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8"/>
+	<title>B2B商务采购变更-添加</title>
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+	<meta name="Keywords" content=""/>
+	<meta name="Description" content=""/>
+	<link rel="stylesheet" href="static/css/add.css "/>
+</head>
+<body>
+<div class="wrap">
+	<div class="content">
+		<div class="com_title">服务>采购模块>采购单<font>>采购单</font></div>
+		<div class="com_head"><span>新增采购单</span></div>
+		<!--B2B商务采购变更-添加-->
+        <form class="oder-change clearfix" name="orderForm" id="orderForm">
+            <ul class="purc">
+                <li>
+                    <div class="fl">
+                        <em>流水号：</em>
+                        <span>{{::order.code}}</span>
+                    </div>
+                    <div class="fr">
+                        <em>录入时间：</em>
+                        <span>{{::order.date | date:'yyyy-MM-dd HH:mm:ss'}}</span>
+                    </div>
+                </li>
+                <li>
+                    <div class="fl">
+                        <em>供应商：</em>
+                        <span><input type="text" ng-model="order.cust.enName" placeholder="点击选择供应商" class="editable" style="cursor: pointer;" ng-click="dbfindCust()" ng-required="true"></span>
+                    </div>
+                    <div class="fr">
+                        <em>供应商联系人：</em>
+                        <span>
+                            <select class="select01"
+								ng-model="order.vendor" required="required"
+								ng-options="(contact.venduser + '' + contact.tel) for contact in contacts">
+								<option value="">请选择供应商联系人</option>
+							</select>
+                        </span>
+                    </div>
+                </li>
+                <li>
+                    <div class="fl">
+                        <em>付款方式：</em>
+                        <span>
+                            <select name="" class="select02 wid152" ng-model="order.payments" ng-init="order.payments = '月结30天'">
+                                <option value="月结30天">月结30天</option>
+                            </select>
+                        </span>
+                    </div>
+                    <div class="fr">
+                        <em>交易币别：</em>
+                        <span>
+                            <select name="" class="select02 wid100" ng-model="order.currency" ng-init="order.currency = 'RMB'">
                                 <option value="RMB">RMB</option>
+                                <option value="USD">USD</option>
+                                <option value="HKD">HKD</option>
                             </select>
-						</div>
-					</div>
-				</div>
-				<div class="form-group form-group-sm has-feedback">
-					<label for="customer" class="col-sm-2 text-right"><span class="text-inverse text-bold">* </span>收货地址:</label>
-					<div class="col-sm-4">
-						<div id="">
-							<input ng-model="order.shipaddress" type="text" class="form-control"  
-								placeholder="请填收货地址" style="cursor: pointer;" ng-required="true">
-						</div>
-					</div>
-				</div>
-				<div class="form-group form-group-sm has-feedback">
-				<label for="customer" class="col-sm-2 text-right"><span class="text-inverse text-bold">* </span>备注:</label>
-					<div class="col-sm-4">
-						<div id="">
-							<input ng-model="order.remark" type="text" class="form-control"  
-								placeholder="请填写备注" style="cursor: pointer;" ng-required="true">
-						</div>
-					</div>
-				</div>
-				<hr>
-				<div class="form-group form-group-sm has-feedback">
-					<label class="col-sm-2 control-label">产品信息</label>
-				</div>
-				<hr style="border : 1px dashed #e8e8e8;" />
-				<table class="order-table block" ng-model="order.orderItems" name="orderItems" id="orderItems">
-					<thead>
-						<tr>
-							<td class="col-sm-1 text-center">序号</td>
-							<td class="col-sm-3 text-center">产品信息</td>
-							<td class="col-sm-2 text-center">采购价格</td>
-							<td class="col-sm-2">交货日期</td>
-							<td class="col-sm-3 text-center">备注</td>
-							<td class="col-sm-1 text-center">操作</td>
-						</tr>
-					</thead>
-					<tbody ng-repeat="item in order.orderItems">
-						<tr>
-							<td class="text-center">{{$index+1}}</td>
-							<td>
-								<div><span ng-bind="item.code"></span></div>
-								<div><span ng-bind="item.title"></span></div>
-								<div><span ng-bind="item.spec"></span></div>
-								<div><span ng-bind="item.unit"></span></div>
-							</td>
-							<td>
-								<div class="col-sm-10">
-									<input ng-model="item.price" type="text" class="form-control input-dbfind" id="product" 
-											placeholder="单价(最多6位小数)" style="cursor: pointer;" required="true" ng-pattern="/^[0-9]+(\.[0-9]{1,6})?$/">
-								</div>
-								<div class="col-sm-10">
-									<input ng-model="item.qty" type="text" class="form-control input-dbfind" id="product" 
-											placeholder="数量" style="cursor: pointer;" required="true" ng-pattern="/^\+?[1-9][0-9]*$/">
-								</div>
-							</td>
-							<td class="text-center">
-								<div class="form-group form-group-sm">
-									<div class="col-sm-11">
-										<div class="input-group">
-											<input ng-model="item.delivery" type="text" class="form-control" id="endDate" 
-												placeholder="选择时间" datepicker-popup="yyyy-MM-dd" is-open="item.$endDateOpen"
-												min-date="getMinDate()" ng-required="true"
-												current-text="今天" clear-text="清除" close-text="关闭"
-												datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-												ng-focus="openDatePicker($event, item.$endDateOpen)" readonly="readonly">
-											<span class="input-group-btn">
-												<button type="button" class="btn btn-default btn-sm" 
-													ng-click="openDatePicker($event, item.$endDateOpen, $index)">
-													<i class="fa fa-calendar"></i>
-												</button>
-											</span>
-										</div>
-									</div>
-								</div>
-							</td>
-							<td>
-								<div class="col-sm-12">
-									<textarea ng-model="item.remark" class="form-control" rows="3" cols="3" id="remark" 
-									placeholder="备注" >
-									</textarea>
-								</div>
-								
-							</td>
-							<td class="text-center">
-								<a class="btn btn-danger btn-sm" ng-click="deleteProduct($index)">删除</a>
-							</td>
-						</tr>
-				</tbody>
-			</table>
-			<hr>
-			<div class="form-group form-group-sm" ng-if="order.orderItems[0].code != null">
-				<div class="col-sm-2"></div>
-				<div class="col-sm-2">
-					<button class="btn btn-success btn-sm" style="width: 100%;" ng-click="addToCart(order)" ng-disabled="orderForm.$invalid">添加到购物车</button>
-				</div>
-				<div class="col-sm-2">
-					<button class="btn btn-success btn-sm" style="width: 100%;" ng-click="addToOrder(order)" ng-disabled="orderForm.$invalid">立即购买</button>
-				</div>
-			</div>
-			</form>
-		</div>
-		<div class="modal-body" style="min-height: 500px;">
-			<div class="headerline">
-				<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>采购订单 - 选择供应商物料</span>
-			</div>
-			<form class="form-horizontal" id="prodSearch">
-				<div class="form-group">
-					<div class="col-md-1 col-sm-1 ">
-					</div>
-					<div class="col-md-6 col-sm-6 ">
-						<span class="text-muted" ng-if="tip != null"><i class="fa fa-search fa-lg"></i> 搜索“{{tip}}”,为您找到<span style="color: #333333">{{total}}</span>个结果</span>
-					</div>
-					<div class="col-md-4 col-sm-4 input-group">
-						<input ng-model="keyword" type="text" class="form-control input-sm" 
-							required placeholder="输入客户物料关键字查询" autofocus ng-search="onSearch()">
-						<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
-					</div>
-				</div>
-			</form>
-			<table class="block table table-default table-striped table-bordered"
-				ng-table="tableParams">
+                        </span>
+                    </div>
+                </li>
+                <li>
+                    <div class="fr address">
+                        <em>收货信息：</em>
+                        <span class="fr" required="required">
+                             <select class="select fl" ng-model="order.shipadd" required="required"
+								ng-options="(ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
+							</select>
+                            <a href="javascript:void(0);" class="add-address">+新增收货信息</a>
+                        </span>
+                    </div>
+                </li>
+                <li class="beizhu">
+                    <div class="fl">
+                        <em>备注：</em>
+                        <span><input type="text" ng-model="order.remark" class="editable" placeholder="请填写备注" style="cursor: pointer;" ng-required="true"></span>
+                    </div>
+                </li>
+            </ul>
+            <div class="com_title01" ng-if="order.orderItems[0].code == null && !order.cust.enName"><span>请先选择供应商</span></div>
+            <div class="com_title01" ng-if="order.orderItems[0].code == null && order.cust.enName"><span>请先选择商品信息</span></div>
+            <div class="com_title01" ng-if="order.orderItems[0].code != null && order.cust.enName"><span>产品信息</span></div>
+            <!--产品信息-->
+            <dl ng-if="order.orderItems[0].code != null">
+                <dt>
+                    <b>序号</b>
+                    <b class="wid01">产品信息</b>
+                    <b>单位</b>
+                    <b>单价</b>
+                    <b>数量</b>
+                    <b>税率</b>
+                    <b>交货日期</b>
+                    <b>备注</b>
+                    <b class="wid02">&nbsp;</b>
+                </dt>
+                <dd ng-repeat="item in order.orderItems">
+                    <b>{{$index + 1}}</b>
+                    <b class="wid01">
+                        <p>{{item.code}}</p>
+                        <p>{{item.title}}</p>
+                        <p>{{item.spec}}</p>
+                    </b>
+                    <b>{{item.unit}}</b>
+                    <b><input class="editable" type="text" ng-model="item.price" placeholder="单价" style="cursor: pointer;" required="true" ng-pattern="/^[0-9]+(\.[0-9]{1,6})?$/"/></b>
+                    <b><input class="editable" type="text" ng-model="item.qty"  placeholder="数量" style="cursor: pointer;" required="true" ng-pattern="/^\+?[1-9][0-9]*$/"/></b>
+                    <b><input class="editable" type="text" ng-model="item.rate" placeholder="税率" style="cursor: pointer;" ng-pattern="/^[0-9]+(\.[0-9]{1,2})?$/"/></b>
+                    <b>
+						<input ng-model="item.delivery" type="text" class="editable" 
+							placeholder="选择时间" datepicker-popup="yyyy-MM-dd" is-open="item.$endDateOpen"
+							min-date="getMinDate()" ng-required="true"
+							current-text="今天" clear-text="清除" close-text="关闭"
+							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							ng-focus="openDatePicker($event, item.$endDateOpen)" readonly="readonly"
+							ng-click="openDatePicker($event, item.$endDateOpen, $index)">
+					</b>
+                    <b class="textMore"><input class="editable" type="text" ng-model="item.remark"/></b>
+                    <b class="wid02"><a ng-click="deleteProduct($index)"><i class="fa fa-close"></i></a></b>
+                </dd>
+            </dl>
+            <div class="save" ng-if="order.orderItems[0].code != null">
+           		<button ng-click="addToOrder(order)" ng-disabled="orderForm.$invalid">立即购买</button>
+            	<button ng-click="addToCart(order)" ng-disabled="orderForm.$invalid">添加购物车</button>
+            </div>
+        </form>
+       <!-- 搜索结果列表-->
+        <div class="pro-add-data02" style="min-height: 500px;" ng-if="order.cust.enName">
+			<div class="pro-search">
+                 <div class="search-result fl"><img src="resources/img/purc/search01.png"/>搜索“{{tip}}”，为您找到<em>{{total}}</em>个结果</div>
+                 <div class="search fr">
+                     <input type="text" placeholder="输入供应商物料关键字查询" ng-model="keyword" autofocus ng-search="onSearch(keyword)"/>
+                     <a class="seek" ng-click="onSearch(keyword)">搜索</a>
+                 </div>
+             </div>
+			<table class="block table table-default table-striped" ng-table="tableParams">
 				<thead>
 					<tr class="header">
 						<th width="160px">编号</th>
@@ -341,59 +146,52 @@
 				</thead>
 				<tbody ng-if="tableParams.total() == 0">
 					<tr>
-						<td colspan="7">
-							<div class="row text-muted info-container" style="padding: 50px 10px;">
-								<div class="col-md-4 text-center">
-									<br>
-									<br>
-									<div><img src="static/img/all/info.png" width="130px" height="90px"></div>
-									<div class="f16">当前没有供应商商品信息！</div>
-								</div>
-								<div class="col-md-8 br-l">
-									<div class="f16">
-										<p>为什么我没有供应商的商品信息？</p>
-									</div>
-									<div class="f14">
-										<div class="info">
-											<p>1、查看是否已经选择供应商<br>
-											解决：点击本页供应商输入框，弹出供应商列表，选择供应商</p>
-										</div>
-										<div class="info">
-											<p>2、供应商未上传物料资料<br>
-											解决：与您的供应商沟通，联系供应商上传商品信息</p>
-										</div>
-									</div>
-									<br>
-									<br>
-								</div>
-							</div>
+						<td class="text-center" colspan="7" ng-if="tip != null">
+							<br>
+							<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 搜索"{{tip}}"未找到产品信息，请重新输入搜索条件</div>
 						</td>
+						<td class="text-center" colspan="7" ng-if="tip == null">
+							<br>
+							<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 您的供应商还未添加商品信息，请尽快通知供应商</div>
+						</td>
+						<br>
 					</tr>
 				</tbody>
 				<tbody>
 					<tr ng-repeat="product in $data">
 						<td class="text-center" ng-bind="::product.code"></td>
 						<td class="text-center" ng-bind="::product.title"></td>
-						<td class="text-left f12" ng-bind="::product.spec"></td>
+						<td class="text-center f12" ng-bind="::product.spec"></td>
 						<td class="text-center" ng-bind="::product.unit"></td>
-						<td class="text-center" ><a title="选择" href="javascript:void(0)" ng-click="check(product)" style="text-decoration: none; color: #327ebe;" id="click">添加</a>
-				<!-- 			<div class="" id="searchlist" style="padding: 15px; width: 240px; position:absolute;" >
-								<form>
-									<div class="form-group">
-										<label>数量</label> <input type="search" class="form-control"
-											name="name" placeholder="输入企业名称关键字">
-									</div>
-									<div class="form-group">
-										<label>交期</label> <input type="text" class="form-control"
-											name="businessCode" placeholder="输入营业执照">
-									</div>
-									<div class="form-group">
-										<label>单价</label> <input type="text" class="form-control"
-											name="address" placeholder="输入企业所在地">
-									</div>
-									<button class="btn btn-default " type="button">确定</button>
-								</form>
-							</div> -->
+						<td class="text-center" ><a title="选择" href="javascript:void(0)" ng-click="check(product)" style="text-decoration: none; color: #327ebe;" id="click" class="add01">添加</a>
+						<div class="add-tanchuang">
+		                        <ul>
+		                            <li>
+		                                <div class="fl">数量：</div>
+		                                <div class="fr">
+		                                    <div class="btn-wrap">
+		                                        <span class="number">
+		                                            <a href="###" class="reduce">-</a>
+		                                            <input type="text" value="100">
+		                                            <a href="###" class="add">+</a>
+		                                        </span>
+		                                    </div>
+		                                </div>
+		                            </li>
+		                            <li>
+		                                <div class="fl">交期：</div>
+		                                <div class="fr"><input type="text" class="price-input" value="时间选择"></div>
+		                            </li>
+		                            <li>
+		                                <div class="fl">单价：</div>
+		                                <div class="fr"><input type="text" class="price-input" value="￥1.23"></div>
+		                            </li>
+		                            <li class="add-btn">
+		                                <div class="fl">&nbsp;</div>
+		                                <div class="fr"><a href="javascript:void(0);" class="off">取消</a><a href="javascript:void(0);" class="ok">确认</a></div>
+		                            </li>
+		                        </ul>
+		                    </div>
 						</td>
 					</tr>
 				</tbody>
@@ -401,3 +199,103 @@
 		</div>
 	</div>
 </div>
+<!--设置-企业设置-收货地址编辑-->
+<div class="bomb-box" style="display: none">
+    <div class="box04 box">
+        <i class="off"><img src="resources/img/purc/close.png" alt="" /></i>
+        <p>个人资料</p>
+        <ul>
+            <li class="line01">
+                <div class="fl">
+                    <span class="fl">收货人<em>*</em>：</span>
+                    <span class="fr"><input type="text" placeholder="填写收货人" ng-model="ship.receiver"/></span>
+                </div>
+                <div class="fr">
+                    <span class="fl">手机<em>*</em>：</span>
+                    <span class="fr"><input type="text" ng-model="ship.usertel"/></span>
+                </div>
+            </li>
+            <li class="line01">
+                <div class="fl">
+                    <span class="fl">固定电话<em>*</em>：</span>
+                    <span class="fr"><input type="text" ng-model="ship.phone"/></span>
+                </div>
+                <div class="fr">
+                    <span class="fl">邮箱：</span>
+                    <span class="fr emaill"><input type="text" ng-model="ship.email"/><i>用于接收订单提醒邮件，便于您及时了解订单状态</i></span>
+                </div>
+            </li>
+            <li class="line02 margin-top40">
+                <div class="fl">所在地址<em>*</em>：</div>
+                <div class="select fr"><input type="text" placeholder="请选择" ng-model="ship.address"/><i class="fa fa-angle-down"></i></div>
+            </li>
+            <li class="line02">
+                <div class="fl">详细地址<em>*</em>：</div>
+                <div class="fr"><input type="text" ng-model="ship.addressdet"/></div>
+            </li>
+            <li class="line02">
+                <div class="fl">地址别名：</div>
+                <div class="fr address"><input type="text" ng-model="ship.addalias"/><i>建议填写常用名称：家里/父母家/公司</i></div>
+            </li>
+        </ul>
+        <div class="many-file-btn">
+            <a class="btn01" ng-click="saveShipAddress(ship)">保存</a><a href="#" class="btn02">取消</a>
+        </div>
+    </div>
+</div>
+<script src="static/lib/jquery/jquery.min.js"></script>
+<script>
+    $(function(){
+        /*下拉效果*/
+        $('.select p').click(function(e){
+            $('.select').toggleClass('open');
+            e.stopPropagation();
+        });
+        $('.select ul li').click(function(e){
+            var title=$(this).html();
+            $('.select p').html(title);
+            $(this).addClass('selected').siblings().removeClass('selected');
+            $('.select').removeClass('open');
+            e.stopPropagation();
+        });
+        $(document).click(function(){
+            $('.select').removeClass('open');
+        })
+        /*鼠标移动上去删除*/
+        $('.oder-change dl dd').hover(function(){
+            $(this).find('a').toggle();
+        });
+        /*点击添加弹出框*/
+        $(".pro-add-data02 .add01").click(function(){
+            $(".add-tanchuang").show();
+            $(this).parents("dd").addClass("active").siblings().removeClass("active");
+        });
+        $(".add-tanchuang a.off").click(function(){
+            $(this).parents(".add-tanchuang").hide();
+            $(this).parents(".pro-add-data02").find("dd").removeClass("active");
+        });
+        //增加数量
+        $(document).on('click','.add-tanchuang .btn-wrap span.number a.add',function () {
+            var sum = parseInt($(this).prev().val())+1;
+            $(this).prev().val(sum)
+        });
+        //减少数量
+        $(document).on('click','.add-tanchuang .btn-wrap span.number a.reduce',function () {
+            var sum = parseInt($(this).next().val())-1;
+            $(this).next().val(sum);
+        });
+        //新增收货地址
+        $(".oder-change ul li .add-address").click(function(){
+            $(".bomb-box").show();
+        });
+        $(".bomb-box .box04 .off,.box04 .many-file-btn .btn02").click(function(){
+            $(".bomb-box").hide();
+        })
+         $(".bomb-box .box04 .off,.box04 .many-file-btn .btn01").click(function(){
+            $(".bomb-box").hide();
+        })
+        
+    })
+</script>
+</body>
+</html>

src/main/webapp/resources/tpl/index/purc/modal/contact_person_modal.html

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8"/>
+	<title>B2B商务账号设置-个人信息</title>
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+	<meta name="Keywords" content=""/>
+	<meta name="Description" content=""/>
+	<link rel="stylesheet" href="static/css/add.css "/>
+</head>
+<body>
+<!--B2B商务账号设置-个人信息-->
+<div class="bomb-box">
+	<div class="box01 box">
+		<p>供应商联系人信息</p>
+		<div class="per-data">
+			<ul>
+				<li><em>姓名</em><input type="text" placeholder="姓名" ng-model="contact.venduser"><span>联系人姓名</span></li>
+				<li>
+					<em>性别</em>
+					<select name="" id="" ng-model="contact.sex" ng-init="contact.sex = 'M'">
+						<option value="M">男</option>
+						<option value="F">女</option>
+					</select>
+				</li>
+				<li><em>职位</em><input type="text" placeholder="职位"  ng-model="contact.position"></li>
+				<li><em>手机</em><input type="text" placeholder="手机" ng-model="contact.tel"><span>联系人手机号</span></li>
+				<li><em>电话</em><input type="text" placeholder="电话" ng-model="contact.phone"><span>联系人电话号码</span></li>
+				<li><em>邮箱</em><input type="email" placeholder="邮箱" ng-model="contact.email"><span>联系人邮箱</span></li>
+				<li class="per-btn"><a ng-click="save(contact)" class="save">保存</a><a ng-click="cancel()" class="mod-psd">取消</a></li>
+			</ul>
+		</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/resources/tpl/index/purc/modal/purc_order_cust.html

@@ -1,3 +1,10 @@
+<style>
+.headerline .content {
+	width: 200px;
+	font-size: 14px;
+}
+
+</style>
 <div class="modal-body" style="min-height: 500px;">
 	<div class="headerline">
 		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>采购订单 - 选择供应商</span>

src/main/webapp/resources/tpl/index/purc/vendor.html

@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8"/>
+	<title>供应商列表</title>
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+	<meta name="Keywords" content=""/>
+	<meta name="Description" content=""/>
+	<link rel="stylesheet" href="static/css/add.css "/>
+</head>
+<body>
+<style>
+.wrap table{
+	background-color: #fff;
+}
+
+.wrap table .table-hover {
+	border: 1px red solid;
+}
+</style>
+<div class="wrap">
+	<div class="content">
+		<div class="com_title">服务>销售模块<font>>供应商</font>
+			<div class="search fr">
+				<input type="text" placeholder="输入相关信息">
+				<a class="seek" href="###">搜索</a>
+			</div>
+		</div>
+		<!--供应商列表-->
+		<table class="table  table-hover"
+			ng-table="customerParams">
+			<thead>
+				<tr class="header">
+					<th width="180" class="text-center">企业名称</th>
+					<th width="120" class="text-center">简称</th>
+					<th width="220" class="text-center">地址</th>
+					<th width="100" class="text-center">联系人</th>
+					<th width="80" class="text-center">职位</th>
+					<th width="80" class="text-center">联系方式</th>
+					<th width="150" class="text-center">操作</th>
+				</tr>
+			</thead>
+			<tbody>
+					<tr ng-repeat="vendor in $data">
+						<td class="text-center" ng-bind="::vendor.vendorEnterprise.enName"></td>
+						<td class="text-center" ng-bind="::vendor.vendorEnterprise.enShortname"></td>
+						<td class="text-center" ng-bind="::vendor.vendorEnterprise.enAddress"></td>
+						<td class="text-center" ng-bind="::vendor.vendorUser.userName"></td>
+						<td ng-bind="::vendor.vendorUser.position"></td>
+						<td class="text-center" ng-bind="::vendor.vendorUser.userTel"></td>
+						<td class="text-center">
+							<a  href="#/purc/vendor/{{vendor.id}}">查看详情</a>
+							<a ng-click="purcByEn(vendor.vendorEnterprise.enBussinessCode)">下达采购单</a>
+						</td>
+					</tr>
+			</tbody>
+		</table>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/resources/tpl/index/purc/vendor_detail.html

@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8"/>
+	<title>供应商详情</title>
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+	<meta name="Keywords" content=""/>
+	<meta name="Description" content=""/>
+	<link rel="stylesheet" href="static/css/add.css "/>
+</head>
+<body>
+<div class="wrap">
+	<div class="content">
+		<div class="com_title">服务>销售模块<font>>供应商</font></div>
+		<div class="com_head"><span>供应商详情</span></div>
+		<!--供应商详情-->
+        <div class="pro-add-data clearfix">
+            <div class="com_title01 sty01"><span>基本信息</span></div>
+            <dl>
+                <dd>
+                    <div class="fl">企业名称：</div>
+                    <div class="fr grey">{{vendor.enName}}</div>
+                </dd>
+                <dd>
+                    <div class="fl">简称：</div>
+                    <div class="fr grey">{{vendor.enShortname}}</div>
+                </dd>
+                <dd>
+                    <div class="fl">地址：</div>
+                    <div class="fr grey">{{vendor.enAddress}}</div>
+                </dd>
+                <dd>
+                    <div class="fl">主营：</div>
+                    <div class="fr grey">{{vendor.enType}}</div>
+                </dd>
+            </dl>
+            <!--客户联系人-->
+            <div class="com_title01"><span>供应商联系人</span></div>
+            <div class="supply-list01 pro-info clearfix">
+                <dl>
+                    <dt>
+                        <span class="wid01">姓名</span>
+                        <span class="wid01">性别</span>
+                        <span class="wid01">职务</span>
+                        <span>手机</span>
+                        <span>电话</span>
+                        <span>邮箱</span>
+                        <span class="wid02">操作</span>
+                    </dt>
+                    <dd ng-repeat = "contact in vendorContacts">
+                        <span class="wid01">{{contact.venduser}}</span>
+                        <span class="wid01" ng-bind="contact.sex == 'F' ? '女' : '男'"></span>
+                        <span class="wid01">{{contact.position}}</span>
+                        <span>{{contact.tel}}</span>
+                        <span>{{contact.phone}}</span>
+                        <span>{{contact.email}}</span>
+                        <span class="wid02"><a ng-click="edit(contact)" class="edit">编辑</a><a ng-click="deleteById(contact.id, $index)">删除</a></span>
+                    </dd>
+                    <dd>
+                        <span class="add-wl"><a ng-click="addContact(vendor.uu)">+新增供应商联系人</a></span>
+                    </dd>
+                </dl>
+            </div>
+            <!--已分配人员-->
+        <!--     <div class="com_title01"><span>已分配人员</span></div>
+            <div class="supply-list01 pro-info clearfix">
+                <dl>
+                    <dt>
+                        <span class="wid01">姓名</span>
+                        <span class="wid01">性别</span>
+                        <span class="wid01">职务</span>
+                        <span>手机</span>
+                        <span>电话</span>
+                        <span>邮箱</span>
+                        <span class="wid02">操作</span>
+                    </dt>
+                    <dd>
+                        <span class="wid01">陈先生</span>
+                        <span class="wid01">男</span>
+                        <span class="wid01">业务</span>
+                        <span>1313565636523</span>
+                        <span>0755-313232313</span>
+                        <span>1231313212156@qq.com</span>
+                        <span class="wid02"><a href="#">删除</a></span>
+                    </dd>
+                    <dd>
+                        <span class="add-wl"><a href="#">+新增分配人员</a></span>
+                    </dd>
+                </dl>
+            </div> -->
+        </div>
+        <div class="pro-add-data02">
+            <div class="pro-info clearfix">
+                <div class="pro-search">
+                    <div class="search fr">
+                        <input type="text" placeholder="平板">
+                        <a class="seek" href="###">搜索</a>
+                    </div>
+                </div>
+                <dl>
+                    <dt>
+                        <span>产品编号</span>
+                        <span>产品名称</span>
+                        <span>产品规格</span>
+                        <span>单位</span>
+                        <span>单价</span>
+                        <span>税率</span>
+                        <span>最小包量数</span>
+                        <span>最小订货量</span>
+                    </dt>
+                    <dd>
+                        <span>1000001</span>
+                        <span>电阻</span>
+                        <span>042-455555</span>
+                        <span>PCS</span>
+                        <span>0.26</span>
+                        <span>17%</span>
+                        <span>1000</span>
+                        <span>1000</span>
+                    </dd>
+                    <dd>
+                        <span>1000001</span>
+                        <span>电阻</span>
+                        <span>042-455555</span>
+                        <span>PCS</span>
+                        <span>0.26</span>
+                        <span>17%</span>
+                        <span>1000</span>
+                        <span>1000</span>
+                    </dd>
+                </dl>
+            </div>
+        </div>
+	</div>
+</div>
+</body>
+</html>