代采订单增加供应商筛选。增加代采企业筛选

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

src/main/java/com/uas/platform/b2b/controller/DeputyOrderController.java

@@ -1,10 +1,31 @@
 package com.uas.platform.b2b.controller;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
+import com.uas.platform.b2b.model.DeputyEnterprise;
 import com.uas.platform.b2b.model.DeputyOrder;
 import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.DeputyOrderService;
 import com.uas.platform.b2b.service.UserService;
@@ -21,20 +42,6 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 代采订单
@@ -219,4 +226,28 @@ public class DeputyOrderController {
 	private Double vendorRate() {
 		return deputyOrderService.vendorRate();
 	}
+
+	/**
+	 * 代采企业列表
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/deputyenterprise", method = RequestMethod.GET)
+	private List<DeputyEnterprise> getList() {
+		return deputyOrderService.getList();
+	}
+
+	/**
+	 * 获取供应商
+	 */
+	@RequestMapping(value = "/vendors", method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<Vendor> getVendors(PageParams params, String keyword, Long enuu) {
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		pageParams.getFilters().put("ve_myenuu", enuu);
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return searchService.searchVendorCheckIds(keyword, pageParams);
+	}
 }

src/main/java/com/uas/platform/b2b/model/DeputyEnterprise.java

@@ -3,11 +3,14 @@ package com.uas.platform.b2b.model;
 import java.io.Serializable;
 import java.util.Date;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
@@ -47,6 +50,13 @@ public class DeputyEnterprise implements Serializable {
 	@Column(name = "de_deputyenuu")
 	private Long deputyenuu;
 	
+	/**
+	 * 代采企业
+	 */
+	@OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
+	@JoinColumn(name = "de_deputyenuu", insertable = false, updatable = false)
+	private Enterprise deputyEnterprise;
+
 	/**
 	 * 设置人uu
 	 */
@@ -99,4 +109,12 @@ public class DeputyEnterprise implements Serializable {
 		this.date = date;
 	}
 
+	public Enterprise getDeputyEnterprise() {
+		return deputyEnterprise;
+	}
+
+	public void setDeputyEnterprise(Enterprise deputyEnterprise) {
+		this.deputyEnterprise = deputyEnterprise;
+	}
+
 }

src/main/java/com/uas/platform/b2b/model/DeputyOrder.java

@@ -11,7 +11,9 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
@@ -157,6 +159,20 @@ public class DeputyOrder implements Serializable {
 	@Column(name = "deo_pickupmethod")
 	private String pickupmethod;
 
+	/**
+	 * 我方提货时间
+	 */
+	@Column(name = "deo_pickupdate")
+	private String pickupdate;
+
+	public String getPickupdate() {
+		return pickupdate;
+	}
+
+	public void setPickupdate(String pickupdate) {
+		this.pickupdate = pickupdate;
+	}
+
 	/**
 	 * 付款方式
 	 */
@@ -169,6 +185,13 @@ public class DeputyOrder implements Serializable {
 	@Column(name = "deo_deputyuu")
 	private Long deputyuu;
 
+	/**
+	 * 代采企业
+	 */
+	@OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
+	@JoinColumn(name = "deo_deputyuu", insertable = false, updatable = false)
+	private Enterprise deputyEnterprise;
+
 	/**
 	 * ERP对应单据的id
 	 */
@@ -320,6 +343,31 @@ public class DeputyOrder implements Serializable {
 	@Column(name = "deo_otherdata")
 	private String otherdata;
 
+	/**
+	 * 付款公司
+	 */
+	@Column(name = "deo_paymentcomenuu")
+	private Long paymentcomenuu;
+
+	/**
+	 * 付款公司名称
+	 */
+	@Column(name = "deo_paycomname")
+	private String paycomname;
+
+	/**
+	 * 付款公司
+	 */
+	@OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
+	@JoinColumn(name = "deo_paymentcomenuu", insertable = false, updatable = false)
+	private Enterprise paymentEnterprise;
+
+	/**
+	 * 付款公司地址
+	 */
+	@Column(name = "deo_paycomaddress")
+	private String paycomaddress;
+
 	/*****************
 	 * 买卖合同
 	 *****************/
@@ -360,6 +408,19 @@ public class DeputyOrder implements Serializable {
 	@Column(name = "deo_customer")
 	private String customer;
 
+	/**
+	 * 供应商
+	 */
+	@Column(name = "deo_vendorenuu")
+	private Long vendorenuu;
+
+	/**
+	 * 供应商
+	 */
+	@OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
+	@JoinColumn(name = "deo_vendorenuu", insertable = false, updatable = false)
+	private Enterprise vendorEnterprise;
+
 	/**
 	 * 货款支付方式
 	 */
@@ -822,4 +883,76 @@ public class DeputyOrder implements Serializable {
 		this.print = print;
 	}
 
+	public String getSalecode() {
+		return salecode;
+	}
+
+	public void setSalecode(String salecode) {
+		this.salecode = salecode;
+	}
+
+	public Long getPaymentcomenuu() {
+		return paymentcomenuu;
+	}
+
+	public void setPaymentcomenuu(Long paymentcomenuu) {
+		this.paymentcomenuu = paymentcomenuu;
+	}
+
+	public Enterprise getPaymentEnterprise() {
+		return paymentEnterprise;
+	}
+
+	public void setPaymentEnterprise(Enterprise paymentEnterprise) {
+		this.paymentEnterprise = paymentEnterprise;
+	}
+
+	public String getPaycomaddress() {
+		return paycomaddress;
+	}
+
+	public void setPaycomaddress(String paycomaddress) {
+		this.paycomaddress = paycomaddress;
+	}
+
+	public String getSalepocode() {
+		return salepocode;
+	}
+
+	public void setSalepocode(String salepocode) {
+		this.salepocode = salepocode;
+	}
+
+	public Long getVendorenuu() {
+		return vendorenuu;
+	}
+
+	public void setVendorenuu(Long vendorenuu) {
+		this.vendorenuu = vendorenuu;
+	}
+
+	public Enterprise getVendorEnterprise() {
+		return vendorEnterprise;
+	}
+
+	public void setVendorEnterprise(Enterprise vendorEnterprise) {
+		this.vendorEnterprise = vendorEnterprise;
+	}
+
+	public Enterprise getDeputyEnterprise() {
+		return deputyEnterprise;
+	}
+
+	public void setDeputyEnterprise(Enterprise deputyEnterprise) {
+		this.deputyEnterprise = deputyEnterprise;
+	}
+
+	public String getPaycomname() {
+		return paycomname;
+	}
+
+	public void setPaycomname(String paycomname) {
+		this.paycomname = paycomname;
+	}
+
 }

src/main/java/com/uas/platform/b2b/service/impl/DeputyOrderServiceImpl.java

@@ -16,6 +16,7 @@ import com.uas.platform.b2b.dao.DeputyOrderDao;
 import com.uas.platform.b2b.dao.DeputyOrderItemDao;
 import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.mobile.dao.DeputyEnterpriseDao;
+import com.uas.platform.b2b.model.DeputyEnterprise;
 import com.uas.platform.b2b.model.DeputyOrder;
 import com.uas.platform.b2b.model.DeputyOrderItem;
 import com.uas.platform.b2b.model.Vendor;
@@ -105,8 +106,8 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 					if (rate != null) {
 						Double purcprice = info.getUnitprice() + info.getUnitprice() * vendorRate();
 						info.setPurcprice(purcprice);
-					} else {
-						info.setPurcprice(Double.valueOf(0));
+					} else {// 如果费率不存在，设为单价
+						info.setPurcprice(info.getUnitprice());
 					}
 					if (info.getProdcode() != null) {
 						modelMap.put("total", total);
@@ -173,9 +174,13 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		order.setVenduseruu(deorder.getVenduseruu());
 		order.setEnuu(SystemSession.getUser().getEnterprise().getUu());
 		order.setEntrystatus(deorder.getEntrystatus());
-		order.setDeputyuu(Long.valueOf(deputyEnterpriseDao.findAll().get(0).getDeputyenuu()));// TODO
+		order.setDeputyuu(deorder.getDeputyuu());// TODO
+		order.setPaycomaddress(deorder.getPaycomaddress());
+		order.setPaycomname(deorder.getPaycomname());
 		order.setRate(vendorRate());
 		order.setCurrency(deorder.getCurrency());
+		order.setOtherdata(deorder.getOtherdata());
+		order.setPickupdate(deorder.getPickupdate());
 		int i = 1;
 		if (order.getId() == null) {// 新增
 			List<DeputyOrderItem> items = new ArrayList<DeputyOrderItem>();
@@ -247,4 +252,9 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		return rate;
 	}
 
+	@Override
+	public List<DeputyEnterprise> getList() {
+		return deputyEnterpriseDao.findAll();
+	}
+
 }

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

@@ -10416,7 +10416,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 				getDeOrder[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page) {
 					$scope.loading = false;
 					if(page) {
-						params.total(page.totalElements);
+						params.total(page.totalElement);
 						$scope.total = page.totalElement;
 						$defer.resolve(page.content);
 						$scope.keywordXls = angular.copy(pageParams.keyword);//保存当前取值的关键词
@@ -10455,12 +10455,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	 */
 	app.controller('NewDeputyOrderCtrl', ['$scope', 'toaster', '$modal', 'DeputyOrder', '$filter', 'ngTableParams', 'BaseService', function($scope, toaster, $modal, DeputyOrder, $filter, ngTableParams, BaseService) {
 		BaseService.scrollBackToTop();
-		// 费率
-		DeputyOrder.vendorRate({}, function(data) {
-			$scope.rate = data;
-		}, function(response){
-			
-		});
 		$scope.deOrder = {
 				code: 'DC' + $filter('date')(new Date(), 'yyMMddHHmmss_sss'),
 				entrydate: new Date(),
@@ -10474,6 +10468,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 				orderamount: 0,
 				usdpayment: 0
 					};
+		// 费率
+		DeputyOrder.vendorRate({}, function(data) {
+			$scope.rate = data;
+		}, function(response){
+			
+		});
+		
 		$scope.deOrder.deputyOrderItems = [];
 		var item = {
 				prodname: null,
@@ -10484,6 +10485,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 				remark: null,
 				orderprice: null,
 		};
+		// 代采企业列表
+		DeputyOrder.deputyEnterprise({}, function(data) {
+			$scope.deputyEnterprises = data;
+			$scope.deOrder.deputyuu = $scope.deputyEnterprises[0].deputyEnterprise.uu;
+		});
 		$scope.deOrder.deputyOrderItems.push(item);
 		//增加商品
 		$scope.add = function(index) {
@@ -10533,22 +10539,45 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			});
 		}
 		
+		// 查找供应商
+		$scope.dbfindVendor = function(deputyuu) {
+			var modalInstance = $modal.open({
+				templateUrl: 'static/tpl/index/purc/modal/purc_order_vendor.html',
+				controller: 'DbfindDeputyVendorInfoCtrl',
+				size: 'lg',
+				resolve: {
+					deputyuu: function() {return deputyuu}
+				}
+			});
+			
+			modalInstance.result.then(function(data) {
+				console.log(data);
+				$scope.deOrder.customer = data.vendorEnterprise.enName;
+				$scope.deOrder.legalrepresent = data.vendorUser.userName;
+				$scope.deOrder.enaddress = data.vendorEnterprise.enAddress;
+				$scope.deOrder.usertel = data.vendorUser.userTel;
+			})
+		}
 		$scope.save = function() {
 			$scope.deOrder.entrystatus = '保存';
 			angular.forEach($scope.deOrder.deputyOrderItems, function(item) {
 				$scope.deOrder.totalamount += item.amount * item.unitprice;
 				$scope.deOrder.totalpayament += item.amount * item.unitprice;
 			});
-			DeputyOrder.saveDeOrder({deOrder: $scope.deOrder}, {}, function(data) {
-				if(data.id) {
-					window.location.hash = "#/purc/deputy/"+data.id;
-				}
-				if(data.error) {
-					toaster.pop('error', '提示', '保存失败');
-				}
-			}, function(response) {
-				
-			});
+			if($scope.deOrder.deputyOrderItems[0].prodcode == null) {
+				toaster.pop('info', '提示', '您还未填写任何商品信息');
+			} else {
+				DeputyOrder.saveDeOrder({deOrder: $scope.deOrder}, {}, function(data) {
+					if(data.id) {
+						window.location.hash = "#/purc/deputy/"+data.id;
+					}
+					if(data.error) {
+						toaster.pop('error', '提示', '保存失败');
+					}
+				}, function(response) {
+					
+				});
+			}
 		}
 		
 		$scope.submit = function() {
@@ -10557,16 +10586,20 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 				$scope.deOrder.totalamount += item.amount * item.unitprice;
 				$scope.deOrder.totalpayament += item.amount * item.unitprice;
 			});
-			DeputyOrder.saveDeOrder({deOrder: $scope.deOrder}, {}, function(data) {
-				if(data.id) {
-					window.location.hash = "#/purc/deputy/"+data.id;
-				}
-				if(data.error) {
-					toaster.pop('error', '提示', '保存失败');
-				}
-			}, function(response) {
-				
-			});
+			if($scope.deOrder.deputyOrderItems[0].prodcode == null) {
+				toaster.pop('info', '提示', '您还未填写任何商品信息');
+			} else {
+				DeputyOrder.saveDeOrder({deOrder: $scope.deOrder}, {}, function(data) {
+					if(data.id) {
+						window.location.hash = "#/purc/deputy/"+data.id;
+					}
+					if(data.error) {
+						toaster.pop('error', '提示', '保存失败');
+					}
+				}, function(response) {
+					
+				});
+			}
 		}
 		
 		$scope.openDatePicker = function($event, deOrder, openParam) {
@@ -10577,6 +10610,50 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		
 	}]);
 	
+	// 代采企业供应商
+	app.controller('DbfindDeputyVendorInfoCtrl', ['$scope', 'toaster', '$upload', '$modalInstance', 'deputyuu', 'DeputyOrder', 'BaseService', 'ngTableParams', function($scope, toaster, $upload, $modalInstance, deputyuu, DeputyOrder, BaseService, ngTableParams) {
+		$scope.prod = false;
+		BaseService.scrollBackToTop();
+		// 搜索框回车
+		$scope.onSearch = function(keyword) {
+			$scope.keyword = keyword;
+			$scope.customerParams.page(1);
+			$scope.customerParams.reload();
+		};
+		
+		$scope.customerParams = new ngTableParams({
+			page : 1, 
+			count : 10
+		}, {
+			total : 0, 
+			counts: [5, 10, 25, 50],
+			getData : function($defer, params) {
+				$scope.loading = true;
+				var pageParams = params.url();
+				pageParams.keyword = $scope.keyword;
+				pageParams.enuu = deputyuu;
+				DeputyOrder.vendors.call(null, BaseService.parseParams(pageParams), function(page){
+					$scope.loading = false;
+					if(page) {
+						params.total(page.totalElements);
+						$defer.resolve(page.content);
+					}
+					$scope.totalCount = page.totalElements;
+				}, function(response){
+					$scope.loading = false;
+					toaster.pop('error', '数据加载失败', response.data);
+				});
+			}
+		});
+		
+  		$scope.cancel = function() {
+    		$modalInstance.dismiss();
+  		};
+  		
+  		$scope.checkVendor = function(vendor) { // 直接选择
+  			$modalInstance.close(vendor);
+  		}
+	}]);
 	/**
 	 * 代采订单批量导入
 	 */
@@ -10639,6 +10716,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		};
 		loadData();
 		
+		// 代采企业列表
+		DeputyOrder.deputyEnterprise({}, function(data) {
+			$scope.deputyEnterprises = data;
+			$scope.deOrder.deputyuu = $scope.deputyEnterprises[0].deputyEnterprise.uu;
+		});
+		
 		var getService = function() {
 			return DeputyOrder.getProdList;
 		};

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

@@ -24,6 +24,15 @@ define(['ngResource'], function() {
             printCount: {
                 url: 'deputyOrder/printCount/:id',
                 method: 'POST'
+            },
+            deputyEnterprise: {
+            	url: 'deputyOrder/deputyenterprise',
+                method: 'GET',
+                isArray: true
+            },
+            vendors: {
+            	url: 'deputyOrder/vendors',
+                method: 'GET'
             }
 		})
 	}]).factory('getDeOrder', ['$resource', function($resource) {

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

@@ -191,7 +191,7 @@
                     <div class="row">
                         <div id="topSearch" style="float: left">
                             <span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
-                          		  单据{{tableParams.total()}}条
+                          		  单据{{total}}条
                         </div>
                         <div class="col-xs-6">
                             <div class="search">
@@ -201,9 +201,9 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="fr toggle">
+                        <!-- <div class="fr toggle">
                             <a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
-                        </div>
+                        </div> -->
                     </div>
                     <div class="more" ng-class="{'open': condition.$open}">
                         <form class="form-inline">
@@ -250,7 +250,7 @@
 							</span>
                                 </div>
                             </div>
-                            <div class="form-group">
+                            <!-- <div class="form-group">
                                 <label>采纳结果：</label>
                                 <div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
                                     <button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
@@ -262,7 +262,7 @@
                                         <li><a ng-click="changeAgreed(0)">未采纳</a></li>
                                     </ul>
                                 </div>
-                            </div>
+                            </div> -->
                         </form>
                     </div>
                 </div>
@@ -272,7 +272,7 @@
             <thead>
                 <tr class="header">
                     <th width="313">订单信息</th>
-                    <th width="237">我方付款信息</th>
+                    <th width="237">我方回款信息</th>
                     <th width="237">终端供应商付款信息</th>
                     <th width="143">业务状态</th>
                     <th>操作</th>
@@ -297,7 +297,7 @@
                 		<div>累计付款金额：<span ng-bind="order.usdpayment"></span></div>
                 	</td>
                 	<td>
-                		<img alt="" src="resources/img/deputyOrder/pay_ok.png">
+                		<!-- <img alt="" src="resources/img/deputyOrder/pay_ok.png"> -->
                 	</td>
                     <td class="text-center">
                         <span ng-if="order.print" class="label ng-scope operates-status" style="margin-right: 5px;background-color: #5D6C79">已打印</span>

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

@@ -239,6 +239,7 @@
                                 	<input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" ng-disabled="!deOrder.$editing">
                                     <datalist id="paymentmethod">
                                     	 <option value="T/T支付">T/T支付</option>
+                                    	 <option value="T/T全款">T/T全款</option>
                                     </datalist>
                                 </span>
                             </div>
@@ -259,6 +260,17 @@
                                 </span>
                             </div>
                         </li>
+                         <li>
+                         	<div class="fl">
+                                <em>代采企业：</em>
+                               <span>
+                               		<select name="" class="select" ng-model="deOrder.deputyuu"
+                               			ng-options="deputyEn.deputyEnterprise.uu as deputyEn.deputyEnterprise.enName for deputyEn in deputyEnterprises"  ng-disabled="!deOrder.$editing">
+                               		<option value="">请选择代采企业</option>
+                               		</select>
+                               </span>
+                            </div>
+                        </li>
                     </ul>
                 </div>
                 <div class="com_title01"><span>下单明细(注：金额单位为{{deOrder.currency}})</span><a ng-click="uplodaByBatch()" ng-readonly="!deOrder.$editing">批量导入</a>  </div>
@@ -438,13 +450,13 @@
                 <div class="purchase_form01 clearfix">
                     <ul>
                         <li>
-                            <div class="fl">
-                                <em>供应商方法定代表人： </em>
-                                <span><input type="text" class="input01" ng-model="deOrder.legalrepresent"  ng-readonly="!deOrder.$editing"></span>
+                        	<div class="fl">
+                                <em>供应商：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.customer" ng-click="dbfindVendor(deOrder.deputyuu)" ng-readonly="!deOrder.$editing"></span>
                             </div>
                             <div class="fr">
-                                <em>供应商方电话：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.usertel"  ng-readonly="!deOrder.$editing"></span>
+                                <em>供应商方法定代表人： </em>
+                                <span><input type="text" class="input01" ng-model="deOrder.legalrepresent"  ng-readonly="!deOrder.$editing"></span>
                             </div>
                         </li>
                         <li>
@@ -459,8 +471,18 @@
                                 <span><input type="text" class="input01" ng-model="deOrder.salepocode" ng-readonly="!deOrder.$editing"></span>
                             </div>
                             <div class="fr">
-                                <em>客户名称：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.customer"  ng-readonly="!deOrder.$editing"></span>
+                                <em>供应商方电话：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.usertel"  ng-readonly="!deOrder.$editing"></span>
+                            </div>
+                        </li>
+                         <li>
+                            <div class="fl">
+                                <em>付款公司： </em>
+                                <span><input type="text" class="input01" ng-model="deOrder.paymentcomenname" ng-readonly="!deOrder.$editing"></span>
+                            </div>
+                            <div class="fr">
+                                <em>付款公司地址：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.paycomaddress" ng-readonly="!deOrder.$editing"></span>
                             </div>
                         </li>
                         <li>

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

@@ -247,6 +247,7 @@
                                     <input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select">
                                     <datalist id="paymentmethod">
                                     	 <option value="T/T支付">T/T支付</option>
+                                    	 <option value="T/T全款">T/T全款</option>
                                     </datalist>
                                 </span>
                             </div>
@@ -267,6 +268,17 @@
                                 </span>
                             </div>
                         </li>
+                         <li>
+                         	<div class="fl">
+                                <em>代采企业：</em>
+                               <span>
+                               		<select name="" class="select" ng-model="deOrder.deputyuu"
+                               			ng-options="deputyEn.deputyEnterprise.uu as deputyEn.deputyEnterprise.enName for deputyEn in deputyEnterprises">
+                               		<option value="">请选择代采企业</option>
+                               		</select>
+                               </span>
+                            </div>
+                        </li>
                     </ul>
                 </div>
                 <div class="com_title01"><span>下单明细(注：金额单位为<span ng-bind="deOrder.currency"></span>)</span><a ng-click="uplodaByBatch()">批量导入</a>  </div>
@@ -446,13 +458,13 @@
                 <div class="purchase_form01 clearfix">
                     <ul>
                         <li>
-                            <div class="fl">
-                                <em>供应商方法定代表人： </em>
-                                <span><input type="text" class="input01" ng-model="deOrder.legalrepresent"></span>
+                        	<div class="fl">
+                                <em>供应商：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.customer" ng-click="dbfindVendor(deOrder.deputyuu)"></span>
                             </div>
                             <div class="fr">
-                                <em>供应商方电话：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.usertel"></span>
+                                <em>供应商方法定代表人： </em>
+                                <span><input type="text" class="input01" ng-model="deOrder.legalrepresent"></span>
                             </div>
                         </li>
                         <li>
@@ -465,10 +477,20 @@
                             <div class="fl">
                                 <em>合同编号： </em>
                                 <span><input type="text" class="input01" ng-model="deOrder.salepocode"></span>
+                            </div>
+                             <div class="fr">
+                                <em>供应商方电话：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.usertel"></span>
+                            </div>
+                        </li>
+                         <li>
+                            <div class="fl">
+                                <em>付款公司： </em>
+                                <span><input type="text" class="input01" ng-model="deOrder.paymentcomenname"></span>
                             </div>
                             <div class="fr">
-                                <em>客户名称：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.customer"></span>
+                                <em>付款公司地址：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.paycomaddress"></span>
                             </div>
                         </li>
                         <li>
@@ -526,8 +548,8 @@
                     </ul>
                 </div>
                 <div class="save">
-                	<button href="#" ng-click="save()">保存</button>
-                	<button href="#" ng-click="submit()">提交</button>
+                	<button ng-click="save()">保存</button>
+                	<button ng-click="submit()">提交</button>
                 </div>
             </div>
         </div>

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

@@ -188,7 +188,7 @@
 		<div class="row">
 			<div id="topSearch" style="float: left">
 				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
-				单据{{tableParams.total()}}条
+				单据{{total()}}条
 			</div>
 			<div class="col-xs-6">
 				<div class="search">