1、修复主单和分单选取收发货人无法自动填写国家代码和企业代码的bug；

2、优化收发货人管理；

1、修复主单和分单选取收发货人无法自动填写国家代码和企业代码的bug；
2、优化收发货人管理；
Kevin
src/main/java/com/agent/controller/agent/ConsigneeController.java
src/main/java/com/agent/controller/agent/ConsignorController.java
src/main/java/com/agent/controller/agent/ManifestController.java
src/main/java/com/agent/entity/agent/ManifestEntity.java
src/main/java/com/agent/entity/agent/PreparesecondaryEntity.java
src/main/java/com/agent/repository/agent/EnterpriseRepository.java
src/main/java/com/agent/service/agent/EnterpriseService.java
src/main/webapp/WEB-INF/views/consignee/edit.jsp
src/main/webapp/WEB-INF/views/consignee/list.jsp
src/main/webapp/WEB-INF/views/consignor/edit.jsp
src/main/webapp/WEB-INF/views/consignor/list.jsp
src/main/webapp/WEB-INF/views/manifest/edit.jsp
src/main/webapp/WEB-INF/views/manifest/sub_edit.jsp
--- a/src/main/java/com/agent/controller/agent/ConsigneeController.java
查看文件 @911eae6
+++ b/src/main/java/com/agent/controller/agent/ConsigneeController.java
查看文件 @911eae6
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.agent.controller.BasicController;
 import com.agent.entity.agent.ConsigneeEntity;
 import com.agent.service.agent.ConsigneeService;
+import com.agent.service.agent.EnterpriseService;
 import com.agent.vo.ResponseModel;
 import tools.Tools;
@@ -34,13 +35,16 @@ import tools.Tools;
 public class ConsigneeController extends BasicController {
 	@Resource
-	private ConsigneeService service;
+	private ConsigneeService consigneeService;
+	
+	@Resource
+	private EnterpriseService enterpriseService;
 	@RequestMapping(value = "/getall")
 	@ResponseBody
 	public ResponseModel getAll(HttpServletRequest request) {
 		ResponseModel model = new ResponseModel(200, "操作成功", null);
-		List<ConsigneeEntity> dataList = service.findAllByUserId(Tools.getUserId());
+		List<ConsigneeEntity> dataList = consigneeService.findAllByUserId(Tools.getUserId());
 		if (dataList == null || dataList.size() == 0) {
 			model = new ResponseModel(200, "没有数据", null);
 		} else {
@@ -53,6 +57,7 @@ public class ConsigneeController extends BasicController {
 	@RequestMapping(value = "/list")
 	public String list(HttpServletRequest request,boolean isWithChoose) {
 		request.setAttribute("isWithChoose", isWithChoose);
+		request.setAttribute("version", System.currentTimeMillis());
 		return "consignee/list";
 	}
@@ -70,13 +75,13 @@ public class ConsigneeController extends BasicController {
 		ResponseModel model = new ResponseModel(200, "", null);
 		page = page < 1 ? 1 : page;
 		limit = limit < 1 ? 10 : limit;
-		List<ConsigneeEntity> dataList = service.list(page, limit,key);
+		List<ConsigneeEntity> dataList = consigneeService.list(page, limit,key);
 		if (dataList == null || dataList.size() == 0) {
 			model = new ResponseModel(200, "没有数据", null);
 		} else {
 			model = new ResponseModel(200, "查询成功", null);
 		}
-		model.setCount(StringUtils.isBlank(key)?service.total(Tools.getUserId()):service.total(Tools.getUserId(),key));
+		model.setCount(StringUtils.isBlank(key)?consigneeService.total(Tools.getUserId()):consigneeService.total(Tools.getUserId(),key));
 		model.setData(dataList);
 		return model;
 	}
@@ -89,7 +94,7 @@ public class ConsigneeController extends BasicController {
 			model = new ResponseModel(200, "", null);
 			if (ids.indexOf(",") > 1) {
 				try {
-					service.deleteAll(ids);
+					consigneeService.deleteAll(ids);
 					model = new ResponseModel(200, "", null);
 				} catch (Exception e) {
 					model = new ResponseModel(500, "删除失败", null);
@@ -105,9 +110,11 @@ public class ConsigneeController extends BasicController {
 	public String edit(HttpServletRequest request, String id, Model model) {
 		if (StringUtils.isNotBlank(id)) {
-			ConsigneeEntity consignee = service.findById(id);
+			ConsigneeEntity consignee = consigneeService.findById(id);
 			model.addAttribute("consignee", consignee);
 		}
+		request.setAttribute("version", System.currentTimeMillis());
+		request.setAttribute("allCountry", enterpriseService.getAllCountry());
 		return "consignee/edit";
 	}
@@ -116,15 +123,15 @@ public class ConsigneeController extends BasicController {
 	public ResponseModel save(ConsigneeEntity consignee) {
 		ResponseModel model = new ResponseModel(404, "", null);
 		if (consignee != null) {
-			ConsigneeEntity old = service.findByCompanyAndUserId(consignee.getName(),Tools.getUserId());
+			ConsigneeEntity old = consigneeService.findByCompanyAndUserId(consignee.getName(),Tools.getUserId());
 			if (old == null) {
 				consignee.setCreator(Tools.getUserEntity());
 				consignee.setModifier(Tools.getUserEntity());
-				service.save(consignee);
+				consigneeService.save(consignee);
 				model = new ResponseModel(200, "操作成功", null);
 			} else {
 				if(old.getId()!=null) {
-					service.save(consignee);
+					consigneeService.save(consignee);
 					model = new ResponseModel(200, "修改成功", null);
 				}else {
 					model = new ResponseModel(500, "不能重复添加", null);
--- a/src/main/java/com/agent/controller/agent/ConsignorController.java
查看文件 @911eae6
+++ b/src/main/java/com/agent/controller/agent/ConsignorController.java
查看文件 @911eae6
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.agent.controller.BasicController;
 import com.agent.entity.agent.ConsignorEntity;
 import com.agent.service.agent.ConsignorService;
+import com.agent.service.agent.EnterpriseService;
 import com.agent.vo.ResponseModel;
 import tools.Tools;
@@ -34,13 +35,16 @@ import tools.Tools;
 public class ConsignorController extends BasicController {
 	@Resource
-	private ConsignorService service;
+	private ConsignorService consignorService;
+	
+	@Resource
+	private EnterpriseService enterpriseService;
 	@RequestMapping(value = "/getall")
 	@ResponseBody
 	public ResponseModel getAll(HttpServletRequest request) {
 		ResponseModel model = new ResponseModel(200, "", null);
-		List<ConsignorEntity> dataList = service.findAllByUserId(Tools.getUserId());
+		List<ConsignorEntity> dataList = consignorService.findAllByUserId(Tools.getUserId());
 		if (dataList == null || dataList.size() == 0) {
 			model = new ResponseModel(404, "", null);
 		} else {
@@ -53,6 +57,7 @@ public class ConsignorController extends BasicController {
 	@RequestMapping(value = "/list")
 	public String list(HttpServletRequest request,boolean isWithChoose) {
 		request.setAttribute("isWithChoose", isWithChoose);
+		request.setAttribute("version", System.currentTimeMillis());
 		return "consignor/list";
 	}
@@ -70,13 +75,13 @@ public class ConsignorController extends BasicController {
 		ResponseModel model = new ResponseModel(200, "操作成功", null);
 		page = page < 1 ? 1 : page;
 		limit = limit < 1 ? 10 : limit;
-		List<ConsignorEntity> dataList = service.list(page, limit,key);
+		List<ConsignorEntity> dataList = consignorService.list(page, limit,key);
 		if (dataList == null || dataList.size() == 0) {
 			model = new ResponseModel(200, "没有数据", null);
 		} else {
 			model = new ResponseModel(200, "查询成功", null);
 		}
-		model.setCount(StringUtils.isBlank(key)?service.total(Tools.getUserId()):service.total(Tools.getUserId(),key));
+		model.setCount(StringUtils.isBlank(key)?consignorService.total(Tools.getUserId()):consignorService.total(Tools.getUserId(),key));
 		model.setData(dataList);
 		return model;
 	}
@@ -89,7 +94,7 @@ public class ConsignorController extends BasicController {
 			model = new ResponseModel(200, "", null);
 			if (ids.indexOf(",") > 1) {
 				try {
-					service.deleteAll(ids);
+					consignorService.deleteAll(ids);
 					model = new ResponseModel(200, "", null);
 				} catch (Exception e) {
 					model = new ResponseModel(500, "删除失败", null);
@@ -105,9 +110,11 @@ public class ConsignorController extends BasicController {
 	public String edit(HttpServletRequest request, String id, Model model) {
 		if (StringUtils.isNotBlank(id)) {
-			ConsignorEntity consignor = service.findById(id);
+			ConsignorEntity consignor = consignorService.findById(id);
 			model.addAttribute("consignor", consignor);
 		}
+		request.setAttribute("version", System.currentTimeMillis());
+		request.setAttribute("allCountry", enterpriseService.getAllCountry());
 		return "consignor/edit";
 	}
@@ -116,15 +123,15 @@ public class ConsignorController extends BasicController {
 	public ResponseModel save(ConsignorEntity consignor) {
 		ResponseModel model = new ResponseModel(404, "", null);
 		if (consignor != null) {
-			ConsignorEntity old = service.findByCompanyAndUserId(consignor.getCo_company(),Tools.getUserId());
+			ConsignorEntity old = consignorService.findByCompanyAndUserId(consignor.getCo_company(),Tools.getUserId());
 			if (old == null) {
 				consignor.setCreator(Tools.getUserEntity());
 				consignor.setModifier(Tools.getUserEntity());
-				service.save(consignor);
+				consignorService.save(consignor);
 				model = new ResponseModel(200, "操作成功", null);
 			} else {
 				if(old.getId()!=null) {
-					service.save(consignor);
+					consignorService.save(consignor);
 					model = new ResponseModel(200, "修改成功", null);
 				}else {
 					model = new ResponseModel(500, "不能重复添加", null);
--- a/src/main/java/com/agent/controller/agent/ManifestController.java
查看文件 @911eae6
+++ b/src/main/java/com/agent/controller/agent/ManifestController.java
查看文件 @911eae6
@@ -40,6 +40,7 @@ import com.agent.entity.agent.WaybillReceiptType;
 import com.agent.entity.system.UserEntity;
 import com.agent.imf.agent.redis.RedisSaveMessage;
 import com.agent.service.agent.BasicAgentService;
+import com.agent.service.agent.ConsigneeService;
 import com.agent.service.agent.ConsignorService;
 import com.agent.service.agent.ManifestBillService;
 import com.agent.service.agent.ManifestCommodityService;
@@ -131,6 +132,9 @@ public class ManifestController extends BasicController {
 	@Resource
 	private ConsignorService consignorService;
+	
+	@Resource
+	private ConsigneeService consigneeService;
 	@Resource
 	private WaybillReceiptService receiptService;
@@ -141,7 +145,8 @@ public class ManifestController extends BasicController {
 	 * @return
 	 */
 	@RequestMapping(value = "/list")
-	public String getList(Model model) {
+	public String getList(HttpServletRequest request,Model model) {
+		request.setAttribute("version", System.currentTimeMillis());
 		return "manifest/list";
 	}
@@ -509,6 +514,7 @@ public class ManifestController extends BasicController {
 	 */
 	@RequestMapping(value = "/edit")
 	public String edit(HttpServletRequest request, Long id, Model model) {
+		request.setAttribute("version", System.currentTimeMillis());
 		ManifestEntity manifest = null;
 		// 判断是否是便捷
 		if (id != null) {
@@ -603,6 +609,7 @@ public class ManifestController extends BasicController {
 	 */
 	@RequestMapping(value = "/subedit", method = { RequestMethod.GET })
 	private String subedit(HttpServletRequest request, Long id, Long mawbId, String type, Model model) {
+		request.setAttribute("version", System.currentTimeMillis());
 		ManifestEntity manifest = null;
 		List<PreparesecondaryEntity> preparesecondaryList = null;
 		PreparesecondaryEntity pre = null;
@@ -813,6 +820,7 @@ public class ManifestController extends BasicController {
 		manifest.setCarrier(carrier);
 		manifest.setFlightno(flightno);
+		consigneeService.saveFromManifest(manifest, Tools.getUserId());
 		consignorService.saveFromManifest(manifest, Tools.getUserId());
 		ResponseModel model = new ResponseModel();
@@ -911,6 +919,7 @@ public class ManifestController extends BasicController {
 		manifest.setCarrier(carrier);
 		manifest.setFlightno(flightno);
+		consigneeService.saveFromManifest(manifest, Tools.getUserId());
 		consignorService.saveFromManifest(manifest, Tools.getUserId());
 		ResponseModel model = new ResponseModel();
@@ -1061,6 +1070,7 @@ public class ManifestController extends BasicController {
 		preparesecondary.setCarrier(carrier);
 		preparesecondary.setFlightno(flightno);
+		consigneeService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
 		consignorService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
 		ResponseModel model = new ResponseModel();
@@ -1140,6 +1150,7 @@ public class ManifestController extends BasicController {
 		preparesecondary.setCarrier(carrier);
 		preparesecondary.setFlightno(flightno);
+		consigneeService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
 		consignorService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
 		ResponseModel model = new ResponseModel();
--- a/src/main/java/com/agent/entity/agent/ManifestEntity.java
查看文件 @911eae6
+++ b/src/main/java/com/agent/entity/agent/ManifestEntity.java
查看文件 @911eae6
@@ -565,7 +565,7 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 	@Column(name = "STOWAGEDATE")
 	public Date getStowagedate() {
 //		return stowagedate;
-		return new Date();
+		return new Date(System.currentTimeMillis()+6*3600);
 	}
 	public void setStowagedate(Date stowagedate) {
--- a/src/main/java/com/agent/entity/agent/PreparesecondaryEntity.java
查看文件 @911eae6
+++ b/src/main/java/com/agent/entity/agent/PreparesecondaryEntity.java
查看文件 @911eae6
@@ -592,7 +592,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 	@Column(name = "STOWAGEDATE")
 	public Date getStowagedate() {
 //		return stowagedate;
-		return new Date();
+		return new Date(System.currentTimeMillis()+6*3600);
 	}
 	public void setStowagedate(Date stowagedate) {
--- a/src/main/java/com/agent/repository/agent/EnterpriseRepository.java
查看文件 @911eae6
+++ b/src/main/java/com/agent/repository/agent/EnterpriseRepository.java
查看文件 @911eae6
@@ -13,6 +13,9 @@ public interface EnterpriseRepository extends PagingAndSortingRepository<Enterpr
 	@Query(value = "SELECT * FROM T_BAS_ENTERPRISE WHERE COUNTRY_CODE like ?1% AND ROWID=ANY(SELECT MAX(ROWID) FROM T_BAS_ENTERPRISE GROUP BY NAME_EN) ORDER BY ID ASC", nativeQuery = true)
 	public List<EnterpriseEntity> search(String start);
+	@Query(value = "SELECT * FROM T_BAS_ENTERPRISE WHERE ROWID=ANY(SELECT MAX(ROWID) FROM T_BAS_ENTERPRISE GROUP BY NAME_EN) ORDER BY ID ASC", nativeQuery = true)
+	public List<EnterpriseEntity> getAllCountry();
+	
 	@Query(value = "SELECT * FROM T_BAS_ENTERPRISE WHERE COUNTRY_CODE = ?1  ORDER BY ID ASC", nativeQuery = true)
 	public List<EnterpriseEntity> findTypeByCountryCode(String countryCode);
 }
--- a/src/main/java/com/agent/service/agent/EnterpriseService.java
查看文件 @911eae6
+++ b/src/main/java/com/agent/service/agent/EnterpriseService.java
查看文件 @911eae6
@@ -28,6 +28,10 @@ public class EnterpriseService {
 	public EnterpriseService() {
 	}
+	public List<EnterpriseEntity> getAllCountry(){
+		return service.getAllCountry();
+	}
+	
 	public List<EnterpriseEntity> search(String start){
 		return service.search(start);
 	}
--- a/src/main/webapp/WEB-INF/views/consignee/edit.jsp
查看文件 @911eae6
+++ b/src/main/webapp/WEB-INF/views/consignee/edit.jsp
查看文件 @911eae6
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
@@ -18,10 +19,15 @@
 <script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script>
 <!-- validate 验证中英文 -->
 <script type="text/javascript"
-	src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js"></script>
-<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
-<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
-<script type="text/javascript" src="<%=basePath%>resource/js/tools.js"></script>
+	src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js?version=${version}"></script>
+<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css?version=${version}" media="all">
+<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/js/tools.js?version=${version}"></script>
+
+<script src="<%=basePath%>resource/easyui/jquery.easyui.min.js?version=${version}"></script>
+<link rel="stylesheet" type="text/css" href="<%=basePath%>resource/easyui/uimaker/icon.css?version=${version}">
+<link rel="stylesheet" href="<%=basePath%>resource/easyui/uimaker/easyui.css?version=${version}">
+
 <style type="text/css">
 .required_span {
 	color: red;
@@ -58,13 +64,17 @@
 						<td><spring:message code="manifest.telephone" /></td>
 						<td>
-							<input type="text" name="tel" value="${consignee.tel}" 
-							autocomplete="off" class="layui-input" maxlength="50">
+							<input type="text" name="tel" id="tel" value="${consignee.tel}" 
+							autocomplete="off" class="layui-input" maxlength="50"
+							oninput="onInputChange(event,'tel','oninput')"
+							onpropertychange="onInputChange(event,'tel','onpropertychange')">
 						</td>
 						<td><spring:message code="manifest.fax" /></td>
 						<td>
-							<input type="text" name="fax" value="${consignee.fax}" 
+							<input type="text" name="fax" id="fax" value="${consignee.fax}" 
+							oninput="onInputChange(event,'fax','oninput')"
+							onpropertychange="onInputChange(event,'fax','onpropertychange')"
 							autocomplete="off" class="layui-input" maxlength="50">
 						</td>
 					</tr>
@@ -72,10 +82,12 @@
 					<tr>
 						<td><spring:message code="manifest.country" /><span class="required_span">*</span></td>
 						<td>
-							<input required type="text" name="country" id="country" value="${consignee.country}"
-								autocomplete="off" class="layui-input" maxlength="2" lay-verify="required"
-								oninput="onInputChange(event,'country','oninput')"
-								onpropertychange="onInputChange(event,'country','onpropertychange')">
+							<input required lay-verify="required" class="layui-input"
+									id="country" name="country" maxlength="2" type="text"
+									<c:if test="${empty consignee.country}">value=""</c:if>
+									<c:if test="${not empty consignee.country}">value="${consignee.country}"</c:if> 
+									oninput="onInputChange(event,'country','oninput')"
+									onpropertychange="onInputChange(event,'country','onpropertychange')">		
 						</td>
 						<td><spring:message code="manifest.city" /><span class="required_span">*</span></td>
@@ -88,21 +100,32 @@
 						<td><spring:message code="manifest.zip.code" /></td>
 						<td>
-							<input type="text" name="zipcode" value="${consignee.zipcode}" autocomplete="off" class="layui-input" maxlength="9">
+							<input type="text" name="zipcode" id="zipcode" value="${consignee.zipcode}" 
+							oninput="onInputChange(event,'zipcode','oninput')"
+							onpropertychange="onInputChange(event,'zipcode','onpropertychange')"
+							autocomplete="off" class="layui-input" maxlength="9">
 						</td>
 					</tr>
 					<tr>
 						<td><spring:message code="manifest.address" /><span class="required_span">*</span></td>
-						<td colspan="5">
+						<td colspan="2">
 							<input required type="text" name="address" id="address" value="${consignee.address}" 
 								autocomplete="off" class="layui-input" maxlength="70" lay-verify="required"
 								oninput="onInputChange(event,'address','oninput')"
 								onpropertychange="onInputChange(event,'address','onpropertychange')">
 						</td>
+						
+						<td><spring:message code="manifest.shr.cneaeo" /></td>
+						<td colspan="2">
+							<input type="text" name="aeo" id="cneaeo"
+								value="${consignee.aeo}" autocomplete="off" class="layui-input" maxlength="20" 
+								oninput="onInputChange(event,'cneaeo','oninput')"
+								onpropertychange="onInputChange(event,'cneaeo','onpropertychange')">
+						</td>
 					</tr>
-					<tr>
+					<%-- <tr>
 						<td><spring:message code="manifest.enterprise.code" /><span class="required_span">*</span></td>
 						<td>
 							<input required id="cnecusid" type="text" name="cusid" value="${consignee.cusid}"
@@ -110,15 +133,40 @@
 								oninput="onInputChange(event,'cnecusid','oninput')"
 								onpropertychange="onInputChange(event,'cnecusid','onpropertychange')">
 						</td>
-						
-						<td><spring:message code="manifest.shr.cneaeo" /></td>
-						<td colspan="3">
-							<input type="text" name="aeo" id="cneaeo"
-								value="${consignee.aeo}" autocomplete="off" class="layui-input" maxlength="20" 
-								oninput="onInputChange(event,'cneaeo','oninput')"
-								onpropertychange="onInputChange(event,'cneaeo','onpropertychange')">
-						</td>
-					</tr>
+					</tr> --%>
+					
+					<tr>
+							<td colspan="6">
+							<div class="layui-row">
+								<div class="layui-col-md2">
+									<select id="cne_cusid" required lay-verify="required">
+										<c:if test="${not empty consignee.cusid}">
+											<c:set var="tempCneType" value='${fn:split(consignee.cusid,"+")[0]}' />
+											<option value="${tempCneType}">${tempCneType}</option>
+										</c:if>
+										
+										<c:if test="${empty consignee.cusid}">
+											<option value=""><spring:message code="manifest.enterprise.code.type" /></option>
+										</c:if>
+									</select>
+								</div>
+								<div class="layui-col-md1" style="text-align: center; margin-top: 10px;width:20px;">
+									<span style="color: black; font-size: 16px;">+</span>
+								</div>
+								<div class="layui-col-md5">
+									<input id="cnecusid"  type="text" maxlength="100" class="layui-input" required lay-verify="required"
+										<c:if test="${not empty consignee.cusid}">
+											<c:set var="tempCneValue" value='${fn:split(consignee.cusid,"+")[1]}' />
+											value="${tempCneValue}"
+										</c:if>
+										
+										placeholder="<spring:message code='manifest.enterprise.code' />"
+										oninput="onInputChange(event,'cnecusid','oninput')"
+										onpropertychange="onInputChange(event,'cnecusid','onpropertychange')">
+								</div>
+							</div>
+							</td>
+						</tr>
 				</tbody>
 			</table>
@@ -133,6 +181,74 @@
 	</div>
 	<script>
+	var api = "<%=basePath %>enterprise/search";
+	 $('#country').combogrid({
+			panelWidth:260,
+			url: api,
+			idField:'country_code',
+			textField:'start',
+			mode:'remote',
+			fitColumns:true,
+			onBeforeLoad: function (parm) {  //在请求加载数据之前触发，返回 false 则取消加载动作  
+				var  value = $('#country').combobox('getValue');  
+			     if (value) {  
+			    	 	var upper = value.toUpperCase();
+			    	 	$('#country').combogrid('setValue',upper);
+			        parm.start = upper;
+			        
+			        onGetData('cne_cusid','country');
+			        return true;  
+			       }  
+			     return false;  
+			 },
+			 onSelect: function(row,rowData){    
+				 //当用户选择一个列表项时触发。
+		    	 		$('#country').combogrid('setValue',rowData.country_code);
+		    	 		
+		    	 		onGetData('cne_cusid','country');
+		     },
+			columns:[[
+				{field:'name_cn',title:'名称',width:106},
+				{field:'country_code',title:'代码',width:106}
+			]]
+		});
+	 
+	 function onGetData(selectId,inputId) {
+		 var cneType = "";
+		 var cne_cusid = "${consignee.cusid}";
+		 if(notEmpty(cne_cusid)){
+			 cneType = cne_cusid.split("+")[0];
+		 }
+		 
+		 var select = $("#"+selectId);
+		 select.html("");
+		 select.append("<option value=''><spring:message code='manifest.enterprise.code.type' /></option>");
+		 
+	 	 var countryCode = $('#'+inputId).combobox('getValue');
+	 	
+		 $.ajax({
+				url:"<%=basePath%>/enterprise/list?countryCode="+countryCode,
+				success:function(data){
+					if(data.status == 200){
+						if(data.data){
+							for(var i = 0; i < data.data.length; i++){
+								var type = data.data[i].enterprise_type;
+								if(notEmpty(cneType)&&type&&(type==cneType)){
+									select.append("<option selected value='"+type+"'>"+type+"</option>");
+								}else{
+									select.append("<option value='"+type+"'>"+type+"</option>");
+								}
+								layui.use('form', function() {
+									var form = layui.form;
+									form.render("select");
+								});
+							}
+						}
+					}
+				}
+		});
+	}
+		
 		var layer;
 		layui.use('layer', function() {
 			layer = layui.layer;
@@ -161,6 +277,15 @@
 			if (data.cusid) {
 				params += "&cusid=" + data.cusid;
 			}
+			
+			var cusid_type = getSelectedValue("cne_cusid");
+	       	var cusid = $("#cnecusid").val();
+			
+			if(notEmpty(cusid_type)&&notEmpty(cusid)){
+				cusid = cusid_type+"+"+cusid;
+	       		params+="&cusid="+encodeURIComponent(cusid);
+	       	}
+			
 			if (data.aeo) {
 				params += "&aeo=" + data.aeo;
 			}
--- a/src/main/webapp/WEB-INF/views/consignee/list.jsp
查看文件 @911eae6
+++ b/src/main/webapp/WEB-INF/views/consignee/list.jsp
查看文件 @911eae6
@@ -12,16 +12,23 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <title><spring:message code="menu.consignee_info_set" /></title>
-<script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
-<script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js"></script>
-<script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script>
+<script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js?version=${version}"></script>
 <!-- validate 验证中英文 -->
 <script type="text/javascript"
-	src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js"></script>
-<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
-<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
-<script type="text/javascript" src="<%=basePath%>resource/js/tools.js"></script>
+	src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js?version=${version}"></script>
+<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css?version=${version}" media="all">
+<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/js/tools.js?version=${version}"></script>
+<style type="text/css">
+	.layui-table-cell .layui-form-checkbox[lay-skin="primary"]{
+	     top: 50%;
+	     transform: translateY(-50%);
+	}
+</style>
 </head>
 <body>
 	<div class="layui-collapse">
@@ -51,10 +58,10 @@
 	</div>
 	<script type="text/html" id="opt-bar">
-		<i class="layui-icon layui-icon-edit" style="font-size: 14px; color: #1E9FFF;" lay-event="edit">编辑</i> 
+		<button type="button" class="layui-btn layui-btn-normal layui-btn-sm layui-icon layui-icon-edit" lay-event="edit">编辑</button> 
 	</script>
 	<script type="text/html" id="choose-bar">
-		<i class="layui-icon layui-icon-ok" style="font-size: 15px;font:bold; color: blue;" lay-event="choose">选择</i> 
+		<button type="button"  class="layui-btn layui-btn-sm layui-icon layui-icon-ok" lay-event="choose">选择</button> 
 	</script>
 	<script>
@@ -95,9 +102,7 @@
 					text : {none:'暂无数据'},
 					cols : [ [ //表头
 					{
-						type : 'checkbox',
-						fixed : 'left',
-						width : 60
+						type : 'checkbox'
 					}, {
 						field : '',
 						title : '操作',
@@ -120,6 +125,9 @@
 					}, {
 						field : 'tel',
 						title : '电话'
+					},{
+						field : 'cusid',
+						title : '企业代码'
 					} ] ]
 				});
 			});
--- a/src/main/webapp/WEB-INF/views/consignor/edit.jsp
查看文件 @911eae6
+++ b/src/main/webapp/WEB-INF/views/consignor/edit.jsp
查看文件 @911eae6
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
@@ -13,15 +14,20 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title><spring:message code="menu.consignor_info_set" /></title>
-<script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
-<script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js"></script>
-<script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script>
+<script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js?version=${version}"></script>
 <!-- validate 验证中英文 -->
 <script type="text/javascript"
-	src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js"></script>
-<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
-<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
-<script type="text/javascript" src="<%=basePath%>resource/js/tools.js"></script>
+	src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js?version=${version}"></script>
+<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css?version=${version}" media="all">
+<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/js/tools.js?version=${version}"></script>
+
+<script src="<%=basePath%>resource/easyui/jquery.easyui.min.js?version=${version}"></script>
+<link rel="stylesheet" type="text/css" href="<%=basePath%>resource/easyui/uimaker/icon.css?version=${version}">
+<link rel="stylesheet" href="<%=basePath%>resource/easyui/uimaker/easyui.css?version=${version}">
+
 <style type="text/css">
 	.required_span {
 		color: red;
@@ -52,19 +58,27 @@
 								oninput="onInputChange(event,'co_name','oninput')"
 								onpropertychange="onInputChange(event,'co_name','onpropertychange')"></td>
 						<td><spring:message code="manifest.telephone" /></td>
-						<td><input type="text" name="co_telephone" placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"
+						<td><input type="text" name="co_telephone" id="co_telephone" placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"
+								oninput="onInputChange(event,'co_telephone','oninput')"
+								onpropertychange="onInputChange(event,'co_telephone','onpropertychange')"
 								value="${consignor.co_telephone}" autocomplete="off" class="layui-input" maxlength="50"></td>
 						<td><spring:message code="manifest.fax" /></td>
-						<td><input type="text" name="co_fax" placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>" value="${consignor.co_fax}"
-								autocomplete="off" class="layui-input" maxlength="50"></td>
+						<td><input type="text" name="co_fax" id="co_fax" placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>" value="${consignor.co_fax}"
+								autocomplete="off" class="layui-input" maxlength="50"
+								oninput="onInputChange(event,'co_fax','oninput')"
+								onpropertychange="onInputChange(event,'co_fax','onpropertychange')"></td>
 					</tr>
 					<tr>
 						<td><spring:message code="manifest.country" /><span class="required_span">*</span></td>
-						<td><input required id="co_country" type="text" name="co_country"  value="${consignor.co_country}"
-								autocomplete="off" class="layui-input" maxlength="2" lay-verify="required"
-								oninput="onInputChange(event,'co_country','oninput')"
-								onpropertychange="onInputChange(event,'co_country','onpropertychange')"></td>
+						<td>
+							<input required lay-verify="required" class="layui-input"
+									id="co_country" name="co_country" maxlength="2" type="text"
+									<c:if test="${empty consignor.co_country}">value="CN"</c:if>
+									<c:if test="${not empty consignor.co_country}">value="${consignor.co_country}"</c:if> 
+									oninput="onInputChange(event,'co_country','oninput')"
+									onpropertychange="onInputChange(event,'co_country','onpropertychange')">
+						</td>
 						<td><spring:message code="manifest.city" /></td>
 						<td>
 							<input type="text" name="co_city" id="co_city" value="${consignor.co_city}" 
@@ -73,29 +87,58 @@
 							onpropertychange="onInputChange(event,'co_city','onpropertychange')">
 						</td>
 						<td><spring:message code="manifest.zip.code" /></td>
-						<td><input type="text" name="co_zipcode" value="${consignor.co_zipcode}"
+						<td><input type="text" name="co_zipcode" id="co_zipcode" value="${consignor.co_zipcode}"
+								oninput="onInputChange(event,'co_zipcode','oninput')"
+								onpropertychange="onInputChange(event,'co_zipcode','onpropertychange')"
 								autocomplete="off" class="layui-input" maxlength="9"></td>
 					</tr>
-	
+					
 					<tr>
 						<td><spring:message code="manifest.address" /><span class="required_span">*</span></td>
-						<td colspan="5"><input id="co_address" required type="text" name="co_address" lay-verify="required"
+						<td colspan="2"><input id="co_address" required type="text" name="co_address" lay-verify="required"
 								value="${consignor.co_address}" autocomplete="off" class="layui-input" maxlength="70"
 								oninput="onInputChange(event,'co_address','oninput')"
 								onpropertychange="onInputChange(event,'co_address','onpropertychange')"></td>
-					</tr>
-	
-					<tr>
-						<td><spring:message code="manifest.enterprise.code" /><span class="required_span">*</span></td>
-						<td><input required id="shpcusid" type="text" name="shpcusid" value="${consignor.shpcusid}" lay-verify="required"
-								autocomplete="off" class="layui-input" maxlength="128" oninput="onInputChange(event,'shpcusid','oninput')"
-								onpropertychange="onInputChange(event,'shpcusid','onpropertychange')"></td>
 						<td><spring:message code="manifest.fhr.shpaeo" /></td>
-						<td colspan="3"><input type="text" name="shpaeo" id="shpaeo"
+						<td colspan="2"><input type="text" name="shpaeo" id="shpaeo"
 								value="${consignor.shpaeo}" autocomplete="off" class="layui-input" maxlength="20" 
 								oninput="onInputChange(event,'shpaeo','oninput')"
 								onpropertychange="onInputChange(event,'shpaeo','onpropertychange')"></td>
 					</tr>
+	
+					<tr>
+							<td colspan="6">
+							<div class="layui-row">
+								<div class="layui-col-md2">
+									<select id="co_cusid" required lay-verify="required">
+										<c:if test="${not empty consignor.shpcusid}">
+											<c:set var="tempShpType" value='${fn:split(consignor.shpcusid,"+")[0]}' />
+											<option value="${tempShpType}">${tempShpType}</option>
+										</c:if>
+										
+										<c:if test="${empty consignor.shpcusid}">
+											<option value=""><spring:message code="manifest.enterprise.code.type" /></option>
+										</c:if>
+									</select>
+								</div>
+								<div class="layui-col-md1" style="text-align: center; margin-top: 10px;width:20px;">
+									<span style="color: black; font-size: 16px;">+</span>
+								</div>
+								<div class="layui-col-md5">
+									<input id="shpcusid"  type="text" maxlength="100" class="layui-input" required lay-verify="required"
+										<c:if test="${not empty consignor.shpcusid}">
+											<c:set var="tempShpValue" value='${fn:split(consignor.shpcusid,"+")[1]}' />
+											value="${tempShpValue}"
+										</c:if>
+										
+										placeholder="<spring:message code='manifest.enterprise.code' />"
+										oninput="onInputChange(event,'shpcusid','oninput')"
+										onpropertychange="onInputChange(event,'shpcusid','onpropertychange')">
+								</div>
+							</div>
+							</td>
+						</tr>
+						
 				</tbody>
 			</table>
@@ -110,14 +153,79 @@
 	</div>
 	<script>
+	 var api = "<%=basePath %>enterprise/search";
+	 $('#co_country').combogrid({
+			panelWidth:260,
+			url: api,
+			idField:'country_code',
+			textField:'start',
+			mode:'remote',
+			fitColumns:true,
+			onBeforeLoad: function (parm) {  //在请求加载数据之前触发，返回 false 则取消加载动作  
+				var  value = $('#co_country').combobox('getValue');  
+			     if (value) {  
+			    	 	var upper = value.toUpperCase();
+			    	 	$('#co_country').combogrid('setValue',upper);
+			        parm.start = upper;
+			        
+			        onGetData('co_cusid','co_country');
+			        return true;  
+			       }  
+			     return false;  
+			 },
+			 onSelect: function(row,rowData){    
+				 //当用户选择一个列表项时触发。
+		    	 		$('#co_country').combogrid('setValue',rowData.country_code);
+		    	 		
+		    	 		onGetData('co_cusid','co_country');
+		     },
+			columns:[[
+				{field:'name_cn',title:'名称',width:106},
+				{field:'country_code',title:'代码',width:106}
+			]]
+		});
+	 
+	 function onGetData(selectId,inputId) {
+		 var shpType = "";
+		 var shp_cusid = "${consignor.shpcusid}";
+		 if(notEmpty(shp_cusid)){
+			 shpType = shp_cusid.split("+")[0];
+		 }
+		 
+		 var select = $("#"+selectId);
+		 select.html("");
+		 select.append("<option value=''><spring:message code='manifest.enterprise.code.type' /></option>");
+		 
+ 	 	 var countryCode = $('#'+inputId).combobox('getValue');
+ 	 	
+		 $.ajax({
+				url:"<%=basePath%>/enterprise/list?countryCode="+countryCode,
+				success:function(data){
+					if(data.status == 200){
+						if(data.data){
+							for(var i = 0; i < data.data.length; i++){
+								var type = data.data[i].enterprise_type;
+								if(notEmpty(shpType)&&type&&(type==shpType)){
+									select.append("<option selected value='"+type+"'>"+type+"</option>");
+								}else{
+									select.append("<option value='"+type+"'>"+type+"</option>");
+								}
+								layui.use('form', function() {
+									var form = layui.form;
+									form.render("select");
+								});
+							}
+						}
+					}
+				}
+		});
+	}
+	
 		var layer;
 		layui.use('layer', function() {
 			layer = layui.layer;
 		});
-		$(window).load(function() {
-		});
-		
 		layui.use('form', function() {
 			var form = layui.form;
@@ -128,7 +236,6 @@
 					layer.msg("电话和传真必须填写一项!");
 					return false;
 				}
-				
 			    save(data.field);
 			    return false;
 			});
@@ -142,9 +249,15 @@
 			if (data.id) {
 				params += "&id=" + data.id;
 			}
-			if (data.shpcusid) {
-				params += "&shpcusid=" + data.shpcusid;
-			}
+			
+			var shp_cusid_type = getSelectedValue("co_cusid");
+	       	var sh_cusid = $("#shpcusid").val();
+			
+			if(notEmpty(shp_cusid_type)&&notEmpty(sh_cusid)){
+	       		shpcusid = shp_cusid_type+"+"+sh_cusid;
+	       		params+="&shpcusid="+encodeURIComponent(shpcusid);
+	       	}
+			
 			if (data.shpaeo) {
 				params += "&shpaeo=" + data.shpaeo;
 			}
--- a/src/main/webapp/WEB-INF/views/consignor/list.jsp
查看文件 @911eae6
+++ b/src/main/webapp/WEB-INF/views/consignor/list.jsp
查看文件 @911eae6
@@ -12,6 +12,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <title><spring:message code="menu.consignor_info_set" /></title>
 <script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
 <script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js"></script>
@@ -23,6 +24,14 @@
 <script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
 <script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
 <script type="text/javascript" src="<%=basePath%>resource/js/tools.js"></script>
+
+<style type="text/css">
+	.layui-table-cell .layui-form-checkbox[lay-skin="primary"]{
+	     top: 50%;
+	     transform: translateY(-50%);
+	}
+</style>
+
 </head>
 <body>
 	<input type="hidden" id="mainIframeName" name="mainIframeName" value="${parentName}">
@@ -53,11 +62,11 @@
 	</div>
 	<script type="text/html" id="opt-bar">
-		<i class="layui-icon layui-icon-edit" style="font-size: 14px; color: #1E9FFF;" lay-event="edit">编辑</i> 
+		<button type="button" class="layui-btn layui-btn-normal layui-btn-sm layui-icon layui-icon-edit" lay-event="edit">编辑</button> 
 	</script>
 	<script type="text/html" id="choose-bar">
-		<i class="layui-icon layui-icon-ok" style="font-size: 15px;font:bold; color: blue;" lay-event="choose">选择</i> 
+		<button type="button"  class="layui-btn layui-btn-sm layui-icon layui-icon-ok" lay-event="choose">选择</button>
 	</script>
 	<script>
@@ -98,9 +107,7 @@
 					text : {none:'暂无数据'},
 					cols : [ [ //表头
 					{
-						type : 'checkbox',
-						fixed : 'left',
-						width : 60
+						type : 'checkbox'
 					}, {
 						field : '',
 						title : '操作',
@@ -123,6 +130,9 @@
 					}, {
 						field : 'co_telephone',
 						title : '电话'
+					},{
+						field : 'shpcusid',
+						title : '企业代码'
 					} ] ]
 				});
 			});
--- a/src/main/webapp/WEB-INF/views/manifest/edit.jsp
查看文件 @911eae6
+++ b/src/main/webapp/WEB-INF/views/manifest/edit.jsp
查看文件 @911eae6
@@ -14,18 +14,18 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link href="<%=basePath%>resource/css/base.css?ver=1.0" rel="stylesheet">
+<link href="<%=basePath%>resource/css/base.css?version=${version}" rel="stylesheet">
 <link href="<%=basePath%>resource/css/basic_info.css" rel="stylesheet">
-<link rel="stylesheet" type="text/css" href="<%=basePath%>resource/easyui/uimaker/icon.css">
-<link rel="stylesheet" href="<%=basePath%>resource/easyui/uimaker/easyui.css">
-<link rel="stylesheet" href="<%=basePath%>resource/css/form.css">
-<script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
-<script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js"></script>
-<script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script>
+<link rel="stylesheet" type="text/css" href="<%=basePath%>resource/easyui/uimaker/icon.css?version=${version}">
+<link rel="stylesheet" href="<%=basePath%>resource/easyui/uimaker/easyui.css?version=${version}">
+<link rel="stylesheet" href="<%=basePath%>resource/css/form.css?version=${version}">
+<script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js?version=${version}"></script>
-<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
-<script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
-<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
+<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css?version=${version}" media="all">
+<script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js?version=${version}"></script>
 <style type="text/css">
 .required_span {
@@ -95,7 +95,8 @@
 								class="required_span">*</span></td>
 							<td class="kv-content"><input required id="flightno" name="flightno" type="text" 
 									placeholder="<spring:message code='manifest.carrier.flightno.tip'/>"
-									value="${manifest.carrier}${manifest.flightno}" oninput="onInputChange(event,'flightno','oninput')"
+									value="${manifest.carrier}${manifest.flightno}" 
+									oninput="onInputChange(event,'flightno','oninput')"
 									onpropertychange="onInputChange(event,'flightno','onpropertychange')"
 									autocomplete="off"></td>
@@ -158,7 +159,6 @@
 							<td class="kv-label"><spring:message code="manifest.payment.method" /><span
 								class="required_span">*</span></td>
 							<td class="kv-content"><select required id="paymode" name="paymode">
-									<%-- <option value=""><spring:message code="opt.select"/></option> --%>
 									<option value="PP" <c:if test = "${manifest.paymode == 'PP' }">selected="selected"</c:if>><spring:message
 											code="manifest.prepaid" /></option>
 									<option value="CC" <c:if test = "${manifest.paymode == 'CC' }">selected="selected"</c:if>><spring:message
@@ -173,7 +173,6 @@
 							<td class="kv-label"><spring:message code="manifest.customs.status" /><span
 								class="required_span">*</span></td>
 							<td class="kv-content" colspan="3"><select id="customsstatus" name="customsstatus" required>
-									<%-- <option value=""><spring:message code="opt.select" /></option> --%>
 									<option value="001"
 										<c:if test="${manifest.customsstatus == 001 }">selected="selected"</c:if>><spring:message
 											code="manifest.customs_status_001" /></option>
@@ -224,67 +223,6 @@
 							<td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="1"><spring:message
 									code="manifest.shipper.information" /></td>
 							<td class="kv-label"> <button type="button" class="layui-btn layui-btn-sm layui-icon layui-icon-user" onclick="showConsignorDialog()">请选择发货人</button> </td>
-							<%-- <td class="kv-content" colspan="4"><select onchange="changeConsignorSelect()"
-									id="fh_select">
-									<option value="-1">请选择</option>
-								</select> <script>
-                			var consignorList = null;
-                			function changeConsignorSelect(){
-                				if(consignorList != null)
-                				{
-                					var index = parseInt($("#fh_select").find("option:selected").val());
-                					if(index >= 0)
-                					{
-                						var consignor = consignorList[index];
-                						$("#co_company").val(consignor.co_company?consignor.co_company.toUpperCase():"");
-                						var address = consignor.co_address;
-                						if(notEmpty(address)){
-                							if(address.length>70){
-                								address = address.substring(0,70);
-                							}
-                						}else{
-                							address = "";
-                						}
-                						$("#co_address").val(address.toUpperCase());
-                						$("#co_telephone").val(consignor.co_telephone?consignor.co_telephone:"");
-                						$("#co_country").val(consignor.co_country?consignor.co_country:"CN");
-                						$("#co_city").val(consignor.co_city?consignor.co_city.toUpperCase():"");
-                						$("#co_deltaname").val(consignor.co_deltaname?consignor.co_deltaname.toUpperCase():"");
-                						$("#co_name").val(consignor.co_name?consignor.co_name.toUpperCase():"");
-                						$("#co_fax").val(consignor.co_fax?consignor.co_fax:"");
-                						$("#co_zipcode").val(consignor.co_zipcode?consignor.co_zipcode:"");
-                						$("#shpaeo").val(consignor.shpaeo?consignor.shpaeo:"");
-                						
-                						if(notEmpty(consignor.shpcusid)){
-                							var temp = consignor.shpcusid.split("+")[1];
-                							if(notEmpty(temp)){
-                								$("#shpcusid").val(temp.toUpperCase());
-                							}
-                						}
-                						
-                					}
-                				}
-                			}
-                			
-                			$.ajax({
-                				url:"<%=basePath%>/consignor/getall",
-                				success:function(data){
-                					if(data.status == 200)
-                					{
-                						if(data.data)
-                						{
-                							consignorList = data.data;
-                							for(var i = 0; i < data.data.length; i ++)
-                							{
-                								var select = $("#fh_select");
-                								select.append("<option value='"+i+"'>"+data.data[i].co_company+"</option>");
-                							}
-                						}
-                					}
-                				}
-                			});
-                		</script>
-                		</td> --%>
 						</tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.company" /><span
@@ -310,7 +248,9 @@
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.state" /></td>
 							<td class="kv-content"><input id="co_deltaname" name="co_deltaname" type="text" maxlength="35"
-									value="${manifest.co_deltaname}"></td>
+									value="${manifest.co_deltaname}"
+									oninput="onInputChange(event,'co_deltaname','oninput')"
+									onpropertychange="onInputChange(event,'co_deltaname','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.zip.code" /></td>
 							<td class="kv-content" colspan="3"><input id="co_zipcode" name="co_zipcode" type="text" maxlength="9"
 									value="${manifest.co_zipcode }"></td>
@@ -319,10 +259,14 @@
 							<td class="kv-label"><spring:message code="manifest.telephone" /></td>
 							<td class="kv-content"><input id="co_telephone" name="co_telephone" type="text" maxlength="50"
 									value="${manifest.co_telephone }"
+									oninput="onInputChange(event,'co_telephone','oninput')"
+									onpropertychange="onInputChange(event,'co_telephone','onpropertychange')"
 									placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
 							<td class="kv-label"><spring:message code="manifest.fax" /></td>
 							<td class="kv-content"><input id="co_fax" name="co_fax" type="text" maxlength="50"
 									value="${manifest.co_fax }"
+									oninput="onInputChange(event,'co_fax','oninput')"
+									onpropertychange="onInputChange(event,'co_fax','onpropertychange')"
 									placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
 							<td class="kv-label"><spring:message code="manifest.fhr.shpaeo" /></td>
 							<td class="kv-content"><input id="shpaeo" name="shpaeo" type="text" maxlength="20"
@@ -367,55 +311,6 @@
 							<td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="1"><spring:message
 									code="manifest.consignee" /></td>
 							<td class="kv-label"> <button type="button" class="layui-btn layui-btn-sm layui-icon layui-icon-user" onclick="showConsigneeDialog()">请选择收货人</button> </td>
-							<%-- <td class="kv-content" colspan="5"><select onchange="changeConsigneeSelect()"
-									id="consignee_select">
-									<option value="-1">请选择</option>
-								</select> <script>
-                			var consigneeList = null;
-                			function changeConsigneeSelect(){
-                				if(consigneeList != null)
-                				{
-                					var index = parseInt($("#consignee_select").find("option:selected").val());
-                					if(index >= 0)
-                					{	
-                						var consignee = consigneeList[index];
-                						$("#sh_company").val(consignee.code?consignee.code:"");
-                						
-                						var address = consignee.address;
-                						if(notEmpty(address)){
-                							if(address.length>70){
-                								address = address.substring(0,70);
-                							}
-                						}else{
-                							address = "";
-                						}
-                						
-                						$("#sh_address").val(address.toUpperCase());
-                						$("#sh_telephone").val(consignee.tel?consignee.tel:"");
-                						$("#sh_country").val(consignee.name?consignee.name:"");
-                						$("#sh_name").val(consignee.code?consignee.code:"");
-                					}
-                				}
-                			}
-                			$.ajax({
-                				url:"<%=basePath%>/consignee/getall",
-                				success:function(data){
-                					if(data.status == 200)
-                					{
-                						if(data.data)
-                						{
-                							consigneeList = data.data;
-                							for(var i = 0; i < data.data.length; i ++)
-                							{
-                								var select = $("#consignee_select");
-                								select.append("<option value='"+i+"'>"+consigneeList[i].code+"</option>");
-                								
-                							}
-                						}
-                					}
-                				}
-                			});
-                		</script></td> --%>
 						</tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.company" /><span
@@ -432,7 +327,7 @@
 							<td class="kv-label"><spring:message code="manifest.country" /><span
 								class="required_span">*</span></td>
 							<td class="kv-content"><input required id="sh_country" name="sh_country" maxlength="2"
-									type="text" value="${manifest.sh_country }"
+									type="text" value="${manifest.sh_country}" class="layui-input"
 									oninput="onInputChange(event,'sh_country','oninput')"
 									onpropertychange="onInputChange(event,'sh_country','onpropertychange')"></td>
 						</tr>
@@ -443,10 +338,16 @@
 									onpropertychange="onInputChange(event,'sh_city','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.state" /></td>
 							<td class="kv-content"><input id="sh_deltaname" name="sh_deltaname" type="text" maxlength="35"
-									value="${manifest.sh_deltaname}"></td>
+									value="${manifest.sh_deltaname}"
+									oninput="onInputChange(event,'sh_deltaname','oninput')"
+									onpropertychange="onInputChange(event,'sh_deltaname','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.zip.code" /></td>
-							<td class="kv-content"><input id="sh_zipcode" name="sh_zipcode" type="text" maxlength="9"
-									value="${manifest.sh_zipcode }"></td>
+							<td class="kv-content">
+								<input id="sh_zipcode" name="sh_zipcode" type="text" 
+									maxlength="9"value="${manifest.sh_zipcode }"
+									oninput="onInputChange(event,'sh_zipcode','oninput')"
+									onpropertychange="onInputChange(event,'sh_zipcode','onpropertychange')" >
+							</td>
 						</tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.telephone" /></td>
@@ -454,7 +355,9 @@
 									value="${manifest.sh_telephone }"></td>
 							<td class="kv-label"><spring:message code="manifest.fax" /></td>
 							<td class="kv-content"><input id="sh_fax" name="sh_fax" type="text" maxlength="50"
-									value="${manifest.sh_fax }"></td>
+									value="${manifest.sh_fax }"
+									oninput="onInputChange(event,'sh_fax','oninput')"
+									onpropertychange="onInputChange(event,'sh_fax','onpropertychange')" ></td>
 							<td class="kv-label"><spring:message code="manifest.shr.cneaeo" /></td>
 							<td class="kv-content"><input id="cneaeo" name="cneaeo" type="text" maxlength="20"
 									value="${manifest.cneaeo }" oninput="onInputChange(event,'cneaeo','oninput')"
@@ -659,8 +562,8 @@
 	</div>
 	<!-- 外部js -->
-	<script type="text/javascript" src="<%=basePath%>resource/My97DatePicker/WdatePicker.js"></script>
-	<script src="<%=basePath%>resource/easyui/jquery.easyui.min.js"></script>
+	<script type="text/javascript" src="<%=basePath%>resource/My97DatePicker/WdatePicker.js?version=${version}"></script>
+	<script src="<%=basePath%>resource/easyui/jquery.easyui.min.js?version=${version}"></script>
 	<script src="<%=basePath%>/resource/js/tools.js?version=${version}"></script>
 	<!--弹出层引入的JS-->
 	<script type="text/javascript">
@@ -1027,7 +930,8 @@ $(function(){
 				}
 				$("#co_address").val(address.toUpperCase());
 				$("#co_telephone").val(consignor.co_telephone?consignor.co_telephone:"");
-				$("#co_country").val(consignor.co_country?consignor.co_country:"CN");
+				var country = consignor.co_country?consignor.co_country:"CN";
+				$('#co_country').combogrid('setValue',country);
 				$("#co_city").val(consignor.co_city?consignor.co_city.toUpperCase():"");
 				$("#co_deltaname").val(consignor.co_deltaname?consignor.co_deltaname.toUpperCase():"");
 				$("#co_name").val(consignor.co_name?consignor.co_name.toUpperCase():"");
@@ -1038,6 +942,12 @@ $(function(){
 				if(notEmpty(consignor.shpcusid)){
 					var temp_1 = consignor.shpcusid.split("+")[0];
 					var temp_2 = consignor.shpcusid.split("+")[1];
+					if(notEmpty(temp_1)){
+						var select = $("#co_cusid");
+						select.html("");
+						select.append("<option value='"+temp_1.toUpperCase()+"'>"+temp_1.toUpperCase()+"</option>");
+					}
+					
 					if(notEmpty(temp_2)){
 						$("#shpcusid").val(temp_2.toUpperCase());
 					}
@@ -1074,7 +984,8 @@ $(function(){
 		$("#sh_address").val(address.toUpperCase());
 		$("#sh_company").val(consignee.name?consignee.name:"");
 		$("#sh_telephone").val(consignee.tel?consignee.tel:"");
-		$("#sh_country").val(consignee.name?consignee.name:"");
+		var country = consignee.country?consignee.country:"";
+		$('#sh_country').combogrid('setValue',country);
 		$("#sh_name").val(consignee.code?consignee.code:"");
 		$("#sh_city").val(consignee.city?consignee.city.toUpperCase():"");
 		$("#sh_fax").val(consignee.fax?consignee.fax:"");
@@ -1084,6 +995,13 @@ $(function(){
 		if(notEmpty(consignee.cusid)){
 			var temp_1 = consignee.cusid.split("+")[0];
 			var temp_2 = consignee.cusid.split("+")[1];
+			
+			if(notEmpty(temp_1)){
+				var select = $("#sh_cusid");
+				select.html("");
+				select.append("<option value='"+temp_1.toUpperCase()+"'>"+temp_1.toUpperCase()+"</option>");
+			}
+			
 			if(notEmpty(temp_2)){
 				$("#cnecusid").val(temp_2.toUpperCase());
 			}
--- a/src/main/webapp/WEB-INF/views/manifest/sub_edit.jsp
查看文件 @911eae6
+++ b/src/main/webapp/WEB-INF/views/manifest/sub_edit.jsp
查看文件 @911eae6
@@ -13,18 +13,18 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link href="<%=basePath%>resource/css/base.css?ver=1.0" rel="stylesheet">
+<link href="<%=basePath%>resource/css/base.css?version=${version}" rel="stylesheet">
 <link href="<%=basePath%>resource/css/basic_info.css" rel="stylesheet">
-<link rel="stylesheet" href="<%=basePath%>resource/easyui/uimaker/easyui.css">
+<link rel="stylesheet" href="<%=basePath%>resource/easyui/uimaker/easyui.css?version=${version}">
 <link href="<%=basePath%>resource/css/form.css" rel="stylesheet">
-<script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
-<script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js"></script>
-<script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script>
-<link rel="stylesheet" href="<%=basePath%>resource/css/form.css">
+<script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js?version=${version}"></script>
+<link rel="stylesheet" href="<%=basePath%>resource/css/form.css?version=${version}">
-<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
-<script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
-<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
+<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css?version=${version}" media="all">
+<script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js?version=${version}"></script>
 <style type="text/css">
 .required_span {
@@ -35,7 +35,7 @@
 </style>
 <!-- validate 验证中英文 -->
 <script type="text/javascript"
-	src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js"></script>
+	src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js?version=${version}"></script>
 </head>
 <body>
 	<div class="container">
@@ -216,66 +216,6 @@
 							<td style="background-color: #EBEDF4; color: black;" class="kv-label"><spring:message
 									code="manifest.shipper.information" /></td>
 							<td class="kv-label"> <button type="button" class="layui-btn layui-btn-sm layui-icon layui-icon-user" onclick="showConsignorDialog()">请选择发货人</button> </td>
-							<%-- <td class="kv-content" colspan="5"><select onchange="changeConsignorSelect()"
-									id="fh_select">
-									<option value="-1">请选择</option>
-								</select> <script>
-                			var consignorList = null;
-                			function changeConsignorSelect(){
-                				if(consignorList != null)
-                				{
-                					var index = parseInt($("#fh_select").find("option:selected").val());
-                					if(index >= 0)
-                					{
-                						var consignor = consignorList[index];
-                						$("#co_company").val(consignor.co_company?consignor.co_company.toUpperCase():"");
-                						var address = consignor.co_address;
-                						if(notEmpty(address)){
-                							if(address.length>70){
-                								address = address.substring(0,70);
-                							}
-                						}else{
-                							address = "";
-                						}
-                						$("#co_address").val(address.toUpperCase());
-                						$("#co_telephone").val(consignor.co_telephone?consignor.co_telephone:"");
-                						$("#co_country").val(consignor.co_country?consignor.co_country:"CN");
-                						$("#co_city").val(consignor.co_city?consignor.co_city:"");
-                						$("#co_deltaname").val(consignor.co_deltaname?consignor.co_deltaname:"");
-                						$("#co_name").val(consignor.co_name?consignor.co_name:"");
-                						$("#co_fax").val(consignor.co_fax?consignor.co_fax:"");
-                						$("#co_zipcode").val(consignor.co_zipcode?consignor.co_zipcode:"");
-                						$("#shpaeo").val(consignor.shpaeo?consignor.shpaeo:"");
-                						
-                						if(notEmpty(consignor.shpcusid)){
-                							var temp = consignor.shpcusid.split("+")[1];
-                							if(notEmpty(temp)){
-                								$("#shpcusid").val(temp.toUpperCase());
-                							}
-                						}
-                					}
-                				}
-                			}
-                			
-                			$.ajax({
-                				url:"<%=basePath%>/consignor/getall",
-                				success:function(data){
-                					if(data.status == 200)
-                					{
-                						if(data.data)
-                						{
-                							consignorList = data.data;
-                							for(var i = 0; i < data.data.length; i ++)
-                							{
-                								var select = $("#fh_select");
-                								select.append("<option value='"+i+"'>"+consignorList[i].co_company+"</option>");
-                								
-                							}
-                						}
-                					}
-                				}
-                			});
-                		</script></td> --%>
 						</tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.company" /><span
@@ -301,18 +241,26 @@
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.state" /></td>
 							<td class="kv-content"><input id="co_deltaname" name="co_deltaname" type="text" maxlength="35"
-									value="${pre.co_deltaname  }"></td>
+									value="${pre.co_deltaname  }"
+									oninput="onInputChange(event,'co_deltaname','oninput')"
+									onpropertychange="onInputChange(event,'co_deltaname','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.zip.code" /></td>
 							<td class="kv-content" colspan="3"><input id="co_zipcode" name="co_zipcode" type="text" maxlength="9"
-									value="${pre.co_zipcode }"></td>
+									value="${pre.co_zipcode }"
+									oninput="onInputChange(event,'co_zipcode','oninput')"
+									onpropertychange="onInputChange(event,'co_zipcode','onpropertychange')"></td>
 						</tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.telephone" /></td>
 							<td class="kv-content"><input id="co_telephone" name="co_telephone" type="text" maxlength="50"
 									value="${pre.co_telephone }"
+									oninput="onInputChange(event,'co_telephone','oninput')"
+									onpropertychange="onInputChange(event,'co_telephone','onpropertychange')"
 									placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
 							<td class="kv-label"><spring:message code="manifest.fax" /></td>
 							<td class="kv-content"><input id="co_fax" name="co_fax" type="text" maxlength="50"
+									oninput="onInputChange(event,'co_fax','oninput')"
+									onpropertychange="onInputChange(event,'co_fax','onpropertychange')"
 									value="${pre.co_fax }" placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
 							<td style="display: none;" class="kv-label"><spring:message code="manifest.name" /><span
 								class="required_span">*</span></td>
@@ -349,45 +297,6 @@
 							<td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="1"><spring:message
 									code="manifest.consignee" /></td>
 							<td class="kv-label"> <button type="button" class="layui-btn layui-btn-sm layui-icon layui-icon-user" onclick="showConsigneeDialog()">请选择收货人</button> </td>
-							<%-- <td class="kv-content" colspan="5"><select onchange="changeConsigneeSelect()"
-									id="consignee_select">
-									<option value="-1">请选择</option>
-								</select> <script>
-                			var consigneeList = null;
-                			function changeConsigneeSelect(){
-                				if(consigneeList != null)
-                				{
-                					var index = parseInt($("#consignee_select").find("option:selected").val());
-                					if(index >= 0)
-                					{
-                						var consignee = consigneeList[index];
-                						$("#sh_company").val(consignee.code?consignee.code.toUpperCase():"");
-                						$("#sh_address").val(consignee.address?consignee.address.toUpperCase():"");
-                						$("#sh_telephone").val(consignee.tel?consignee.tel:"");
-                						$("#sh_country").val(consignee.name?consignee.name:"");
-                						$("#sh_name").val(consignee.code?consignee.code.toUpperCase():"");
-                					}
-                				}
-                			}
-                			$.ajax({
-                				url:"<%=basePath%>/consignee/getall",
-                				success:function(data){
-                					if(data.status == 200)
-                					{
-                						if(data.data)
-                						{
-                							consigneeList = data.data;
-                							for(var i = 0; i < data.data.length; i ++)
-                							{
-                								var select = $("#consignee_select");
-                								select.append("<option value='"+i+"'>"+consigneeList[i].code+"</option>");
-                								
-                							}
-                						}
-                					}
-                				}
-                			});
-                		</script></td> --%>
 						</tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.company" /><span
@@ -403,7 +312,9 @@
 									onpropertychange="onInputChange(event,'sh_address','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.zip.code" /></td>
 							<td class="kv-content"><input id="sh_zipcode" name="sh_zipcode" type="text" maxlength="9"
-									value="${pre.sh_zipcode }"></td>
+									value="${pre.sh_zipcode }"
+									oninput="onInputChange(event,'sh_zipcode','oninput')"
+									onpropertychange="onInputChange(event,'sh_zipcode','onpropertychange')"></td>
 						</tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.city" /><span class="required_span">*</span></td>
@@ -423,10 +334,14 @@
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.telephone" /></td>
 							<td class="kv-content"><input id="sh_telephone" name="sh_telephone" type="text" maxlength="50"
-									value="${pre.sh_telephone }"></td>
+									value="${pre.sh_telephone }"
+									oninput="onInputChange(event,'sh_telephone','oninput')"
+									onpropertychange="onInputChange(event,'sh_telephone','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.fax" /></td>
 							<td class="kv-content"><input id="sh_fax" name="sh_fax" type="text" maxlength="50"
-									value="${pre.sh_fax }"></td>
+									value="${pre.sh_fax }"
+									oninput="onInputChange(event,'sh_fax','oninput')"
+									onpropertychange="onInputChange(event,'sh_fax','onpropertychange')"></td>
 							<td style="display: none;" class="kv-label"><spring:message code="manifest.name" /></td>
 							<td style="display: none;" class="kv-content" colspan="5"><input id="sh_name"
 									name="sh_name" type="text" value="${pre.sh_name }"></td>
@@ -610,8 +525,8 @@
 			</form>
 		</div>
 	</div>
-	<script src="<%=basePath%>resource/easyui/jquery.easyui.min.js"></script>
-	<script src="<%=basePath%>resource/My97DatePicker/WdatePicker.js"></script>
+	<script src="<%=basePath%>resource/easyui/jquery.easyui.min.js?version=${version}"></script>
+	<script src="<%=basePath%>resource/My97DatePicker/WdatePicker.js?version=${version}"></script>
 	<script src="<%=basePath%>resource/js/tools.js?version=${version}"></script>
 	<script type="text/javascript">
@@ -1068,7 +983,10 @@
 					}
 					$("#co_address").val(address.toUpperCase());
 					$("#co_telephone").val(consignor.co_telephone?consignor.co_telephone:"");
-					$("#co_country").val(consignor.co_country?consignor.co_country:"CN");
+					
+					var country = consignor.co_country?consignor.co_country:"CN";
+					$('#co_country').combogrid('setValue',country);
+					
 					$("#co_city").val(consignor.co_city?consignor.co_city.toUpperCase():"");
 					$("#co_deltaname").val(consignor.co_deltaname?consignor.co_deltaname.toUpperCase():"");
 					$("#co_name").val(consignor.co_name?consignor.co_name.toUpperCase():"");
@@ -1079,6 +997,12 @@
 					if(notEmpty(consignor.shpcusid)){
 						var temp_1 = consignor.shpcusid.split("+")[0];
 						var temp_2 = consignor.shpcusid.split("+")[1];
+						if(notEmpty(temp_1)){
+							var select = $("#co_cusid");
+							select.html("");
+							select.append("<option value='"+temp_1.toUpperCase()+"'>"+temp_1.toUpperCase()+"</option>");
+						}
+						
 						if(notEmpty(temp_2)){
 							$("#shpcusid").val(temp_2.toUpperCase());
 						}
@@ -1115,7 +1039,10 @@
 			$("#sh_address").val(address.toUpperCase());
 			$("#sh_company").val(consignee.name?consignee.name:"");
 			$("#sh_telephone").val(consignee.tel?consignee.tel:"");
-			$("#sh_country").val(consignee.name?consignee.name:"");
+			
+			var country = consignee.country?consignee.country:"";
+			$('#sh_country').combogrid('setValue',country);
+			
 			$("#sh_name").val(consignee.code?consignee.code:"");
 			$("#sh_city").val(consignee.city?consignee.city.toUpperCase():"");
 			$("#sh_fax").val(consignee.fax?consignee.fax:"");
@@ -1125,6 +1052,13 @@
 			if(notEmpty(consignee.cusid)){
 				var temp_1 = consignee.cusid.split("+")[0];
 				var temp_2 = consignee.cusid.split("+")[1];
+				
+				if(notEmpty(temp_1)){
+					var select = $("#sh_cusid");
+					select.html("");
+					select.append("<option value='"+temp_1.toUpperCase()+"'>"+temp_1.toUpperCase()+"</option>");
+				}
+				
 				if(notEmpty(temp_2)){
 					$("#cnecusid").val(temp_2.toUpperCase());
 				}