代采功能更新

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

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

@@ -30,8 +30,8 @@ public class DeputyLastOrderKeywords implements Serializable {
 	 * 主键id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputylastorderkeyword_gen")
-	@SequenceGenerator(name = "purc$deputylastorderkeyword_gen", sequenceName = "purc$deputylastorderkeyword_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputylastkeyword_gen")
+	@SequenceGenerator(name = "purc$deputylastkeyword_gen", sequenceName = "purc$deputylastkeyword_seq", allocationSize = 1)
 	@Column(name = "dl_id")
 	private Long id;
 

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

@@ -185,6 +185,12 @@ public class DeputyOrder implements Serializable {
 	@Column(name = "deo_deputyuu")
 	private Long deputyuu;
 
+	/**
+	 * 代采企业名称
+	 */
+	@Column(name = "deo_deputyname")
+	private String deputyname;
+
 	/**
 	 * 代采企业
 	 */
@@ -242,6 +248,12 @@ public class DeputyOrder implements Serializable {
 	@Column(name = "deo_totalamount")
 	private Double totalamount;
 
+	/**
+	 * 订单总金额
+	 */
+	@Column(name = "deo_orderamount")
+	private Double orderamount;
+
 	/**
 	 * 我方付款提货时间
 	 */
@@ -954,4 +966,20 @@ public class DeputyOrder implements Serializable {
 		this.paycomname = paycomname;
 	}
 
+	public Double getOrderamount() {
+		return orderamount;
+	}
+
+	public void setOrderamount(Double orderamount) {
+		this.orderamount = orderamount;
+	}
+
+	public String getDeputyname() {
+		return deputyname;
+	}
+
+	public void setDeputyname(String deputyname) {
+		this.deputyname = deputyname;
+	}
+
 }

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

@@ -12747,13 +12747,15 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			});
 		});
 		
-		// 更新代采企业时更新费率
-		$scope.change = function(deputyuu) {
-			// 费率
-			DeputyOrder.vendorRate( {enuu: deputyuu}, {}, function(data) {
-				$scope.rate = data;
-			}, function(response){
-				
+		// 更新名称时后台更改uu号
+		$scope.change = function(deputyname) {
+			DeputyOrder.deputyEnterprise({}, function(data) {
+				$scope.deputyEn = data;
+				angular.forEach($scope.deputyEn, function(en) {
+					if(deputyname == en.deputyname) {
+						$scope.deputyuu = en.deputyuu;
+					}
+				});
 			});
 		}
 		
@@ -13222,12 +13224,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		});
 		
 		// 更新代采企业时更新费率
-		$scope.change = function(deputyuu) {
-			// 费率
-			DeputyOrder.vendorRate( {enuu: deputyuu}, {}, function(data) {
-				$scope.rate = data;
-			}, function(response){
-				
+		$scope.change = function(deputyname) {
+			DeputyOrder.deputyEnterprise({}, function(data) {
+				$scope.deputyEn = data;
+				angular.forEach($scope.deputyEn, function(en) {
+					if(deputyname == en.deputyname) {
+						$scope.deputyuu = en.deputyuu;
+					}
+				});
 			});
 		}
 		

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

@@ -292,8 +292,8 @@
                          	<div class="fl">
                                 <em><b>*</b>代采企业：</em>
                                <span>
-                               		<select name="" class="select" ng-model="deOrder.deputyuu"  style="width: 200px" 
-                               			ng-options="deputyEn.deputyenuu as deputyEn.deputyenname for deputyEn in deputyEnterprises" ng-disabled="!deOrder.$editing">
+                               		<select name="" class="select" ng-model="deOrder.deputyname"  style="width: 200px" ng-change="change(deOrder.deputyname)"
+                               			ng-options="deputyEn.deputyenname as deputyEn.deputyenname for deputyEn in deputyEnterprises" ng-disabled="!deOrder.$editing">
                                		<option value="">请选择代采企业</option>
                                		</select>
                                </span>

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

@@ -295,8 +295,8 @@
                          	<div class="fl">
                                 <em><b>*</b>代采企业：</em>
                                <span>
-                               		<select name="" class="select" ng-model="deOrder.deputyuu" style="width: 200px" ng-change="change(deOrder.deputyuu)"
-                               			ng-options="deputyEn.deputyenuu as deputyEn.deputyenname for deputyEn in deputyEnterprises">
+                               		<select name="" class="select" ng-model="deOrder.deputyname" style="width: 200px" ng-change="change(deOrder.deputyname)"
+                               			ng-options="deputyEn.deputyname as deputyEn.deputyenname for deputyEn in deputyEnterprises">
                                		<option value="">请选择代采企业</option>
                                		</select>
                                </span>