代采订单功能更新

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

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

@@ -76,6 +76,12 @@ public class DeputyOrderItem implements Serializable {
 	@Column(name = "dei_unitprice")
 	private Double unitprice;
 	
+	/**
+	 * 采购单价
+	 */
+	@Column(name = "dei_purcprice")
+	private Double purcprice;
+
 	/**
 	 * 总金额
 	 */
@@ -155,6 +161,14 @@ public class DeputyOrderItem implements Serializable {
 		this.unitprice = unitprice;
 	}
 
+	public Double getPurcprice() {
+		return purcprice;
+	}
+
+	public void setPurcprice(Double purcprice) {
+		this.purcprice = purcprice;
+	}
+
 	public Double getTotalprice() {
 		return totalprice;
 	}

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

@@ -124,28 +124,30 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 						row.getCell(5).setCellType(Cell.CELL_TYPE_STRING);
 						info.setUnitprice(Double.valueOf(row.getCell(5).getStringCellValue()));
 					}
-					// 总价
+
+					// 订单单价
 					if (row.getCell(6) != null) {
 						row.getCell(6).setCellType(Cell.CELL_TYPE_STRING);
-						info.setTotalprice(Double.valueOf(row.getCell(6).getStringCellValue()));
+						if (null != row.getCell(6).getStringCellValue().trim()
+								&& !row.getCell(6).getStringCellValue().trim().equals("")) {
+							info.setPurcprice(Double.valueOf(row.getCell(6).getStringCellValue()));
+						}
 					}
-					// 备注
+
+					// 总价
 					if (row.getCell(7) != null) {
 						row.getCell(7).setCellType(Cell.CELL_TYPE_STRING);
-						info.setRemark(row.getCell(7).getStringCellValue().trim());
+						info.setTotalprice(Double.valueOf(row.getCell(7).getStringCellValue()));
+					}
+
+					// 备注
+					if (row.getCell(8) != null) {
+						row.getCell(8).setCellType(Cell.CELL_TYPE_STRING);
+						info.setRemark(row.getCell(8).getStringCellValue().trim());
 					}
 					if (alters.size() > 0) {
 						modelMap.put("alters", alters);
 					}
-					// // 采购单价
-					// Double rate = vendorRate(enuu);
-					// if (rate != null) {
-					// Double purcprice = info.getUnitprice() +
-					// info.getUnitprice() * vendorRate();
-					// info.setPurcprice(purcprice);
-					// } else {// 如果费率不存在，设为单价
-					// info.setPurcprice(info.getUnitprice());
-					// }
 					if (info.getProdcode() != null) {
 						modelMap.put("total", total);
 						modelMap.put("success", total - alters.size());
@@ -216,7 +218,7 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		order.setDeputyuu(deorder.getDeputyuu());// TODO
 		order.setPaycomaddress(deorder.getPaycomaddress());
 		order.setPaycomname(deorder.getPaycomname());
-		order.setRate(vendorRate(order.getDeputyuu()));
+		order.setRate(deorder.getRate());
 		order.setCurrency(deorder.getCurrency());
 		order.setOtherdata(deorder.getOtherdata());
 		order.setPickupdate(deorder.getPickupdate());

src/main/webapp/resources/css/deputyOrder/order.css

@@ -247,7 +247,7 @@ body {
     font-size: 14px;
 }
 .purchase_form01 ul li div em {
-    width:145px;
+    width:147px;
     float: left;
     margin-left: 30px;
     line-height: 40px;

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

@@ -10133,7 +10133,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
      // 一键匹配
 		$scope.matchall = function() {
 			Products.matchall({}, function(data) {
-//				toaster.pop('info', '提示', '匹配成功'+data.size+'标准器件');
+				toaster.pop('info', '提示', '匹配成功'+data.size+'标准器件');
 				window.location.href = "#/sale/productmatches";
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
@@ -12694,6 +12694,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				prodspec: null,
 				amount: null,
 				unitprice: null,
+				purcprice: null,
 				remark: null,
 				orderprice: null,
 		};
@@ -12774,6 +12775,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 							prodbrand: null,
 							amount: null, 
 							unitprice: null, 
+							purcprice: null,
 							remark: null,
 							orderprice: null});
 			}
@@ -12842,6 +12844,16 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			})
 		}
 		
+		//计算采购单价
+		$scope.checkPrice = function(rate) {
+			if(rate == null) {
+				toaster.pop('info', '提示', '请先填入税率');
+			} else {
+				angular.forEach($scope.deOrder.deputyOrderItems, function(item) {
+					item.purcprice = item.unitprice * (1 + rate/100);
+				});
+			}
+		}
 		// 保存
 		$scope.save = function() {
 			$scope.deOrder.entrystatus = '保存';
@@ -13175,6 +13187,16 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			})
 		}
 		
+		//计算采购单价
+		$scope.checkPrice = function(rate) {
+			if(rate == null) {
+				toaster.pop('info', '提示', '请先填入税率');
+			} else {
+				angular.forEach($scope.deOrder.deputyOrderItems, function(item) {
+					item.purcprice = item.unitprice * (1 + rate/100);
+				});
+			}
+		}
 		
 		// 保存
 		$scope.save = function() {
@@ -15927,7 +15949,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		// 一键匹配
 		$scope.matchall = function() {
 			Products.matchall({}, function(data) {
-//				toaster.pop('info', '提示', '匹配成功'+data.size+'标准器件');
+				toaster.pop('info', '提示', '匹配成功'+data.size+'标准器件');
 				window.location.href = "#/approvalFlow/productmatches";
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
@@ -16641,7 +16663,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
      // 一键匹配
 		$scope.matchall = function() {
 			Products.matchall({}, function(data) {
-//				toaster.pop('info', '提示', '匹配成功'+data.size+'标准器件');
+				toaster.pop('info', '提示', '匹配成功'+data.size+'标准器件');
 				window.location.href = "#/purc/productmatches";
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);

src/main/webapp/resources/tpl/index/approvalFlow/productmatches.html

@@ -257,7 +257,7 @@ tbody td div.text-mould {
 				<th width="120">上传类目</th>
 				<th width="100">上传型号</th>
 				<th width="200">上传品牌</th>
-				<th width="200">标准品牌</th>
+				<th width="200">标准</th>
 				<th width="110"><input type="checkbox" ng-click="checkAll()" ng-model="checks.checked"><a ng-click="updateAll()">一键更新</a></th>
 			</tr>
 		</thead>

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

@@ -140,6 +140,11 @@
 .com_title01 span{
     margin-left: 37px;
 }
+.purchase_xq span button {
+	border: none;
+	background-color: #fff;
+	height: 49px;
+}
 </style>
 <div class="warp">
     <div class=" purchase">
@@ -190,13 +195,13 @@
                                 </div>
                             </div>
                             <div class="fr">
-                                <em>主协议编号：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.madealcode" ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>主协议编号：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.madealcode" ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl">
-                                <em>终端供应商名称：</em>
+                                <em><b>*</b>终端供应商名称：</em>
                                 <span><!-- <input type="text" class="input01" ng-model="deOrder.tervendor" ng-readonly="!deOrder.$editing"> -->
                                 	 <input  ng-model="deOrder.tervendor" list="hisvendors" class="select" style="width: 200px">
 	                                    <datalist id="hisvendors" ng-repeat="vendor in hisvendors">
@@ -205,14 +210,14 @@
                                 </span>
                             </div>
                             <div class="fr">
-                                <em>电话：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.vendtel" ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>电话：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.vendtel" ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl">
-                                <em>联系人：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.venduser" ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>联系人：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.venduser" ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                             <div class="fr">
                                 <em><b>*</b>供应商发货时间：</em>
@@ -234,19 +239,19 @@
                         </li>
                         <li>
                             <div class="fl">
-                                <em>货物包装要求：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.goodspacking"  ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>货物包装要求：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.goodspacking"  ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                             <div class="fr">
-                                <em>供应商交货方式：</em>
+                                <em><b>*</b>供应商交货方式：</em>
                                 <span>
-                                    <input type="text" class="input01" ng-model="deOrder.deliverymethod"  ng-readonly="!deOrder.$editing">
+                                    <input type="text" class="input01" ng-model="deOrder.deliverymethod"  ng-readonly="!deOrder.$editing" ng-required="true">
                                 </span>
                             </div>
                         </li>
                         <li>
                             <div class="fl">
-                                <em>我方提货方式：</em>
+                                <em><b>*</b>我方提货方式：</em>
                                 <span>
                                     <select name="" class="select" ng-model="deOrder.pickupmethod" ng-disabled="!deOrder.$editing">
                                         <option value="自提">自提</option>
@@ -257,9 +262,9 @@
                                 </span>
                             </div>
                             <div class="fr">
-                                <em>我方付款方式：</em>
+                                <em><b>*</b>我方付款方式：</em>
                                 <span>
-                                	<input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" ng-disabled="!deOrder.$editing">
+                                	<input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" ng-disabled="!deOrder.$editing" ng-required="">
                                     <datalist id="paymentmethod">
                                     	 <option value="T/T支付">T/T支付</option>
                                     	 <option value="T/T全款">T/T全款</option>
@@ -269,11 +274,11 @@
                         </li>
                         <li>
                          	<div class="fl">
-                                <em>我方提货时间：</em>
-                               <span><input type="text" class="input01" ng-model="deOrder.pickupdate" ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>我方提货时间：</em>
+                               <span><input type="text" class="input01" ng-model="deOrder.pickupdate" ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                             <div class="fr">
-                                <em>交易币别：</em>
+                                <em><b>*</b>交易币别：</em>
                                <span> 
 	                               	<select name="" class="select" ng-model="deOrder.currency" ng-init="deOrder.currency = 'USD'" ng-disabled="!deOrder.$editing">
 	                                    <option value="USD">USD</option>
@@ -285,7 +290,7 @@
                         </li>
                          <li>
                          	<div class="fl">
-                                <em>代采企业：</em>
+                                <em><b>*</b>代采企业：</em>
                                <span>
                                		<select name="" class="select" ng-model="deOrder.deputyuu"  style="width: 200px" 
                                			ng-options="deputyEn.deputyEnterprise.uu as deputyEn.deputyEnterprise.enName for deputyEn in deputyEnterprises"  ng-disabled="!deOrder.$editing">
@@ -296,7 +301,7 @@
                         </li>
                     </ul>
                 </div>
-                <div class="com_title01"><span>下单明细(注：金额单位为{{deOrder.currency}})</span><a ng-click="uplodaByBatch()" ng-readonly="!deOrder.$editing">批量导入</a>  </div>
+                <div class="com_title01"><span>下单明细(注：金额单位为{{deOrder.currency}})</span><a ng-click="uplodaByBatch()" ng-readonly="!deOrder.$editing">批量导入</a> <input ng-model="deOrder.rate"><a ng-click="checkPrice(deOrder.rate)">更新订单单价</a>  </div>
                 <div class="purchase_xq clearfix">
                     <dl>
                         <dt>
@@ -320,12 +325,12 @@
                             <span><input type="text" class="text-center" ng-model="item.prodbrand"></span>
                             <span><input type="text" class="text-center" ng-model="item.amount"></span>
                             <span><input type="text" class="text-center" ng-model="item.unitprice"></span>
-                            <span>{{item.unitprice + item.unitprice* rate.rate/100| number: 6}}</span>
+                            <span><input type="text" class="text-center" ng-model="item.purcprice"></span>
                             <span>{{item.unitprice * item.amount | number: 2}}</span>
                             <span><input type="text" class="text-center" ng-model="item.remark"></span>
-                            <span><a ng-click="add($index)" style="color: #1f4fb2">添加</a>
-                            	  <a ng-click="del($index, item.id)" style="color: #d32526" ng-if="item.id != null"> 删除</a>
-                            	  <a ng-click="delItem($index)" style="color: #d32526" ng-if="item.id == null"> 删除</a>
+                            <span><button ng-click="add($index)" style="color: #1f4fb2" ng-disabled="!deOrder.$editing">添加</button>
+                            	  <button ng-click="del($index, item.id)" style="color: #d32526" ng-if="item.id != null" ng-disabled="!deOrder.$editing"> 删除</button>
+                            	  <button ng-click="delItem($index)" style="color: #d32526" ng-if="item.id == null" ng-disabled="!deOrder.$editing"> 删除</button>
                             </span>
                         </dd>
                     </dl>
@@ -386,12 +391,12 @@
                         </li>
                         <li>
                             <div class="fl">
-                                <em>风险承担方式：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.riskmethod" ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>风险承担方式：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.riskmethod" ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                             <div class="fr">
-                                <em>运、税费承担方式：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.taxpaymentmethod" ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>运、税费承担方式：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.taxpaymentmethod" ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                         </li>
                     </ul>
@@ -402,14 +407,14 @@
                     <ul>
                         <li>
                             <div class="fl wid100">
-                                <em>终端供应商地址：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.tervendaddress" ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>终端供应商地址：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.tervendaddress" ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl wid100">
-                                <em>公司全称（英文）：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.companyname" ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>公司全称（英文）：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.companyname" ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
@@ -447,24 +452,24 @@
                         </li>
                         <li>
                             <div class="fl">
-                                <em>银行名称（英文）：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.bankname"  ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>银行名称（英文）：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.bankname"  ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                             <div class="fr">
-                                <em>银行账号：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.bankaccount"  ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>银行账号：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.bankaccount"  ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl wid100">
-                                <em>银行地址（英文）：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.bankaddress"  ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>银行地址（英文）：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.bankaddress"  ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl">
-                                <em>银行代码：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.bankcode"  ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>银行代码：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.bankcode"  ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                             <div class="fr">
                                 <em>其它相关资料：</em>
@@ -492,8 +497,8 @@
                                </span>
                             </div> -->
                             <div class="fr">
-                                <em>供应商方法定代表人： </em>
-                                <span><input type="text" class="input01" ng-model="deOrder.legalrepresent"  ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>供应商方法定代表人： </em>
+                                <span><input type="text" class="input01" ng-model="deOrder.legalrepresent"  ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
@@ -504,18 +509,18 @@
                         </li>
                          <li>
                             <div class="fl">
-                                <em>付款公司： </em>
-                                <span><input type="text" class="input01" ng-model="deOrder.paycomname" ng-readonly="!deOrder.$editing" ng-click="dbfindPayCompany(deOrder.deputyuu)"></span>
+                                <em><b>*</b>付款公司： </em>
+                                <span><input type="text" class="input01" ng-model="deOrder.paycomname" ng-readonly="!deOrder.$editing" ng-click="dbfindPayCompany(deOrder.deputyuu)" ng-required="true"></span>
                             </div>
                             <div class="fr">
-                                <em>付款公司地址：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.paycomaddress" ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>付款公司地址：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.paycomaddress" ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl">
-                                <em>供应商方传真： </em>
-                                <span><input type="text" class="input01" ng-model="deOrder.enfax"  ng-readonly="!deOrder.$editing"></span>
+                                <em><b>*</b>供应商方传真： </em>
+                                <span><input type="text" class="input01" ng-model="deOrder.enfax"  ng-readonly="!deOrder.$editing" ng-required="true"></span>
                             </div>
                             <div class="fr">
                                 <em><b>*</b>货款支付时间：</em>
@@ -537,7 +542,7 @@
                         </li>
                         <li>
                         	<div class="fl">
-                                <em>货款支付方式：</em>
+                                <em><b>*</b>货款支付方式：</em>
                                 <span>
                                     <input ng-model="deOrder.paymethod" list="paymethod" class="select" ng-disabled="!deOrder.$editing">
                                 	<datalist id="paymethod">

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

@@ -198,13 +198,13 @@
                                 </div>
                             </div>
                             <div class="fr">
-                                <em>主协议编号：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.madealcode"></span>
+                                <em><b>*</b>主协议编号：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.madealcode" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl">
-                                <em>终端供应商名称：</em>
+                                <em><b>*</b>终端供应商名称：</em>
                                 <span><!-- <input type="text" class="input01" ng-model="deOrder.tervendor"> -->
                                 	 <input  ng-model="deOrder.tervendor" list="hisvendors" class="select" style="width: 200px" ng-change="getHisKeyword(deOrder.tervendor)">
 	                                    <datalist id="hisvendors" ng-repeat="vendor in hisvendors">
@@ -213,14 +213,14 @@
                                 </span>
                             </div>
                             <div class="fr">
-                                <em>电话：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.vendtel"></span>
+                                <em><b>*</b>电话：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.vendtel" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl">
-                                <em>联系人：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.venduser"></span>
+                                <em><b>*</b>联系人：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.venduser" ng-required="true"></span>
                             </div>
                             <div class="fr">
                                 <em><b>*</b>供应商发货时间：</em>
@@ -242,19 +242,19 @@
                         </li>
                         <li>
                             <div class="fl">
-                                <em>货物包装要求：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.goodspacking"></span>
+                                <em><b>*</b>货物包装要求：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.goodspacking" ng-required="true"></span>
                             </div>
                             <div class="fr">
-                                <em>供应商交货方式：</em>
+                                <em><b>*</b>供应商交货方式：</em>
                                 <span>
-                                   <input type="text" class="input01" ng-model="deOrder.deliverymethod" >
+                                   <input type="text" class="input01" ng-model="deOrder.deliverymethod" ng-required="true">
                                 </span>
                             </div>
                         </li>
                         <li>
                             <div class="fl">
-                                <em>我方提货方式：</em>
+                                <em><b>*</b>我方提货方式：</em>
                                 <span>
                                     <select name="" class="select" ng-model="deOrder.pickupmethod" ng-init="deOrder.pickupmethod = '自提'">
                                         <option value="自提">自提</option>
@@ -265,9 +265,9 @@
                                 </span>
                             </div>
                             <div class="fr">
-                                <em>我方付款方式：</em>
+                                <em><b>*</b>我方付款方式：</em>
                                 <span>
-                                    <input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select">
+                                    <input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" ng-required="true">
                                     <datalist id="paymentmethod">
                                     	 <option value="T/T支付">T/T支付</option>
                                     	 <option value="T/T全款">T/T全款</option>
@@ -277,11 +277,11 @@
                         </li>
                         <li>
                          	<div class="fl">
-                                <em>我方提货时间：</em>
-                               <span><input type="text" class="input01" ng-model="deOrder.pickupdate"></span>
+                                <em><b>*</b>我方提货时间：</em>
+                               <span><input type="text" class="input01" ng-model="deOrder.pickupdate" ng-required="true"></span>
                             </div>
                             <div class="fr">
-                                <em>交易币别：</em>
+                                <em><b>*</b>交易币别：</em>
                                <span> 
 	                               	<select name="" class="select" ng-model="deOrder.currency" ng-init="deOrder.currency = 'USD'">
 	                                    <option value="USD">USD</option>
@@ -293,7 +293,7 @@
                         </li>
                          <li>
                          	<div class="fl">
-                                <em>代采企业：</em>
+                                <em><b>*</b>代采企业：</em>
                                <span>
                                		<select name="" class="select" ng-model="deOrder.deputyuu" style="width: 200px" ng-change="change(deOrder.deputyuu)"
                                			ng-options="deputyEn.deputyEnterprise.uu as deputyEn.deputyEnterprise.enName for deputyEn in deputyEnterprises">
@@ -304,7 +304,7 @@
                         </li>
                     </ul>
                 </div>
-                <div class="com_title01"><span>下单明细(注：金额单位为<span ng-bind="deOrder.currency"></span>)</span><a ng-click="uplodaByBatch()">批量导入</a>  </div>
+                <div class="com_title01"><span>下单明细(注：金额单位为<span ng-bind="deOrder.currency"></span>)</span><a ng-click="uplodaByBatch()">批量导入</a> <input ng-model="deOrder.rate"><a ng-click="checkPrice(deOrder.rate)">更新订单单价</a> </div>
                 <div class="purchase_xq clearfix">
                     <dl>
                         <dt>
@@ -328,7 +328,7 @@
                             <span><input type="text" class="text-center" ng-model="item.prodbrand"></span>
                             <span><input type="text" class="text-center" ng-model="item.amount"></span>
                             <span><input type="text" class="text-center" ng-model="item.unitprice"></span>
-                            <span>{{item.unitprice*(1+rate.rate/100)| number: 6}}</span>
+                            <span><input type="text" class="text-center" ng-model="item.purcprice"></span>
                             <span>{{item.unitprice * item.amount | number: 2}}</span>
                             <span><input type="text" class="text-center" ng-model="item.remark"></span>
                             <span><a ng-click="add($index)" style="color: #1f4fb2">添加</a><a ng-click="del($index)" style="color: #d32526"> 删除</a></span>
@@ -391,12 +391,12 @@
                         </li>
                         <li>
                             <div class="fl">
-                                <em>风险承担方式：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.riskmethod"></span>
+                                <em><b>*</b>风险承担方式：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.riskmethod" ng-required="true"></span>
                             </div>
                             <div class="fr">
-                                <em>运、税费承担方式：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.taxpaymentmethod"></span>
+                                <em><b>*</b>运、税费承担方式：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.taxpaymentmethod" ng-required="true"></span>
                             </div>
                         </li>
                     </ul>
@@ -407,14 +407,14 @@
                     <ul>
                         <li>
                             <div class="fl wid100">
-                                <em>终端供应商地址：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.tervendaddress"></span>
+                                <em><b>*</b>终端供应商地址：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.tervendaddress" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl wid100">
-                                <em>公司全称（英文）：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.companyname"></span>
+                                <em><b>*</b>公司全称（英文）：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.companyname" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
@@ -452,24 +452,24 @@
                         </li>
                         <li>
                             <div class="fl">
-                                <em>银行名称（英文）：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.bankname"></span>
+                                <em><b>*</b>银行名称（英文）：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.bankname" ng-required="true"></span>
                             </div>
                             <div class="fr">
-                                <em>银行账号：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.bankaccount"></span>
+                                <em><b>*</b>银行账号：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.bankaccount" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl wid100">
-                                <em>银行地址（英文）：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.bankaddress"></span>
+                                <em><b>*</b>银行地址（英文）：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.bankaddress" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl">
-                                <em>银行代码：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.bankcode"></span>
+                                <em><b>*</b>银行代码：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.bankcode" ng-required="true"></span>
                             </div>
                             <div class="fr">
                                 <em>其它相关资料：</em>
@@ -497,8 +497,8 @@
                                </span>
                             </div> -->
                             <div class="fr">
-                                <em>供应商方法定代表人： </em>
-                                <span><input type="text" class="input01" ng-model="deOrder.legalrepresent"></span>
+                                <em><b>*</b>供应商方法定代表人： </em>
+                                <span><input type="text" class="input01" ng-model="deOrder.legalrepresent" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
@@ -509,18 +509,18 @@
                         </li>
                          <li>
                             <div class="fl">
-                                <em>付款公司： </em>
+                                <em><b>*</b>付款公司： </em>
                                 <span><input type="text" class="input01" ng-model="deOrder.paycomname" ng-click="dbfindPayCompany(deOrder.deputyuu)"></span>
                             </div>
                             <div class="fr">
-                                <em>付款公司地址：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.paycomaddress"></span>
+                                <em><b>*</b>付款公司地址：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.paycomaddress" ng-required="true"></span>
                             </div>
                         </li>
                         <li>
                         	<div class="fl">
-                                <em>供应商方传真： </em>
-                                <span><input type="text" class="input01" ng-model="deOrder.enfax"></span>
+                                <em><b>*</b>供应商方传真： </em>
+                                <span><input type="text" class="input01" ng-model="deOrder.enfax" ng-required="true"></span>
                             </div>
                             <div class="fr">
                                 <em><b>*</b>货款支付时间：</em>
@@ -542,7 +542,7 @@
                         </li>
                         <li>
                        	 	<div class="fl">
-                                <em>货款支付方式：</em>
+                                <em><b>*</b>货款支付方式：</em>
                                 <span>
                                 	<input ng-model="deOrder.paymethod" list="paymethod" class="select">
                                 	<datalist id="paymethod">