diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysAreaEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysAreaEntity.java
index e823101..9f0228f 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysAreaEntity.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysAreaEntity.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 
 
@@ -15,6 +16,7 @@ import com.baomidou.mybatisplus.annotations.TableName;
 public class SysAreaEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	@TableId
 	private String areaCode;
 	private String areaName;
 	private String areaType;
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java
index 8e3a975..5c4cc54 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java
@@ -5,6 +5,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotations.KeySequence;
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 
@@ -38,6 +39,9 @@ public class SysCompanyEntity implements Serializable {
 	private String updateBy;
 	private Date updateDate;
 	private String viewCode;
+	
+	@TableField(exist=false)
+	private String treeAreaNames;
 
 	public SysCompanyEntity() {
 	}
@@ -206,4 +210,12 @@ public class SysCompanyEntity implements Serializable {
 		this.companyCode = companyCode;
 	}
 
+	public String getTreeAreaNames() {
+		return treeAreaNames;
+	}
+
+	public void setTreeAreaNames(String treeAreaNames) {
+		this.treeAreaNames = treeAreaNames;
+	}
+
 }
\ No newline at end of file
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysCompanyService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysCompanyService.java
index 247e35c..c6a8664 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysCompanyService.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysCompanyService.java
@@ -20,4 +20,7 @@ public interface ISysCompanyService extends IService<SysCompanyEntity>{
 
 	/** 新建公司*/
 	void save(SysCompanyEntity company);
+
+	/** 修改公司*/
+	void update(SysCompanyEntity company);
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java
index dcede2b..064aca0 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java
@@ -100,5 +100,44 @@ public class SysCompanyServiceImpl extends ServiceImpl<SysCompanyMapper, SysComp
 		}
 		sysCompanyMapper.insert(company);
 	}
+
+	@Transactional(readOnly=false)
+	@Override
+	public void update(SysCompanyEntity company) {
+		SysCompanyEntity entity = sysCompanyMapper.selectByCode(company.getCompanyCode());
+		entity.setUpdateBy(ShiroUtils.getUserCode());
+		entity.setUpdateDate(new Date());
+		entity.setAreaCode(company.getAreaCode());
+		entity.setCompanyCode(company.getCompanyCode());
+		entity.setCompanyName(company.getCompanyName());
+		entity.setCorpCode(company.getCorpCode());
+		entity.setCorpName(company.getCorpName());
+		entity.setFullName(company.getFullName());
+		if(StringUtils.isEmpty(company.getParentCode())) {
+			entity.setParentCode("0");
+			entity.setParentCodes("0,");
+			entity.setTreeSorts(company.getTreeSort());
+			entity.setTreeNames(company.getCompanyCode() + ",");
+			entity.setTreeLeaf(true);
+			entity.setTreeLevel(new BigDecimal(0));
+		}else {
+			SysCompanyEntity condition = new SysCompanyEntity();
+			condition.setCompanyCode(company.getParentCode());
+			SysCompanyEntity parentCompany = sysCompanyMapper.selectOne(condition);
+			
+			entity.setTreeLeaf(true);
+			entity.setTreeLevel(parentCompany.getTreeLevel().add(new BigDecimal(1)));
+			entity.setParentCodes(parentCompany.getParentCodes() + parentCompany.getCompanyCode() + ",");
+			entity.setTreeSorts(parentCompany.getTreeSorts() + parentCompany.getTreeSort() + ",");
+			entity.setTreeNames(parentCompany.getTreeNames() + parentCompany.getCompanyName() + ",");
+
+			// 更新
+			parentCompany.setTreeLeaf(false);
+			parentCompany.setUpdateBy(ShiroUtils.getUserCode());
+			parentCompany.setUpdateDate(new Date());
+			sysCompanyMapper.updateById(parentCompany);
+		}
+		sysCompanyMapper.updateById(entity);
+	}
 	
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CompanyController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CompanyController.java
index e70967b..75ce1e0 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CompanyController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CompanyController.java
@@ -6,12 +6,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.alibaba.fastjson.JSONArray;
+import com.tamguo.modules.sys.model.SysAreaEntity;
 import com.tamguo.modules.sys.model.SysCompanyEntity;
 import com.tamguo.modules.sys.model.condition.SysCompanyCondition;
+import com.tamguo.modules.sys.service.ISysAreaService;
 import com.tamguo.modules.sys.service.ISysCompanyService;
 import com.tamguo.modules.sys.utils.ExceptionSupport;
 import com.tamguo.modules.sys.utils.Result;
@@ -22,9 +25,12 @@ public class CompanyController {
 	
 	private final String COMPANY_INDEX_PAGE = "modules/sys/company/index";
 	private final String COMPANY_DETAIL_PAGE = "modules/sys/company/add";
+	private final String COMPANY_UPDATE_PAGE = "modules/sys/company/update";
 
 	@Autowired
 	ISysCompanyService iSysCompanyService;
+	@Autowired
+	ISysAreaService iSysAreaService;
 	
 	@RequestMapping(path="index")
 	public String index(ModelAndView model) {
@@ -38,6 +44,18 @@ public class CompanyController {
 		return model;
 	}
 	
+	@RequestMapping(path="update")
+	public ModelAndView update(String companyCode , ModelAndView model) {
+		model.setViewName(COMPANY_UPDATE_PAGE);
+		SysCompanyEntity company = iSysCompanyService.selectById(companyCode);
+		SysCompanyEntity parentCompany = iSysCompanyService.selectById(company.getParentCode());
+		SysAreaEntity area = iSysAreaService.selectById(company.getAreaCode());
+		model.addObject("company", company);
+		model.addObject("parentCompany", parentCompany);
+		model.addObject("area", area);
+		return model;
+	}
+	
 	@RequestMapping(path="info/{code}")
 	@ResponseBody
 	public Result info(@PathVariable("code") String code) {
@@ -66,4 +84,15 @@ public class CompanyController {
 			return ExceptionSupport.resolverResult("保存公司", this.getClass(), e);
 		}
 	}
+	
+	@RequestMapping(path="update" , method=RequestMethod.POST)
+	@ResponseBody
+	public Result update(SysCompanyEntity company) {
+		try {
+			iSysCompanyService.update(company);
+			return Result.result(0, null, "公司【"+company.getCompanyName()+"】修改成功！");
+		} catch (Exception e) {
+			return ExceptionSupport.resolverResult("修改公司", this.getClass(), e);
+		}
+	}
 }
diff --git a/tamguo-oms/src/main/resources/mappers/sys/SysCompanyMapper.xml b/tamguo-oms/src/main/resources/mappers/sys/SysCompanyMapper.xml
index 0b14060..634dee5 100644
--- a/tamguo-oms/src/main/resources/mappers/sys/SysCompanyMapper.xml
+++ b/tamguo-oms/src/main/resources/mappers/sys/SysCompanyMapper.xml
@@ -23,9 +23,11 @@
 			c.update_date,
 			c.remarks,
 			c.corp_code,
-			c.corp_name
+			c.corp_name,
+			a.tree_names as tree_area_names
 		FROM
 			sys_company c
+		LEFT JOIN sys_area a ON c.area_code = a.area_code
 		<where>
 			1 = 1
 			<choose>
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/company/add.html b/tamguo-oms/src/main/resources/templates/modules/sys/company/add.html
index b9bf104..3d26b27 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/company/add.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/company/add.html
@@ -279,7 +279,7 @@ $("#companyOfficeListButton,#companyOfficeListName").click(function(){
 		shadeClose: true,
 		title: '机构选择',
 		area: ['300px', '400px'],
-		content: ctx + 'sys/treeselect',
+		content: 'sys/treeselect',
 		contentFormData: {
 			url: $('#companyOfficeListDiv').attr('data-url'),
 			checkbox: 'true',
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/company/index.html b/tamguo-oms/src/main/resources/templates/modules/sys/company/index.html
index 24edd00..57a0fca 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/company/index.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/company/index.html
@@ -91,7 +91,7 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'公司全称', name:'fullName', index:'a.full_name', width:200, align:"left"},
 		{header:'排序号', name:'treeSort', index:'a.tree_sort', width:80, align:"center"},
-		{header:'归属区域', name:'area.treeNames', index:'a.areaCode', width:200, align:"center"},
+		{header:'归属区域', name:'treeAreaNames', index:'a.areaCode', width:200, align:"center"},
 		{header:'更新时间', name:'updateDate', index:'a.update_date', width:200, align:"center"},
 		{header:'备注信息', name:'remarks', index:'a.remarks', width:200, align:"left"},
 		{header:'状态', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
@@ -99,7 +99,7 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'操作', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){
 			var actions = [];
-				actions.push('<a href="/js/a/sys/company/form?companyCode='+row.companyCode+'" class="btnList" title="编辑公司"><i class="fa fa-pencil"></i></a>&nbsp;');
+				actions.push('<a href="sys/company/update?companyCode='+row.companyCode+'" class="btnList" title="编辑公司"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="/js/a/sys/company/disable?companyCode='+row.companyCode+'" class="btnList" title="停用公司" data-confirm="确认要停用该公司吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
 				}
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/company/update.html b/tamguo-oms/src/main/resources/templates/modules/sys/company/update.html
new file mode 100644
index 0000000..cd1a942
--- /dev/null
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/company/update.html
@@ -0,0 +1,423 @@
+<!DOCTYPE html><html><head><meta charset="utf-8"><meta content="webkit" name="renderer"/><meta http-equiv="X-UA-Compatible"
+content="IE=edge"><meta name="keywords" content="PoweredByJeeSiteV4.0"/><meta http-equiv="Cache-Control"
+content="no-cache, no-store, must-revalidate"/><meta name="description" content="PoweredByJeeSiteV4.0"/><meta
+content="no-cache" http-equiv="Pragma"/><meta http-equiv="Expires" content="0"/><meta
+content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
+<title>公司管理 - JeeSite Demo</title>
+<script th:src="${setting.domain + 'global.min.js'}"></script>
+<script th:src="${setting.domain + 'jquery/jquery-1.12.4.min.js'}"></script>
+<script th:src="${setting.domain + 'jquery/jquery-migrate-1.4.1.min.js'}"></script>
+<!--[if lt IE 9]><script src="/js/static/common/h5fix.min.js"></script><![endif]-->
+<link rel="stylesheet" th:href="${setting.domain + 'fonts/font-icons.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'bootstrap/css/bootstrap.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'select2/4.0/select2.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'icheck/1.0/minimal/grey.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'adminlte/css/AdminLTE.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'common/jeesite.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'common/common.css'}">
+</head><body class="hold-transition ">
+<div class="wrapper"><div class="main-content">
+	<div class="box box-main">
+		<div class="box-header">
+			<div class="box-title">
+				<i class="fa icon-fire"></i> 编辑公司
+			</div>
+			<div class="box-tools pull-right">
+				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+			</div>
+		</div>
+<form id="inputForm" th:action="${setting.domain + 'sys/company/update'}" method="post" class="form-horizontal">
+			<div class="box-body">
+				<div class="form-unit">基本信息</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4">上级公司：</label>
+							<div class="col-sm-8">
+<div class="input-group treeselect" id="parentDiv" data-url="sys/company/treeData?excludeCode=SD">
+	<input id="parentCode" type="hidden" name="parentCode" th:value="${parentCompany.companyCode}" class="isReset"/>
+	<input id="parentName" type="text" name="parentName" th:value="${parentCompany.companyName}"
+		class="form-control  " readonly="readonly"
+	/><span class="input-group-btn"><a id="parentButton" href="javascript:"
+		class="btn btn-default "><i class="fa fa-search"></i></a>
+	</span>
+</div>
+<script>
+$("#parentButton,#parentName").click(function(){
+	if ($("#parentButton").hasClass("disabled")){
+		return true;
+	}
+	var options = {
+		type: 2,
+		maxmin: true,
+		shadeClose: true,
+		title: '上级公司',
+		area: ['300px', '400px'],
+		content: 'sys/treeselect',
+		contentFormData: {
+			url: $('#parentDiv').attr('data-url'),
+			checkbox: 'false',
+			expandLevel: '-1',
+			selectCodes: $("#parentCode").val(),
+			isReturnValue: 'false'
+		},
+		success: function(layero, index){
+			if ($(js.layer.window).width() < 300
+				|| $(js.layer.window).height() < 400){
+				js.layer.full(index);
+			}
+		},
+		btn: ['<i class="fa fa-check"></i> 确定'],
+		btn1: function(index, layero){
+			var win = js.layer.iframeWindow(index);
+			win.$('#keyword').val('').change(); 			var codes = [], names = [], nodes;
+			if ("false" == "true"){
+				nodes = win.tree.getCheckedNodes(true);
+			}else{
+				nodes = win.tree.getSelectedNodes();
+			}
+			for(var i=0; i<nodes.length; i++) {
+				var code = nodes[i]['false'=='true'?'value':'id'], name = nodes[i]['name'];
+				codes.push(code.replace(/^u_/g,''));
+				names.push(name.replace(/\([0-9]*\)/g,''));
+				break;
+			}
+			if(typeof treeselectCheck == 'function'){
+				if (!treeselectCheck('parent', nodes)){
+					return false;
+				}
+			}
+			$("#parentCode").val(codes.join(',')).change();
+			$("#parentName").val(names.join(',')).change();
+			try { $('#parentCode,#parentName').valid(); }catch(e){}
+			if(typeof treeselectCallback == 'function'){
+				treeselectCallback('parent', 'ok', index, layero, nodes);
+			}
+		}
+	};
+	options.btn.push('<i class="fa fa-eraser"></i> 清除');
+	options['btn'+options.btn.length] = function(index, layero){
+		$("#parentCode").val('').change();
+		$("#parentName").val('').change();
+		if(typeof treeselectCallback == 'function'){
+			treeselectCallback('parent', 'clear', index, layero);
+		}
+	};
+	options.btn.push('<i class="fa fa-close"></i> 关闭');
+	options['btn'+options.btn.length] = function(index, layero){
+		if(typeof treeselectCallback == 'function'){
+			treeselectCallback('parent', 'cancel', index, layero);
+		}
+	};
+	js.layer.open(options);
+});
+</script>							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 公司名称：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="text" id="companyName" name="companyName" th:value="${company.companyName}" maxlength="200" class="form-control required "/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 公司编码：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="hidden" id="isNewRecord" name="isNewRecord" value="false"/>
+								<input type="hidden" id="companyCode" name="companyCode" th:value="${company.companyCode}"/>
+								<input type="text" id="viewCode" name="viewCode" th:value="${company.viewCode}" maxlength="64" readonly="true" class="form-control required abc"/>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 公司全称：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="text" id="fullName" name="fullName" th:value="${company.fullName}" maxlength="200" class="form-control required "/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 排序号：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="text" id="treeSort" name="treeSort" th:value="${company.treeSort}" maxlength="10" class="form-control required digits"/>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> 归属区域：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+<div class="input-group treeselect" id="areaDiv" data-url="sys/area/treeData?">
+	<input id="areaCode" type="hidden" name="areaCode" th:value="${area == null} ? '' : ${area.areaCode}" class="isReset"/>
+	<input id="areaName" type="text" name="areaName" th:value="${area == null} ? '' : ${area.treeNames}" class="form-control" readonly="readonly"/>
+		<span class="input-group-btn"><a id="areaButton" href="javascript:"
+		class="btn btn-default "><i class="fa fa-search"></i></a>
+	</span>
+</div>
+<script>
+$("#areaButton,#areaName").click(function(){
+	if ($("#areaButton").hasClass("disabled")){
+		return true;
+	}
+	var options = {
+		type: 2,
+		maxmin: true,
+		shadeClose: true,
+		title: '区域选择',
+		area: ['300px', '400px'],
+		content: 'sys/treeselect',
+		contentFormData: {
+			url: $('#areaDiv').attr('data-url'),
+			checkbox: 'false',
+			expandLevel: '-1',
+			selectCodes: $("#areaCode").val(),
+			isReturnValue: 'false'
+		},
+		success: function(layero, index){
+			if ($(js.layer.window).width() < 300
+				|| $(js.layer.window).height() < 400){
+				js.layer.full(index);
+			}
+		},
+		btn: ['<i class="fa fa-check"></i> 确定'],
+		btn1: function(index, layero){
+			var win = js.layer.iframeWindow(index);
+			win.$('#keyword').val('').change(); 			var codes = [], names = [], nodes;
+			if ("false" == "true"){
+				nodes = win.tree.getCheckedNodes(true);
+			}else{
+				nodes = win.tree.getSelectedNodes();
+			}
+			for(var i=0; i<nodes.length; i++) {
+				if (nodes[i].level == 0 && nodes[i].isParent){
+					js.showMessage("不能选择根节点（"+nodes[i].name+"）请重新选择。");
+					return false;
+				}
+				if (nodes[i].isParent){
+					js.showMessage("不能选择父节点（"+nodes[i].name+"）请重新选择。");
+					return false;
+				}
+				var code = nodes[i]['false'=='true'?'value':'id'], name = nodes[i]['name'];
+				var pNode = nodes[i].getParentNode();
+				while(!!pNode) {
+					name =  pNode.name + '/' + name;
+				    pNode = pNode.getParentNode();
+				}
+				codes.push(code.replace(/^u_/g,''));
+				names.push(name.replace(/\([0-9]*\)/g,''));
+				break;
+			}
+			if(typeof treeselectCheck == 'function'){
+				if (!treeselectCheck('area', nodes)){
+					return false;
+				}
+			}
+			$("#areaCode").val(codes.join(',')).change();
+			$("#areaName").val(names.join(',')).change();
+			try { $('#areaCode,#areaName').valid(); }catch(e){}
+			if(typeof treeselectCallback == 'function'){
+				treeselectCallback('area', 'ok', index, layero, nodes);
+			}
+		}
+	};
+	options.btn.push('<i class="fa fa-eraser"></i> 清除');
+	options['btn'+options.btn.length] = function(index, layero){
+		$("#areaCode").val('').change();
+		$("#areaName").val('').change();
+		if(typeof treeselectCallback == 'function'){
+			treeselectCallback('area', 'clear', index, layero);
+		}
+	};
+	options.btn.push('<i class="fa fa-close"></i> 关闭');
+	options['btn'+options.btn.length] = function(index, layero){
+		if(typeof treeselectCallback == 'function'){
+			treeselectCallback('area', 'cancel', index, layero);
+		}
+	};
+	js.layer.open(options);
+});
+</script>							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> 包含机构：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+<div class="input-group treeselect" id="companyOfficeListDiv" data-url="sys/office/treeData?">
+	<input id="companyOfficeListCode" type="hidden" name="" value="" class="isReset"/>
+	<input id="companyOfficeListName" type="text" name="" value=""
+		class="form-control  " readonly="readonly"
+	/><span class="input-group-btn"><a id="companyOfficeListButton" href="javascript:"
+		class="btn btn-default "><i class="fa fa-search"></i></a>
+	</span>
+</div>
+<script>
+$("#companyOfficeListButton,#companyOfficeListName").click(function(){
+	if ($("#companyOfficeListButton").hasClass("disabled")){
+		return true;
+	}
+	var options = {
+		type: 2,
+		maxmin: true,
+		shadeClose: true,
+		title: '机构选择',
+		area: ['300px', '400px'],
+		content: 'sys/treeselect',
+		contentFormData: {
+			url: $('#companyOfficeListDiv').attr('data-url'),
+			checkbox: 'true',
+			expandLevel: '-1',
+			selectCodes: $("#companyOfficeListCode").val(),
+			isReturnValue: 'false'
+		},
+		success: function(layero, index){
+			if ($(js.layer.window).width() < 300
+				|| $(js.layer.window).height() < 400){
+				js.layer.full(index);
+			}
+		},
+		btn: ['<i class="fa fa-check"></i> 确定'],
+		btn1: function(index, layero){
+			var win = js.layer.iframeWindow(index);
+			win.$('#keyword').val('').change(); 			var codes = [], names = [], nodes;
+			if ("true" == "true"){
+				nodes = win.tree.getCheckedNodes(true);
+			}else{
+				nodes = win.tree.getSelectedNodes();
+			}
+			for(var i=0; i<nodes.length; i++) {
+				if (nodes[i].isParent){
+					continue;
+				}
+				if (nodes[i].level == 0 && nodes[i].isParent){
+					js.showMessage("不能选择根节点（"+nodes[i].name+"）请重新选择。");
+					return false;
+				}
+				if (nodes[i].isParent){
+					js.showMessage("不能选择父节点（"+nodes[i].name+"）请重新选择。");
+					return false;
+				}
+				var code = nodes[i]['false'=='true'?'value':'id'], name = nodes[i]['name'];
+				codes.push(code.replace(/^u_/g,''));
+				names.push(name.replace(/\([0-9]*\)/g,''));
+			}
+			if(typeof treeselectCheck == 'function'){
+				if (!treeselectCheck('companyOfficeList', nodes)){
+					return false;
+				}
+			}
+			$("#companyOfficeListCode").val(codes.join(',')).change();
+			$("#companyOfficeListName").val(names.join(',')).change();
+			try { $('#companyOfficeListCode,#companyOfficeListName').valid(); }catch(e){}
+			if(typeof treeselectCallback == 'function'){
+				treeselectCallback('companyOfficeList', 'ok', index, layero, nodes);
+			}
+		}
+	};
+	options.btn.push('<i class="fa fa-eraser"></i> 清除');
+	options['btn'+options.btn.length] = function(index, layero){
+		$("#companyOfficeListCode").val('').change();
+		$("#companyOfficeListName").val('').change();
+		if(typeof treeselectCallback == 'function'){
+			treeselectCallback('companyOfficeList', 'clear', index, layero);
+		}
+	};
+	options.btn.push('<i class="fa fa-close"></i> 关闭');
+	options['btn'+options.btn.length] = function(index, layero){
+		if(typeof treeselectCallback == 'function'){
+			treeselectCallback('companyOfficeList', 'cancel', index, layero);
+		}
+	};
+	js.layer.open(options);
+});
+</script><input type="hidden" id="companyOfficeListJson" name="companyOfficeListJson" value=""/>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="form-group">
+							<label class="control-label col-sm-2" title="">
+								<span class="required hide">*</span> 备注信息：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-10">
+								<textarea id="remarks" name="remarks" rows="4" maxlength="500" class="form-control " th:utext="${company.remarks}"></textarea>
+							</div>
+						</div>
+					</div>
+				</div>
+		</div>
+			<div class="box-footer">
+				<div class="row">
+					<div class="col-sm-offset-2 col-sm-10">
+							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> 保 存</button>&nbsp;
+						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> 关 闭</button>
+					</div>
+				</div>
+			</div>
+</form>
+	</div>
+</div>
+</div>
+
+<a id="scroll-up" href="#" class="btn btn-sm"><i class="fa fa-angle-double-up"></i></a>
+<script th:src="${setting.domain + 'bootstrap/js/bootstrap.min.js'}"></script>
+<script th:src="${setting.domain + 'select2/4.0/select2.js'}"></script>
+<script th:src="${setting.domain + 'select2/4.0/i18n/zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'layer/3.1/layer.js'}"></script>
+<script th:src="${setting.domain + 'my97/WdatePicker.js'}"></script>
+<script th:src="${setting.domain + 'jquery-validation/1.16/jquery.validate.js'}"></script>
+<script th:src="${setting.domain + 'jquery-validation/1.16/localization/messages_zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'jquery-validation/1.16/jquery.validate.extend.js'}"></script>
+<script th:src="${setting.domain + 'common/jeesite.js'}"></script>
+<script th:src="${setting.domain + 'common/i18n/jeesite_zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'common/common.js'}"></script>
+<script>
+$("#inputForm").validate({
+	submitHandler: function(form){
+		var companyOfficeData = $('#companyOfficeListCode').val().split(',');
+		$("#companyOfficeListJson").val(JSON.stringify(companyOfficeData));
+		js.ajaxSubmitForm($(form), function(data){
+			js.showMessage(data.message);
+			if(data.code == 0){
+				js.closeCurrentTabPage(function(contentWindow){
+					contentWindow.$('#dataGrid').dataGrid('refreshTreeChildren',
+							$('#parentCode').val(), 'SD');
+				});
+			}
+		}, "json");
+    }
+});
+$('#companyName').change(function(){
+	if ($('#fullName').val()==''){
+		$('#fullName').val($(this).val());
+	}
+});
+// 选择父级菜单回调方法
+function treeselectCallback(id, act, index, layero){
+	if (id == 'parent' && (act == 'ok' || act == 'clear')){
+		// 创建并初始化下一个节点信息，如：排序号、默认值
+		$.get('sys/company/createNextNode?parentCode='
+				+$('#parentCode').val(), function(data){
+			$('#treeSort').val(data.treeSort);
+		});
+	}
+}
+</script>
\ No newline at end of file