diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index bf1cb256..5b057840 100644 Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ diff --git a/modules/core/src/main/resources/views/modules/sys/officeIndex.html b/modules/core/src/main/resources/views/modules/sys/officeIndex.html index d6edca0e..d15fd9ed 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeIndex.html +++ b/modules/core/src/main/resources/views/modules/sys/officeIndex.html @@ -35,7 +35,7 @@ var win = $("#mainFrame")[0].contentWindow; var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{enable:true}}, callback:{onClick:function(event, treeId, treeNode){ tree.expandNode(treeNode); - win.$('button[type=reset]').click(); + //win.$('button[type=reset]').click(); win.$('#officeCode').val(treeNode.id); win.page(); }} diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html index 8a9e9320..ade6d79e 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html @@ -38,7 +38,7 @@ var win = $("#mainFrame")[0].contentWindow; var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{enable:true}}, callback:{onClick:function(event, treeId, treeNode){ tree.expandNode(treeNode); - win.$('button[type=reset]').click(); + //win.$('button[type=reset]').click(); win.$('#officeCode').val(treeNode.id); win.$('#officeName').val(treeNode.name); win.page(); diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html index 299c5012..2cc9c31d 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html @@ -36,66 +36,69 @@
<#form:input path="userName" maxlength="100" class="form-control width-90"/>
- -
- -
- <#form:input path="email" maxlength="300" class="form-control width-90"/> -
+
+
+ +
+ <#form:input path="refName" maxlength="100" class="form-control width-90"/> +
<#form:input path="mobile" maxlength="100" class="form-control width-90"/>
-
-
- -
- <#form:input path="phone" maxlength="100" class="form-control width-90"/> -
-
-
-
- -
- <#form:input path="refName" maxlength="100" class="form-control width-90"/> -
-
-
- -
- <#form:treeselect id="office" title="${text('机构选择')}" - path="employee.office.officeCode" labelPath="employee.office.officeName" - url="${ctx}/sys/office/treeData?ctrlPermi=${@Global.getConfig('user.adminCtrlPermi', '2')}" - btnClass="btn-sm" allowClear="true" canSelectRoot="true" canSelectParent="true"/> -
-
-
- -
- <#form:treeselect id="company" title="${text('公司选择')}" - path="employee.company.companyCode" labelPath="employee.company.companyName" - url="${ctx}/sys/company/treeData?ctrlPermi=${@Global.getConfig('user.adminCtrlPermi', '2')}" - btnClass="btn-sm" allowClear="true" canSelectRoot="true" canSelectParent="true"/> -
-
-
- -
- <#form:select name="employee.postCode" items="${postList}" - itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control"/> -
<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control isQuick"/>
-
-
- - +
+ +
+ + + +
+
+
+ +
+ <#form:treeselect id="office" title="${text('机构选择')}" + path="employee.office.officeCode" labelPath="employee.office.officeName" + url="${ctx}/sys/office/treeData?ctrlPermi=${@Global.getConfig('user.adminCtrlPermi', '2')}" + btnClass="btn-sm" allowClear="true" canSelectRoot="true" canSelectParent="true"/> +
+
+
+ +
+ <#form:treeselect id="company" title="${text('公司选择')}" + path="employee.company.companyCode" labelPath="employee.company.companyName" + url="${ctx}/sys/company/treeData?ctrlPermi=${@Global.getConfig('user.adminCtrlPermi', '2')}" + btnClass="btn-sm" allowClear="true" canSelectRoot="true" canSelectParent="true"/> +
+
+
+ +
+ <#form:input path="email" maxlength="300" class="form-control width-90"/> +
+
+
+ +
+ <#form:select name="employee.postCode" items="${postList}" + itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:input path="phone" maxlength="100" class="form-control width-90"/> +
+
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html index 4d5757bf..44baab67 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html @@ -18,19 +18,6 @@ <#form:input path="userName" maxlength="100" class="form-control width-90"/> -
- -
- <#form:input path="email" maxlength="300" class="form-control width-90"/> -
-
-
- -
- <#form:input path="mobile" maxlength="100" class="form-control width-90"/> -
-
-
@@ -54,9 +41,9 @@
- +
- <#form:input path="phone" maxlength="100" class="form-control width-90"/> + <#form:input path="mobile" maxlength="100" class="form-control width-90"/>
@@ -87,9 +74,7 @@ selectNum = 0, dataGrid = $('#dataGrid').dataGrid({ {header:'${text("员工姓名")}', name:'refName', index:'a.ref_name', width:200, align:"center"}, {header:'${text("归属机构")}', name:'employee.office.officeName', index:'o.office_name', width:200, align:"center"}, {header:'${text("归属公司")}', name:'employee.company.companyName', index:'c.company_name', width:200, align:"center"}, - {header:'${text("电子邮箱")}', name:'email', index:'a.email', width:200, align:"center"}, {header:'${text("手机号码")}', name:'mobile', index:'a.mobile', width:200, align:"center"}, - {header:'${text("办公电话")}', name:'phone', index:'a.phone', width:200, align:"center"}, {header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:200, align:"center"}, {header:'${text("状态")}', name:'status', index:'a.status', width:140, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true);