Browse Source

代采功能的优化

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9435 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 8 years ago
parent
commit
4a666c5429

+ 12 - 0
src/main/java/com/uas/platform/b2b/controller/DeputyOrderController.java

@@ -25,6 +25,7 @@ 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.DeputyHisVendors;
+import com.uas.platform.b2b.model.DeputyLastOrderKeywords;
 import com.uas.platform.b2b.model.DeputyOrder;
 import com.uas.platform.b2b.model.DeputyOrderKeywords;
 import com.uas.platform.b2b.model.DeputyOrdersLog;
@@ -413,6 +414,17 @@ public class DeputyOrderController {
 		return deputyOrderService.getKeywords(tervendor);
 	}
 	
+	/**
+	 * 获取上次订单的一些数据关键词,便于自动导入
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/lastKeywords", method = RequestMethod.GET)
+	@ResponseBody
+	public DeputyLastOrderKeywords getLastKeywords(String tervendor) {
+		return deputyOrderService.getLastKeywords();
+	}
+
 	/**
 	 * 获取重复单据记录
 	 * 

+ 20 - 0
src/main/java/com/uas/platform/b2b/dao/DeputyLastOrderKeywordsDao.java

@@ -0,0 +1,20 @@
+package com.uas.platform.b2b.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import com.uas.platform.b2b.model.DeputyLastOrderKeywords;
+
+@Repository
+public interface DeputyLastOrderKeywordsDao
+		extends JpaRepository<DeputyLastOrderKeywords, Long>, JpaSpecificationExecutor<DeputyLastOrderKeywords> {
+
+	/**
+	 * 通过企业uu获取上次的数据
+	 * 
+	 * @param enuu
+	 * @return
+	 */
+	DeputyLastOrderKeywords findByEnuu(Long enuu);
+}

+ 102 - 0
src/main/java/com/uas/platform/b2b/model/DeputyLastOrderKeywords.java

@@ -0,0 +1,102 @@
+package com.uas.platform.b2b.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+/**
+ * 上次单据的内容,与上次供应商的内容不同
+ * 
+ * @author hejq
+ * @time 创建时间:2017年6月26日
+ */
+@Table(name = "purc$deputylastorderkeyword")
+@Entity
+public class DeputyLastOrderKeywords implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputylastorderkeyword_gen")
+	@SequenceGenerator(name = "purc$deputylastorderkeyword_gen", sequenceName = "purc$deputylastorderkeyword_seq", allocationSize = 1)
+	@Column(name = "dl_id")
+	private Long id;
+
+	/**
+	 * 主协议签订日期
+	 */
+	@Column(name = "dl_madealdate")
+	private Date madealdate;
+
+	/**
+	 * 主协议编号
+	 */
+	@Column(name = "dl_madealcode")
+	private String madealcode;
+	
+	/**
+	 * 企业
+	 */
+	@Column(name = "dl_enuu")
+	private Long enuu;
+
+	/**
+	 * 上一次更新日期
+	 */
+	@Column(name = "dl_date")
+	private Date date;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Date getMadealdate() {
+		return madealdate;
+	}
+
+	public void setMadealdate(Date madealdate) {
+		this.madealdate = madealdate;
+	}
+
+	public String getMadealcode() {
+		return madealcode;
+	}
+
+	public void setMadealcode(String madealcode) {
+		this.madealcode = madealcode;
+	}
+
+	public Long getEnuu() {
+		return enuu;
+	}
+
+	public void setEnuu(Long enuu) {
+		this.enuu = enuu;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+}

+ 14 - 0
src/main/java/com/uas/platform/b2b/model/DeputyOrderKeywords.java

@@ -119,6 +119,12 @@ public class DeputyOrderKeywords implements Serializable {
 	@Column(name = "dk_legalrepresent")
 	private String legalrepresent;
 
+	/**
+	 * 供应商法人电话(原来是传真)
+	 */
+	@Column(name = "dk_enfax")
+	private String enfax;
+
 	public Long getId() {
 		return id;
 	}
@@ -239,4 +245,12 @@ public class DeputyOrderKeywords implements Serializable {
 		this.tervendor = tervendor;
 	}
 
+	public String getEnfax() {
+		return enfax;
+	}
+
+	public void setEnfax(String enfax) {
+		this.enfax = enfax;
+	}
+
 }

+ 9 - 0
src/main/java/com/uas/platform/b2b/service/DeputyOrderService.java

@@ -8,6 +8,7 @@ import org.springframework.ui.ModelMap;
 
 import com.uas.platform.b2b.model.DeputyEnterprise;
 import com.uas.platform.b2b.model.DeputyHisVendors;
+import com.uas.platform.b2b.model.DeputyLastOrderKeywords;
 import com.uas.platform.b2b.model.DeputyOrder;
 import com.uas.platform.b2b.model.DeputyOrderKeywords;
 import com.uas.platform.b2b.model.DeputyOrdersLog;
@@ -143,4 +144,12 @@ public interface DeputyOrderService {
 	 * @return
 	 */
 	public Page<DeputyOrdersLog> getRepetitions(PageParams params, String keyword);
+
+	/**
+	 * 获取上次的单据一些字段(不通过供应商关联)
+	 * 
+	 * @param tervendor
+	 * @return
+	 */
+	public DeputyLastOrderKeywords getLastKeywords();
 }

+ 24 - 0
src/main/java/com/uas/platform/b2b/service/impl/DeputyOrderServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
 import com.uas.platform.b2b.dao.DeputyHisVendorsDao;
+import com.uas.platform.b2b.dao.DeputyLastOrderKeywordsDao;
 import com.uas.platform.b2b.dao.DeputyOrderDao;
 import com.uas.platform.b2b.dao.DeputyOrderItemDao;
 import com.uas.platform.b2b.dao.DeputyOrderKeywordsDao;
@@ -30,6 +31,7 @@ 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.DeputyHisVendors;
+import com.uas.platform.b2b.model.DeputyLastOrderKeywords;
 import com.uas.platform.b2b.model.DeputyOrder;
 import com.uas.platform.b2b.model.DeputyOrderItem;
 import com.uas.platform.b2b.model.DeputyOrderKeywords;
@@ -74,6 +76,9 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 	@Autowired
 	private DeputyOrdersLogDao deputyOrdersLogDao;
 
+	@Autowired
+	private DeputyLastOrderKeywordsDao deputyLastOrderKeywordsDao;
+
 	@Override
 	public ModelMap releaseByWorkbook(Workbook workbook) {
 		ModelMap modelMap = new ModelMap();
@@ -198,6 +203,7 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		order.setDownloadstatus("未下载");
 		order.setSalecode(deorder.getSalecode());
 		order.setSalepocode(deorder.getSalepocode());
+		order.setPaymethod(deorder.getPaymethod());
 		if (deorder.getStatus().equals("在录入")) {
 			order.setStatus(Status.UNAUDIT.getPhrase());
 			order.setStatuscode(Status.UNAUDIT.value());
@@ -266,6 +272,7 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		keyword.setUseruu(SystemSession.getUser().getUserUU());
 		keyword.setVendtel(order.getVendtel());
 		keyword.setVenduser(order.getVenduser());
+		keyword.setEnfax(order.getEnfax());
 		deputyOrderKeywordsDao.save(keyword);
 		// 记录供应商
 		DeputyHisVendors oldvendor = deputyHisVendorsDao
@@ -278,6 +285,18 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 			vendor.setVendorname(order.getTervendor());
 			deputyHisVendorsDao.save(vendor);
 		}
+		// 记录上次的关键词(不关联供应商)
+		DeputyLastOrderKeywords keywords = new DeputyLastOrderKeywords();
+		DeputyLastOrderKeywords lastkeywords = deputyLastOrderKeywordsDao
+				.findByEnuu(SystemSession.getUser().getEnterprise().getUu());
+		if (lastkeywords != null) {
+			keywords = lastkeywords;
+		}
+		keywords.setDate(new Date());
+		keywords.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+		keywords.setMadealcode(order.getMadealcode());
+		keywords.setMadealdate(order.getMadealdate());
+		deputyLastOrderKeywordsDao.save(keywords);
 		return map;
 	}
 
@@ -430,4 +449,9 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		}, pageInfo);
 	}
 
+	@Override
+	public DeputyLastOrderKeywords getLastKeywords() {
+		return deputyLastOrderKeywordsDao.findByEnuu(SystemSession.getUser().getEnterprise().getUu());
+	}
+
 }

BIN
src/main/resources/jxls-tpl/sale/DeputyOrderItem_example.xls


+ 57 - 29
src/main/webapp/resources/js/index/app.js

@@ -12786,6 +12786,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				$scope.deOrder.bankname = data.bankname;
 				$scope.deOrder.legalrepresent = data.legalrepresent;
 				$scope.deOrder.tervendaddress = data.tervendaddress;
+				$scope.deOrder.enfax = data.enfax;
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});
@@ -12798,6 +12799,15 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			toaster.pop('error', '提示', response.data);
 		});
 		
+		// 上次填写记录(不关联供应商)
+		DeputyOrder.lastKeywords({}, function(data) {
+			$scope.lastkeyowrds = data;
+			$scope.deOrder.madealdate = $scope.lastkeyowrds.madealdate;
+			$scope.deOrder.madealcode = $scope.lastkeyowrds.madealcode;
+		}, function(response) {
+			toaster.pop('error', '提示', response.data);
+		});
+		
 		//增加商品
 		$scope.add = function(index) {
 			if($scope.deOrder.deputyOrderItems[index].prodcode == null) {
@@ -16049,7 +16059,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				pageParams.keyword = $scope.keyword;
 				pageParams.searchFilter = $scope.searchFilter;
 				getService().call(null, BaseService.parseParams(pageParams), function(page){
-					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElement);
 						$defer.resolve(page.content);
@@ -16065,7 +16074,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 						Products.matchsize({type: 'all'}, {}, function(data) {
 							$scope.size = data.size;
 							if($scope.total < $scope.size) {
-								$scope.tableParams.reload();
+								$timeout(function() {
+									$scope.tableParams.reload();
+								}, 500);
+							} else {
+								$scope.loading = false;
 							}
 						}, function(response) {
 							toaster.pop('error', '提示', response.data);
@@ -16110,14 +16123,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     				return;
     			}
     		});
-    		$scope.checks.checked = result;
-    		 var checked = true;
-             angular.forEach($scope.tableParams.data, function(message) { // 单选全部时,全选选中
-                 if (!message.checked) {
-                     checked = false;
-                 }
-             });
-             $scope.checks.checked = checked;
+//    		$scope.checks.checked = result;
+//    		 var checked = true;
+//             angular.forEach($scope.tableParams.data, function(message) { // 单选全部时,全选选中
+//                 if (!message.checked) {
+//                     checked = false;
+//                 }
+//             });
+//             $scope.checks.checked = checked;
         };
         
         $scope.product = {
@@ -16162,6 +16175,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         
      // 一键更新
 		$scope.updateAll = function() {
+			$scope.loading = true;
 			angular.forEach($scope.tableParams.data, function(product) {
 				if(product.checked) {
 					if(product.matchresults.length == 1) {
@@ -16177,6 +16191,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				} 
 			});
 			Products.updateall( {}, ids, function(data) {
+				$scope.loading = false;
 				if(data.success) {
 					toaster.pop('success', '提示', data.success);
 					$scope.tableParams.page(1);
@@ -16184,6 +16199,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				}
 				ids = []; // 清空ids,防止重复点击出现多余的数据
 			}, function(response) {
+				$scope.loading = false;
 				toaster.pop('error', '提示', response.data);
 			});
 		}
@@ -16237,7 +16253,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				pageParams.keyword = $scope.keyword;
 				pageParams.searchFilter = $scope.searchFilter;
 				getService().call(null, BaseService.parseParams(pageParams), function(page){
-					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElement);
 						$defer.resolve(page.content);
@@ -16253,7 +16268,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 						Products.matchsize({type: 'sale'}, {}, function(data) {
 							$scope.size = data.size;
 							if($scope.total < $scope.size) {
-								$scope.tableParams.reload();
+								$timeout(function() {
+									$scope.tableParams.reload();
+								}, 500);
+							} else {
+								$scope.loading = false;
 							}
 						}, function(response) {
 							toaster.pop('error', '提示', response.data);
@@ -16298,14 +16317,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     				return;
     			}
     		});
-    		$scope.checks.checked = result;
-    		 var checked = true;
-             angular.forEach($scope.tableParams.data, function(message) { // 单选全部时,全选选中
-                 if (!message.checked) {
-                     checked = false;
-                 }
-             });
-             $scope.checks.checked = checked;
+//    		$scope.checks.checked = result;
+//    		 var checked = true;
+//             angular.forEach($scope.tableParams.data, function(message) { // 单选全部时,全选选中
+//                 if (!message.checked) {
+//                     checked = false;
+//                 }
+//             });
+//             $scope.checks.checked = checked;
         };
         
         $scope.product = {
@@ -16350,6 +16369,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         
      // 一键更新
 		$scope.updateAll = function() {
+			$scope.loading = true;
 			angular.forEach($scope.tableParams.data, function(product) {
 				if(product.checked) {
 					if(product.matchresults.length == 1) {
@@ -16365,6 +16385,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				} 
 			});
 			Products.updateall( {}, ids, function(data) {
+				$scope.loading = false;
 				if(data.success) {
 					toaster.pop('success', '提示', data.success);
 					$scope.tableParams.page(1);
@@ -16372,6 +16393,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				}
 				ids = []; // 清空ids,防止重复点击出现多余的数据
 			}, function(response) {
+				$scope.loading = true;
 				toaster.pop('error', '提示', response.data);
 			});
 		}
@@ -16425,7 +16447,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				pageParams.keyword = $scope.keyword;
 				pageParams.searchFilter = $scope.searchFilter;
 				getService().call(null, BaseService.parseParams(pageParams), function(page){
-					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElement);
 						$defer.resolve(page.content);
@@ -16441,7 +16462,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 						Products.matchsize({type: 'purc'}, {}, function(data) {
 							$scope.size = data.size;
 							if($scope.total < $scope.size) {
-								$scope.tableParams.reload();
+								$timeout(function() {
+									$scope.tableParams.reload();
+								}, 500);
+							} else {
+								$scope.loading = false;
 							}
 						}, function(response) {
 							toaster.pop('error', '提示', response.data);
@@ -16487,13 +16512,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     			}
     		});
     		$scope.checks.checked = result;
-    		 var checked = true;
-             angular.forEach($scope.tableParams.data, function(message) { // 单选全部时,全选选中
-                 if (!message.checked) {
-                     checked = false;
-                 }
-             });
-             $scope.checks.checked = checked;
+//    		 var checked = true;
+//             angular.forEach($scope.tableParams.data, function(message) { // 单选全部时,全选选中
+//                 if (!message.checked) {
+//                     checked = false;
+//                 }
+//             });
+//             $scope.checks.checked = checked;
         };
         
         $scope.product = {
@@ -16538,6 +16563,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         
 		// 一键更新
 		$scope.updateAll = function() {
+			$scope.loading = true;
 			angular.forEach($scope.tableParams.data, function(product) {
 				if(product.checked) {
 					if(product.matchresults.length == 1) {
@@ -16553,6 +16579,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				} 
 			});
 			Products.updateall( {}, ids, function(data) {
+				$scope.loading = false;
 				if(data.success) {
 					toaster.pop('success', '提示', data.success);
 					$scope.tableParams.page(1);
@@ -16560,6 +16587,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				}
 				ids = []; // 清空ids,防止重复点击出现多余的数据
 			}, function(response) {
+				$scope.loading = false;
 				toaster.pop('error', '提示', response.data);
 			});
 		}

+ 4 - 0
src/main/webapp/resources/js/index/services/DeputyOrder.js

@@ -67,6 +67,10 @@ define(['ngResource'], function() {
             getRepetitions: {
             	url: 'deputyOrder/repetitions',
             	method: 'GET'
+            },
+            lastKeywords: {
+            	url: 'deputyOrder/lastKeywords',
+            	method: 'GET'
             }
 		})
 	}]).factory('getDeOrder', ['$resource', function($resource) {

+ 9 - 9
src/main/webapp/resources/tpl/index/purc/deputyOrder_detail.html

@@ -322,13 +322,13 @@
                         </dt>
                         <dd ng-repeat="item in deOrder.deputyOrderItems">
                             <span class="wid01">{{$index+1}}</span>
-                            <span class="wid02"><input type="text" class="text-center" ng-model="item.prodname"></span>
-                            <span><input type="text" class="text-center" ng-model="item.prodcode"></span>
-                            <span><input type="text" class="text-center" ng-model="item.prodspec"></span>
-                            <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><input type="text" class="text-center" ng-model="item.purcprice"></span>
+                            <span class="wid02"><input type="text" class="text-center" ng-model="item.prodname" ng-required="true"></span>
+                            <span><input type="text" class="text-center" ng-model="item.prodcode" ng-required="true"></span>
+                            <span><input type="text" class="text-center" ng-model="item.prodspec" ng-required="true"></span>
+                            <span><input type="text" class="text-center" ng-model="item.prodbrand" ng-required="true"></span>
+                            <span><input type="text" class="text-center" ng-model="item.amount" ng-required="true"></span>
+                            <span><input type="text" class="text-center" ng-model="item.unitprice" ng-required="true"></span>
+                            <span><input type="text" class="text-center" ng-model="item.purcprice" ng-required="true"></span>
                             <span>{{item.unitprice * item.amount | number: 2}}</span>
                             <span><input type="text" class="text-center" ng-model="item.remark"></span>
                             <span><button ng-click="add($index)" style="color: #1f4fb2" ng-disabled="!deOrder.$editing">添加</button>
@@ -395,11 +395,11 @@
                         <li>
                             <div class="fl">
                                 <em><b>*</b>风险承担方式:</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.riskmethod" ng-readonly="!deOrder.$editing" ng-required="true"></span>
+                                <span><input type="text" class="input01" ng-model="deOrder.riskmethod" readonly ng-required="true"></span>
                             </div>
                             <div class="fr">
                                 <em><b>*</b>运、税费承担方式:</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.taxpaymentmethod" ng-readonly="!deOrder.$editing" ng-required="true"></span>
+                                <span><input type="text" class="input01" ng-model="deOrder.taxpaymentmethod" readonly ng-required="true"></span>
                             </div>
                         </li>
                     </ul>

+ 9 - 9
src/main/webapp/resources/tpl/index/purc/deputyOrder_new.html

@@ -325,13 +325,13 @@
                         </dt>
                         <dd ng-repeat="item in deOrder.deputyOrderItems">
                             <span class="wid01">{{$index+1}}</span>
-                            <span class="wid02"><input type="text" class="text-center" ng-model="item.prodname"></span>
-                            <span><input type="text" class="text-center" ng-model="item.prodcode"></span>
-                            <span><input type="text" class="text-center" ng-model="item.prodspec"></span>
-                            <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><input type="text" class="text-center" ng-model="item.purcprice"></span>
+                            <span class="wid02"><input type="text" class="text-center" ng-model="item.prodname" ng-required="true"></span>
+                            <span><input type="text" class="text-center" ng-model="item.prodcode" ng-required="true"></span>
+                            <span><input type="text" class="text-center" ng-model="item.prodspec" ng-required="true"></span>
+                            <span><input type="text" class="text-center" ng-model="item.prodbrand" ng-required="true"></span>
+                            <span><input type="text" class="text-center" ng-model="item.amount" ng-required="true"></span>
+                            <span><input type="text" class="text-center" ng-model="item.unitprice" ng-required="true"></span>
+                            <span><input type="text" class="text-center" ng-model="item.purcprice" ng-required="true"></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>
@@ -395,11 +395,11 @@
                         <li>
                             <div class="fl">
                                 <em><b>*</b>风险承担方式:</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.riskmethod" ng-required="true"></span>
+                                <span><input type="text" class="input01" ng-model="deOrder.riskmethod" ng-required="true" readonly></span>
                             </div>
                             <div class="fr">
                                 <em><b>*</b>运、税费承担方式:</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.taxpaymentmethod" ng-required="true"></span>
+                                <span><input type="text" class="input01" ng-model="deOrder.taxpaymentmethod" ng-required="true" readonly></span>
                             </div>
                         </li>
                     </ul>