diff --git a/modules/core/src/main/resources/views/modules/sys/companyIndex.html b/modules/core/src/main/resources/views/modules/sys/companyIndex.html index 77841ea3..cc9d5212 100644 --- a/modules/core/src/main/resources/views/modules/sys/companyIndex.html +++ b/modules/core/src/main/resources/views/modules/sys/companyIndex.html @@ -4,7 +4,7 @@
- ${text('公司')} + ${text('公司管理')}
@@ -36,11 +36,12 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{ callback:{onClick:function(event, treeId, treeNode){ tree.expandNode(treeNode); //win.$('button[type=reset]').click(); - win.$('#menuCode').val(treeNode.id); + win.$('#companyCode').val(treeNode.id); win.page(); }} }, tree, loadTree = function(){ - js.ajaxSubmit("${ctx}/sys/company/treeData?___t=" + new Date().getTime(), function(data){ + js.ajaxSubmit("${ctx}/sys/company/treeData?___t=" + new Date().getTime(), + {ctrlPermi:'${@Global.getConfig("user.adminCtrlPermi", "2")}'/*1拥有的权限 2管理的权限*/}, function(data){ tree = $.fn.zTree.init($("#tree"), setting, data);//.expandAll(true); // 展开第一级节点 var nodes = tree.getNodesByParam("level", 0); diff --git a/modules/core/src/main/resources/views/modules/sys/companyList.html b/modules/core/src/main/resources/views/modules/sys/companyList.html index c8805c4f..abb6fedf 100644 --- a/modules/core/src/main/resources/views/modules/sys/companyList.html +++ b/modules/core/src/main/resources/views/modules/sys/companyList.html @@ -20,6 +20,7 @@ <#form:form id="searchForm" model="${company}" action="${ctx}/sys/company/listData" method="post" class="form-inline hide" data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> <#form:hidden name="ctrlPermi" value="${@Global.getConfig('user.adminCtrlPermi', '2')}"/> + <#form:hidden path="companyCode" class="isReset"/>
@@ -89,7 +90,10 @@ $('#dataGrid').dataGrid({ defaultExpandLevel: 0, // 默认展开的层次 expandNodeClearPostData: 'viewCode,companyName,fullName,', // 展开节点清理请求参数数据(一般设置查询条件的字段属性,否则在查询后,不能展开子节点数据) // 加载成功后执行事件 ajaxSuccess: function(data){ - + if ($('#companyCode').val() != ''){ + $('#companyCode').val(''); + $('#btnExpandTreeNode').click(); + } } }); \ No newline at end of file