修改3.7.8版本已知bug | 20180811
zhangdaihao
parent
583b0d7922
commit
5ba53d4e13
|
|
@ -182,7 +182,9 @@ public class DepartController extends BaseController {
|
|||
|
||||
}
|
||||
} else {
|
||||
message = MutiLangUtil.paramDelFail("common.department");
|
||||
|
||||
message = MutiLangUtil.paramDelFail("common.department,!");
|
||||
|
||||
}
|
||||
|
||||
j.setMsg(message);
|
||||
|
|
@ -407,6 +409,10 @@ public class DepartController extends BaseController {
|
|||
}
|
||||
Short[] userstate = new Short[] { Globals.User_Normal, Globals.User_ADMIN };
|
||||
cq.in("status", userstate);
|
||||
|
||||
//cq.eq("deleteFlag", Globals.Delete_Normal);//删除状态，不删除
|
||||
//cq.eq("userType",Globals.USER_TYPE_SYSTEM);//系统用户
|
||||
|
||||
cq.add();
|
||||
this.systemService.getDataGridReturn(cq, true);
|
||||
TagUtil.datagrid(response, dataGrid);
|
||||
|
|
@ -487,6 +493,10 @@ public class DepartController extends BaseController {
|
|||
subCq.add();
|
||||
|
||||
cq.add(Property.forName("id").notIn(subCq.getDetachedCriteria()));
|
||||
|
||||
cq.eq("deleteFlag", Globals.Delete_Normal);//删除状态，不删除
|
||||
cq.eq("userType",Globals.USER_TYPE_SYSTEM);//系统用户
|
||||
|
||||
cq.add();
|
||||
|
||||
this.systemService.getDataGridReturn(cq, true);
|
||||
|
|
|
|||
|
|
@ -265,9 +265,11 @@ public class RoleController extends BaseController {
|
|||
AjaxJson j = new AjaxJson();
|
||||
if (StringUtil.isNotEmpty(role.getId())) {
|
||||
message = "角色: " + role.getRoleName() + "被更新成功";
|
||||
|
||||
role.setRoleType(OrgConstants.SYSTEM_ROLE_TYPE);
|
||||
|
||||
userService.saveOrUpdate(role);
|
||||
systemService.addLog(message, Globals.Log_Type_UPDATE,
|
||||
Globals.Log_Leavel_INFO);
|
||||
systemService.addLog(message, Globals.Log_Type_UPDATE,Globals.Log_Leavel_INFO);
|
||||
} else {
|
||||
message = "角色: " + role.getRoleName() + "被添加成功";
|
||||
|
||||
|
|
@ -962,8 +964,8 @@ public class RoleController extends BaseController {
|
|||
|
||||
cq.add(Property.forName("id").notIn(subCq.getDetachedCriteria()));
|
||||
|
||||
cq.eq("deleteFlag", new Short("0"));//删除状态，不删除
|
||||
cq.eq("userType","1");//系统用户
|
||||
cq.eq("deleteFlag", Globals.Delete_Normal);//删除状态，不删除
|
||||
cq.eq("userType",Globals.USER_TYPE_SYSTEM);//系统用户
|
||||
|
||||
cq.add();
|
||||
|
||||
|
|
|
|||
|
|
@ -165,6 +165,10 @@ public class TSInterfaceController extends BaseController {
|
|||
}else{
|
||||
String sql = "delete from t_s_interface where id = ?";
|
||||
systemService.executeSql(sql, tsInterface.getId());
|
||||
|
||||
String interroleSql = "delete from t_s_interrole_interface where interface_id = ?";
|
||||
systemService.executeSql(interroleSql, tsInterface.getId());
|
||||
|
||||
message = MutiLangUtil.paramDelSuccess("common.menu");
|
||||
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -888,7 +888,28 @@ public class UserController extends BaseController {
|
|||
req.setAttribute("user", user);
|
||||
idandname(req, user);
|
||||
getOrgInfos(req, user);
|
||||
|
||||
}else{
|
||||
//组织机构关联用户录入
|
||||
String departid = oConvertUtils.getString(req.getParameter("departid"));
|
||||
if(StringUtils.isNotEmpty(departid)){
|
||||
TSDepart depart = systemService.getEntity(TSDepart.class,departid);
|
||||
if(depart!=null){
|
||||
req.setAttribute("orgIds", depart.getId()+",");
|
||||
req.setAttribute("departname", depart.getDepartname()+",");
|
||||
}
|
||||
}
|
||||
//角色管理关联用户录入
|
||||
String roleId = oConvertUtils.getString(req.getParameter("roleId"));
|
||||
if(StringUtils.isNotEmpty(roleId)){
|
||||
TSRole tsRole = systemService.getEntity(TSRole.class,roleId);
|
||||
if(tsRole!=null){
|
||||
req.setAttribute("id", roleId);
|
||||
req.setAttribute("roleName", tsRole.getRoleName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
req.setAttribute("tsDepart", tsDepart);
|
||||
//req.setAttribute("orgIdList", JSON.toJSON(orgIdList));
|
||||
|
||||
|
|
|
|||
|
|
@ -26,27 +26,29 @@ public class FunctionServiceImpl extends CommonServiceImpl implements FunctionSe
|
|||
|
||||
TSFunction parent = function.getTSFunction();
|
||||
try {
|
||||
|
||||
List<TSFunction> listFunction = function.getTSFunctions();
|
||||
if (listFunction != null && listFunction.size() > 0) {
|
||||
message = "菜单【" + function.getFunctionName() + "】存在下级菜单，不能删除";
|
||||
message = "菜单【" + MutiLangUtil.getLang(function.getFunctionName()) + "】存在下级菜单，不能删除";
|
||||
j.setMsg(message);
|
||||
j.setSuccess(false);
|
||||
return j;
|
||||
}
|
||||
List<TSOperation> op = this.findHql("from TSOperation where TSFunction.id = ?", functionId);
|
||||
if (op != null && op.size() > 0) {
|
||||
message = "菜单【" + function.getFunctionName() + "】有设置页面权限，不能删除";
|
||||
message = "菜单【" + MutiLangUtil.getLang(function.getFunctionName()) + "】有设置页面权限，不能删除";
|
||||
j.setMsg(message);
|
||||
j.setSuccess(false);
|
||||
return j;
|
||||
}
|
||||
List<TSDataRule> tsdr = this.findByProperty(TSDataRule.class, "TSFunction", function);
|
||||
if (tsdr != null && tsdr.size() > 0) {
|
||||
message = "菜单【" + function.getFunctionName() + "】存在数据规则，不能删除";
|
||||
message = "菜单【" + MutiLangUtil.getLang(function.getFunctionName()) + "】存在数据规则，不能删除";
|
||||
j.setMsg(message);
|
||||
j.setSuccess(false);
|
||||
return j;
|
||||
}
|
||||
|
||||
if (parent != null) {
|
||||
parent.getTSFunctions().remove(function);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
<#list subtables as key>
|
||||
#segment#${subsG['${key}'].entityName}Entity.java
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
|
@ -37,7 +38,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable
|
|||
<#list subColumnsMap['${key}'] as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -36,7 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date"><#if po.showType=='date'>,format = "yyyy-MM-dd"<#else>,format = "yyyy-MM-dd HH:mm:ss"</#if></#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type}</#if> ${po.fieldName};
|
||||
</#list>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
<#list subtables as key>
|
||||
#segment#${subsG['${key}'].entityName}Entity.java
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
|
@ -37,7 +38,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable
|
|||
<#list subColumnsMap['${key}'] as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -444,6 +444,9 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
if(showVal==''){
|
||||
showVal = value;
|
||||
}
|
||||
return showVal;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -36,7 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date"><#if po.showType=='date'>,format = "yyyy-MM-dd"<#else>,format = "yyyy-MM-dd HH:mm:ss"</#if></#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type}</#if> ${po.fieldName};
|
||||
</#list>
|
||||
|
|
|
|||
|
|
@ -442,6 +442,9 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
if(showVal==''){
|
||||
showVal = value;
|
||||
}
|
||||
return showVal;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
<#list subtables as key>
|
||||
#segment#${subsG['${key}'].entityName}Entity.java
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
|
@ -37,7 +38,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable
|
|||
<#list subColumnsMap['${key}'] as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -36,7 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date"><#if po.showType=='date'>,format = "yyyy-MM-dd"<#else>,format = "yyyy-MM-dd HH:mm:ss"</#if></#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type}</#if> ${po.fieldName};
|
||||
</#list>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -39,9 +40,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]-->
|
||||
private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type}</#if> ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
<#list subtables as key>
|
||||
|
||||
#segment#${subsG['${key}'].entityName}Entity.java
|
||||
|
|
@ -38,9 +39,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable
|
|||
<#list subColumnsMap['${key}'] as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -39,9 +40,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]-->
|
||||
private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type}</#if> ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
<#list subtables as key>
|
||||
#segment#${subsG['${key}'].entityName}Entity.java
|
||||
package ${bussiPackage}.${subsG['${key}'].entityPackage}.entity;
|
||||
|
|
@ -38,9 +39,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable
|
|||
<#list subColumnsMap['${key}'] as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
<#list subtables as key>
|
||||
|
||||
#segment#${subsG['${key}'].entityName}Entity.java
|
||||
|
|
@ -38,9 +39,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable
|
|||
<#list subColumnsMap['${key}'] as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>${ftl_description}</title>
|
||||
<t:base type="jquery,easyui,tools,DatePicker,autocomplete"></t:base>
|
||||
|
|
@ -380,7 +381,7 @@ function listDictFormat(value,code,table){
|
|||
}
|
||||
var dicts = ${entityName?uncap_first}ListdictsData[dictKey];
|
||||
var valArray = value.split(',');
|
||||
var showVal = value;
|
||||
var showVal = '';
|
||||
if (valArray.length > 1) {
|
||||
for (var k = 0; k < valArray.length; k++) {
|
||||
if(dicts && dicts.length>0){
|
||||
|
|
@ -403,6 +404,9 @@ function listDictFormat(value,code,table){
|
|||
}
|
||||
}
|
||||
}
|
||||
if(showVal==''){
|
||||
showVal = value;
|
||||
}
|
||||
return showVal;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]-->
|
||||
private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type}</#if> ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>${ftl_description}</title>
|
||||
<t:base type="jquery,easyui,tools,DatePicker,autocomplete"></t:base>
|
||||
|
|
@ -378,7 +379,7 @@ function listDictFormat(value,code,table){
|
|||
}
|
||||
var dicts = ${entityName?uncap_first}ListdictsData[dictKey];
|
||||
var valArray = value.split(',');
|
||||
var showVal = value;
|
||||
var showVal = '';
|
||||
if (valArray.length > 1) {
|
||||
for (var k = 0; k < valArray.length; k++) {
|
||||
if(dicts && dicts.length>0){
|
||||
|
|
@ -401,6 +402,9 @@ function listDictFormat(value,code,table){
|
|||
}
|
||||
}
|
||||
}
|
||||
if(showVal==''){
|
||||
showVal = value;
|
||||
}
|
||||
return showVal;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
<#list subtables as key>
|
||||
|
||||
#segment#${subsG['${key}'].entityName}Entity.java
|
||||
|
|
@ -40,9 +41,9 @@ public class ${subsG['${key}'].entityName}Entity implements java.io.Serializable
|
|||
<#list subColumnsMap['${key}'] as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "/ui/excel.ftl"/>
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -36,9 +37,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]-->
|
||||
private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type}</#if> ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
<#-- 实体属性@Excel注解 -->
|
||||
<#macro excel po>
|
||||
@Excel(name="${po.content}",width=15<#rt/>
|
||||
<#if po.type == "java.util.Date">
|
||||
<#if po.showType=='date'>
|
||||
,format = "yyyy-MM-dd"<#rt/>
|
||||
<#else>
|
||||
,format = "yyyy-MM-dd HH:mm:ss"<#rt/>
|
||||
</#if>
|
||||
</#if>
|
||||
<#if po.dictTable?if_exists?html!="" && po.showType?if_exists?html!='popup'>
|
||||
,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#rt/>
|
||||
</#if>
|
||||
<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">
|
||||
,dicCode="${po.dictField}"<#rt/>
|
||||
</#if>)
|
||||
</#macro>
|
||||
|
|
@ -16,12 +16,16 @@
|
|||
</#if><#rt/>
|
||||
<#if po.dictTable?if_exists?html!=""><#rt/>
|
||||
dictionary="${po.dictTable},${po.dictField?replace(',', '@')},${po.dictText?replace(',', '@')}" <#rt/>
|
||||
<#if po.showType=='popup'> popup="true" extendParams="editor:'text'"<#else> extendParams="editor:'combobox'"</#if><#rt/>
|
||||
<#else><#rt/>
|
||||
<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!=""><#rt/>
|
||||
<#if po.showType=='popup'>
|
||||
popup="true" extendParams="editor:{type:'popupty',options:{dicTable:'${po.dictTable}',dicText:'${po.dictText?replace(',', '@')}'}}" <#rt/>
|
||||
<#else>
|
||||
extendParams="editor:'combobox'"<#rt/>
|
||||
</#if><#rt/>
|
||||
<#else><#rt/>
|
||||
<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!=""><#rt/>
|
||||
dictionary="${po.dictField}" filterType="combobox" extendParams="editor:'combobox'"<#rt/>
|
||||
<#else>
|
||||
<#if po.type?if_exists?html =='java.util.Date'><#rt/>
|
||||
<#else>
|
||||
<#if po.type?if_exists?html =='java.util.Date'><#rt/>
|
||||
filterType="datebox" extendParams="editor:{type:'datebox',options:{onShowPanel:initDateboxformat}}"<#rt/>
|
||||
<#elseif po.type?if_exists?html =='java.lang.Integer'><#rt/>
|
||||
filterType="numberbox" extendParams="editor:'numberbox'"<#rt/>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "../../ui/excel.ftl"/>
|
||||
<#if packageStyle == "service">
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
<#else>
|
||||
|
|
@ -39,9 +40,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "../../ui/excel.ftl"/>
|
||||
<#if packageStyle == "service">
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
<#else>
|
||||
|
|
@ -40,9 +41,10 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> </#if>
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]-->
|
||||
private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type}</#if> ${po.fieldName};
|
||||
<#--update-end--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]-->
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "../../ui/excel.ftl"/>
|
||||
<#if packageStyle == "service">
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
<#else>
|
||||
|
|
@ -40,9 +41,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]-->
|
||||
private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type}</#if> ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "../../ui/excel.ftl"/>
|
||||
<#if packageStyle == "service">
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
<#else>
|
||||
|
|
@ -40,9 +41,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]-->
|
||||
private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type}</#if> ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "../../ui/excel.ftl"/>
|
||||
<#if packageStyle == "service">
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
<#else>
|
||||
|
|
@ -42,9 +43,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]-->
|
||||
private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type}</#if> ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "../../ui/excel.ftl"/>
|
||||
<#if packageStyle == "service">
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
<#else>
|
||||
|
|
@ -39,9 +40,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "../../ui/excel.ftl"/>
|
||||
<#if packageStyle == "service">
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
<#else>
|
||||
|
|
@ -39,9 +40,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#if po.type == "javax.xml.soap.Text">
|
||||
private java.lang.String ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "../../ui/excel.ftl"/>
|
||||
<#if packageStyle == "service">
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
<#else>
|
||||
|
|
@ -40,9 +41,9 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]-->
|
||||
private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type}</#if> ${po.fieldName};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
<#-- 实体属性@Excel注解 -->
|
||||
<#macro excel po>
|
||||
@Excel(name="${po.content}",width=15<#rt/>
|
||||
<#if po.type == "java.util.Date">
|
||||
,format = "yyyy-MM-dd"<#rt/>
|
||||
</#if>
|
||||
<#if po.dictTable?if_exists?html!="" && po.showType?if_exists?html!='popup'>
|
||||
,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"<#rt/>
|
||||
</#if>
|
||||
<#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">
|
||||
,dicCode="${po.dictField}"<#rt/>
|
||||
</#if>)
|
||||
</#macro>
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
<#include "../../ui/excel.ftl"/>
|
||||
<#if packageStyle == "service">
|
||||
package ${bussiPackage}.${entityPackage}.entity;
|
||||
<#else>
|
||||
|
|
@ -40,9 +41,10 @@ public class ${entityName}Entity implements java.io.Serializable {
|
|||
<#list columns as po>
|
||||
/**${po.content}*/
|
||||
<#if po.isShow != 'N'>
|
||||
<#--update-start--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务-->
|
||||
@Excel(name="${po.content}",width=15<#if po.type == "java.util.Date">,format = "yyyy-MM-dd"</#if><#if po.dictTable?if_exists?html!="">,dictTable ="${po.dictTable}",dicCode ="${po.dictField}",dicText ="${po.dictText}"</#if><#if po.dictTable?if_exists?html=="" && po.dictField?if_exists?html!="">,dicCode="${po.dictField}"</#if>)
|
||||
<#--update-end--Author:dangzhenghui Date:20170503 for：TASK #1864 【excel】Excel 功能专项任务--> </#if>
|
||||
<#--update-begin--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
<@excel po = po/>
|
||||
<#--update-end--Author:taoYan Date:20170807 for：TASK #3021 【代码生成器 - 陶炎】popup配置影响了导出excel功能 -->
|
||||
</#if>
|
||||
<#--update-start--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]-->
|
||||
private <#if po.type=='java.sql.Blob'>byte[]<#else>${po.type}</#if> ${po.fieldName};
|
||||
<#--update-end--Author:luobaoli Date:20150609 for：将数据库中blob类型对应为byte[]-->
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<script type="text/javascript" src="plug-in/tools/easyuiextend.js"></script>
|
||||
<script type="text/javascript" charset="utf-8" src="plug-in/ueditor/ueditor.config.js"></script>
|
||||
<script type="text/javascript" charset="utf-8" src="plug-in/ueditor/ueditor.all.min.js"></script>
|
||||
<style>.col-xs-3>input,.col-xs-3>select{width:100%}</style>
|
||||
|
||||
<script type="text/javascript">
|
||||
//编写自定义JS代码
|
||||
</script>
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
<b>性别：</b>
|
||||
</div>
|
||||
<div class="col-xs-3">
|
||||
<t:dictSelect field="sex" type="list" extendJson="{class:'form-control'}" typeGroupCode="sex" hasLabel="false" title="性别"></t:dictSelect>
|
||||
<t:dictSelect field="sex" type="list" extendJson="{class:'form-control',style:'width:158px'}" typeGroupCode="sex" hasLabel="false" title="性别"></t:dictSelect>
|
||||
<span class="Validform_checktip" style="float:left;height:0px;"></span>
|
||||
<label class="Validform_label" style="display: none">性别</label>
|
||||
</div>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<b>关联部门：</b>
|
||||
</div>
|
||||
<div class="col-xs-3">
|
||||
<t:dictSelect field="depart" type="list" extendJson="{class:'form-control'}" dictTable="t_s_depart" dictField="id" dictText="departname" hasLabel="false" title="关联部门"></t:dictSelect>
|
||||
<t:dictSelect field="depart" type="list" extendJson="{class:'form-control',style:'width:158px'}" dictTable="t_s_depart" dictField="id" dictText="departname" hasLabel="false" title="关联部门"></t:dictSelect>
|
||||
<span class="Validform_checktip" style="float:left;height:0px;"></span>
|
||||
<label class="Validform_label" style="display: none">关联部门</label>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
<script type="text/javascript" src="plug-in/Validform/plugin/passwordStrength/passwordStrength-min.js"></script>
|
||||
<script type="text/javascript" charset="utf-8" src="plug-in/ueditor/ueditor.config.js"></script>
|
||||
<script type="text/javascript" charset="utf-8" src="plug-in/ueditor/ueditor.all.min.js"></script>
|
||||
<style>.col-xs-3>input,.col-xs-3>select{width:100%}</style>
|
||||
<script type="text/javascript">
|
||||
//编写自定义JS代码
|
||||
</script>
|
||||
|
|
@ -66,7 +65,7 @@
|
|||
<b>性别：</b>
|
||||
</div>
|
||||
<div class="col-xs-3">
|
||||
<t:dictSelect field="sex" type="list" extendJson="{class:'form-control'}" typeGroupCode="sex" defaultVal="${jeecgDemoExcelPage.sex}" hasLabel="false" title="性别"></t:dictSelect>
|
||||
<t:dictSelect field="sex" type="list" extendJson="{class:'form-control',style:'width:158px'}" typeGroupCode="sex" defaultVal="${jeecgDemoExcelPage.sex}" hasLabel="false" title="性别"></t:dictSelect>
|
||||
<span class="Validform_checktip" style="float:left;height:0px;"></span>
|
||||
<label class="Validform_label" style="display: none">性别</label>
|
||||
</div>
|
||||
|
|
@ -90,7 +89,7 @@
|
|||
<b>关联部门：</b>
|
||||
</div>
|
||||
<div class="col-xs-3">
|
||||
<t:dictSelect field="depart" type="list" extendJson="{class:'form-control'}" dictTable="t_s_depart" dictField="id" dictText="departname" defaultVal="${jeecgDemoExcelPage.depart}" hasLabel="false" title="关联部门"></t:dictSelect>
|
||||
<t:dictSelect field="depart" type="list" extendJson="{class:'form-control',style:'width:158px'}" dictTable="t_s_depart" dictField="id" dictText="departname" defaultVal="${jeecgDemoExcelPage.depart}" hasLabel="false" title="关联部门"></t:dictSelect>
|
||||
<span class="Validform_checktip" style="float:left;height:0px;"></span>
|
||||
<label class="Validform_label" style="display: none">关联部门</label>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ String langurl = basePath + "/plug-in/mutiLang/" + lang +".js";
|
|||
<span class="Validform_checktip"></span>
|
||||
</td>
|
||||
<td align="right"><label class="Validform_label"> <t:mutiLang langKey="table.description"/>: </label></td>
|
||||
<td class="value"><input class="inputxt" id="content" name="content" value="${cgFormHeadPage.content}" datatype="s2-100" nullmsg=<t:mutiLang langKey="please.input.table.content"/>> <span class="Validform_checktip"></span></td>
|
||||
<td class="value"><input class="inputxt" id="content" name="content" value="${cgFormHeadPage.content}" datatype="s2-100" nullmsg="<t:mutiLang langKey='please.input.table.content'/>" /> <span class="Validform_checktip"></span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="right"><label class="Validform_label"> <t:mutiLang langKey="pk.strategies"/>:</label></td>
|
||||
|
|
|
|||
|
|
@ -55,22 +55,22 @@
|
|||
<t:dgCol title="common.updatetime" field="updateDate" formatter="yyyy/MM/dd" hidden="true"></t:dgCol>
|
||||
<t:dgCol title="common.operation" field="opt" width="500"></t:dgCol>
|
||||
<t:dgFunOpt funname="delCgForm(id,tableName)" title="common.delete" urlclass="ace_button" urlStyle="background-color:#ec4758;" urlfont="fa-trash-o"></t:dgFunOpt>
|
||||
<t:dgFunOpt funname="remCgForm(id)" title="common.remove" inGroup="true" urlclass="ace_button" urlStyle="background-color:#FFA500;" urlfont="fa-remove"></t:dgFunOpt>
|
||||
<t:dgFunOpt funname="remCgForm(id)" title="common.remove" urlclass="ace_button" urlStyle="background-color:#FFA500;" urlfont="fa-remove"></t:dgFunOpt>
|
||||
<%--
|
||||
<t:dgFunOpt funname="importFields(id,content)" title="导入字段" urlclass="ace_button" urlfont="fa-download"></t:dgFunOpt>
|
||||
--%>
|
||||
<t:dgFunOpt exp="isDbSynch#eq#N" inGroup="true" title="sync.db" funname="doDbsynch(id,content)" urlclass="ace_button" urlfont="fa-database"/>
|
||||
<t:dgFunOpt exp="isDbSynch#eq#Y&&jformType#ne#3" inGroup="true" funname="addbytab(id,content)" title="form.template" urlclass="ace_button" urlfont="fa-cog"></t:dgFunOpt>
|
||||
<t:dgFunOpt exp="isDbSynch#eq#N" title="sync.db" funname="doDbsynch(id,content)" urlclass="ace_button" urlfont="fa-database"/>
|
||||
<t:dgFunOpt exp="isDbSynch#eq#Y&&jformType#ne#3" funname="addbytab(id,content)" title="form.template" urlclass="ace_button" urlfont="fa-cog"></t:dgFunOpt>
|
||||
<t:dgFunOpt exp="isDbSynch#eq#Y&&jformType#ne#3" funname="addlisttab(tableName,content)" title="function.test" urlStyle="background-color:#18a689;" urlclass="ace_button" urlfont="fa-gavel"></t:dgFunOpt>
|
||||
<t:dgFunOpt exp="isDbSynch#eq#Y&&jformType#ne#3" funname="popMenuLink(tableName,content)" title="config.place" urlStyle="background-color:#1a7bb9;" urlclass="ace_button" urlfont="fa-cog" ></t:dgFunOpt>
|
||||
<t:dgFunOpt funname="copyOnline(id)" title="复制表单" inGroup="true" operationCode="copyOnlineTable" urlclass="ace_button" urlfont="fa-copy"></t:dgFunOpt>
|
||||
<t:dgFunOpt exp="hasPeizhi#ne#0" funname="propertyTable(id)" inGroup="true" title="配置表" urlclass="ace_button" urlfont="fa-cog"></t:dgFunOpt>
|
||||
<t:dgFunOpt funname="copyOnline(id)" title="复制表单" operationCode="copyOnlineTable" urlclass="ace_button" urlfont="fa-copy"></t:dgFunOpt>
|
||||
<t:dgFunOpt exp="hasPeizhi#ne#0" funname="propertyTable(id)" title="配置表" urlclass="ace_button" urlfont="fa-cog"></t:dgFunOpt>
|
||||
<t:dgToolBar title="create.form" icon="fa fa-plus" width="100%" height="100%" url="cgFormHeadController.do?addorupdate" funname="addForm"></t:dgToolBar>
|
||||
<t:dgToolBar title="edit.form" icon="fa fa-edit" width="100%" height="100%" url="cgFormHeadController.do?addorupdate" funname="updateForm"></t:dgToolBar>
|
||||
<t:dgToolBar title="custom.button" icon="fa fa-bars" url="cgformButtonController.do?cgformButton" funname="cgFormButton"></t:dgToolBar>
|
||||
<t:dgToolBar title="js.enhance" inGroup="true" icon="fa fa-strikethrough" url="cgformEnhanceJsController.do?addorupdate" funname="enhanceJs"></t:dgToolBar>
|
||||
<t:dgToolBar title="sql.enhance" inGroup="true" icon="fa fa-filter" url="cgformButtonSqlController.do?addorupdate" operationCode="sql_enhance" funname="cgFormButtonSql"></t:dgToolBar>
|
||||
<t:dgToolBar title="java.enhance" inGroup="true" icon="fa fa-wrench" url="cgformEnhanceJavaController.do?addorupdate" funname="javaEnhance"></t:dgToolBar>
|
||||
<t:dgToolBar title="js.enhance" icon="fa fa-strikethrough" url="cgformEnhanceJsController.do?addorupdate" funname="enhanceJs"></t:dgToolBar>
|
||||
<t:dgToolBar title="sql.enhance" icon="fa fa-filter" url="cgformButtonSqlController.do?addorupdate" operationCode="sql_enhance" funname="cgFormButtonSql"></t:dgToolBar>
|
||||
<t:dgToolBar title="java.enhance" icon="fa fa-wrench" url="cgformEnhanceJavaController.do?addorupdate" funname="javaEnhance"></t:dgToolBar>
|
||||
<t:dgToolBar title="form.export" icon="fa fa-download" url="cgformSqlController.do?doMigrateOut" funname="doMigrateOut"></t:dgToolBar>
|
||||
<t:dgToolBar title="form.import" operationCode="form_import" icon="fa fa-upload" url="cgformSqlController.do?inSqlFile" funname="toCgformMigrate"></t:dgToolBar>
|
||||
<t:dgToolBar title="code.generate" operationCode="code_generate" icon="fa fa-spinner" url="generateController.do?gogenerate" funname="generate"></t:dgToolBar>
|
||||
|
|
@ -353,7 +353,7 @@
|
|||
lock : true,
|
||||
title: '<t:mutiLang langKey="code.generate"/>' + " ["+rowsData[0].content+"]",
|
||||
opacity : 0.3,
|
||||
width:1200,
|
||||
width:1250,
|
||||
zIndex: getzIndex(),
|
||||
height:500,
|
||||
cache:false,
|
||||
|
|
|
|||
|
|
@ -318,7 +318,9 @@
|
|||
</div>
|
||||
</div><!-- #sidebar-shortcuts -->
|
||||
|
||||
<ul class="nav nav-list">
|
||||
<!-- update-begin-author:taoYan date:20180807 for: TASK #3052 【bug】论坛反馈 -- 3.7.8页面布局受到影响-->
|
||||
<ul class="nav nav-list" id="aceMainPageMenu" style="overflow-y:auto">
|
||||
<!-- update-end-author:taoYan date:20180807 for: TASK #3052 【bug】论坛反馈 -- 3.7.8页面布局受到影响-->
|
||||
<li class="active">
|
||||
<a href="javascript:addTabs({id:'home',title:'首页',close: false,url: 'loginController.do?hplushome'});">
|
||||
<i class="fa fa-tachometer"></i>
|
||||
|
|
@ -508,6 +510,9 @@
|
|||
|
||||
<script type="text/javascript">
|
||||
jQuery(function($) {
|
||||
|
||||
$("#aceMainPageMenu").css("max-height",($(window).height()-140)+"px");
|
||||
|
||||
$('.easy-pie-chart.percentage').each(function(){
|
||||
var $box = $(this).closest('.infobox');
|
||||
var barColor = $(this).data('color') || (!$box.hasClass('infobox-dark') ? $box.css('color') : 'rgba(255,255,255,0.95)');
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
</script>
|
||||
</head>
|
||||
<body style="overflow-y: hidden" scroll="no">
|
||||
<t:formvalid formid="formobj" layout="div" dialog="true" action="systemController.do?saveDepart">
|
||||
<t:formvalid formid="formobj" layout="div" dialog="true" callback="@Override callbackTreeLoad" action="systemController.do?saveDepart">
|
||||
<input id="id" name="id" type="hidden" value="${depart.id }">
|
||||
<fieldset class="step">
|
||||
<div class="form">
|
||||
|
|
@ -100,5 +100,37 @@
|
|||
<!-- update--end--author:zhangjiaqiang Date:20170112 for:TASK 1708-->
|
||||
</fieldset>
|
||||
</t:formvalid>
|
||||
<script type="text/javascript">
|
||||
function callbackTreeLoad(data){
|
||||
var win = frameElement.api.opener;
|
||||
if (data.success == true) {
|
||||
frameElement.api.close();
|
||||
win.tip(data.msg);
|
||||
} else {
|
||||
if (data.responseText == ''
|
||||
|| data.responseText == undefined) {
|
||||
$.messager.alert('错误', data.msg);
|
||||
$.Hidemsg();
|
||||
} else {
|
||||
try {
|
||||
var emsg = data.responseText
|
||||
.substring(
|
||||
data.responseText
|
||||
.indexOf('错误描述'),
|
||||
data.responseText
|
||||
.indexOf('错误信息'));
|
||||
$.messager.alert('错误', emsg);
|
||||
$.Hidemsg();
|
||||
} catch (ex) {
|
||||
$.messager.alert('错误',
|
||||
data.responseText + "");
|
||||
$.Hidemsg();
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
win.reloadTreeNode();
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
<div region="center" style="padding:0px;border:0px">
|
||||
<t:datagrid name="departList" title="common.department.list" fitColumns="true" actionUrl="departController.do?departgrid" treegrid="true" idField="departid" pagination="false">
|
||||
<t:dgCol title="common.id" field="id" treefield="id" hidden="true"></t:dgCol>
|
||||
<t:dgCol title="common.id" field="parentId" treefield="parentId" hidden="true"></t:dgCol>
|
||||
<t:dgCol title="common.department.name" field="departname" treefield="text" width="120"></t:dgCol>
|
||||
<t:dgCol title="position.desc" field="description" treefield="src" width="70"></t:dgCol>
|
||||
<t:dgCol title="common.org.code" field="orgCode" treefield="fieldMap.orgCode" width="50"></t:dgCol>
|
||||
|
|
@ -13,8 +14,9 @@
|
|||
<t:dgCol title="common.fax" field="fax" treefield="fieldMap.fax" width="60"></t:dgCol>
|
||||
<t:dgCol title="common.address" field="address" treefield="fieldMap.address" width="100"></t:dgCol>
|
||||
<t:dgCol title="common.operation" field="opt" width="200"></t:dgCol>
|
||||
<t:dgDelOpt url="departController.do?del&id={id}" title="common.delete" urlclass="ace_button" urlfont="fa-trash-o" urlStyle="background-color:#ec4758;"></t:dgDelOpt>
|
||||
<t:dgFunOpt funname="queryUsersByDepart(id)" title="view.member" urlclass="ace_button" urlfont="fa-user"></t:dgFunOpt>
|
||||
<%-- <t:dgDelOpt url="departController.do?del&id={id}" title="common.delete" urlclass="ace_button" urlfont="fa-trash-o" urlStyle="background-color:#ec4758;"></t:dgDelOpt> --%>
|
||||
<t:dgFunOpt funname="delDepart(id)" title="common.delete" urlclass="ace_button" urlStyle="background-color:#ec4758;" urlfont="fa-trash-o"></t:dgFunOpt>
|
||||
<t:dgFunOpt funname="queryUsersByDepart(id)" title="view.member" urlclass="ace_button" urlfont="fa-user"></t:dgFunOpt>
|
||||
<t:dgFunOpt funname="setRoleByDepart(id,text)" title="role.set" urlclass="ace_button" urlfont="fa-cog" urlStyle="background-color:#1a7bb9;"></t:dgFunOpt>
|
||||
</t:datagrid>
|
||||
<div id="departListtb" style="padding: 3px; height: 25px">
|
||||
|
|
@ -114,16 +116,84 @@
|
|||
location.href = "${webRoot}/export/template/departTemplate.xls";
|
||||
}
|
||||
|
||||
function reloadTable(){
|
||||
var node = $('#departList').treegrid('getSelected');
|
||||
function reloadTreeNode(){
|
||||
var node = $('#departList').treegrid('getSelected');
|
||||
if (node) {
|
||||
var pnode = $('#departList').treegrid('getParent',node.id);
|
||||
if(pnode){
|
||||
$('#departList').treegrid('reload',pnode.id);
|
||||
}else{
|
||||
$('#departList').treegrid('reload',node.id);
|
||||
}
|
||||
var pnode = $('#departList').treegrid('getParent',node.id);
|
||||
if(pnode){
|
||||
if(node.parentId==""){
|
||||
$('#departList').treegrid('reload');
|
||||
}else{
|
||||
$('#departList').treegrid('reload',pnode.id);
|
||||
}
|
||||
}else{
|
||||
if(node.parentId==""){
|
||||
$('#departList').treegrid('reload');
|
||||
}else{
|
||||
$('#departList').treegrid('reload',node.id);
|
||||
}
|
||||
}
|
||||
}else{
|
||||
$('#departList').treegrid('reload');
|
||||
}
|
||||
}
|
||||
//删除部门
|
||||
function delDepart(id,name) {
|
||||
var url = "departController.do?del&id="+id
|
||||
var content = $.i18n.prop('del.this.confirm.msg');
|
||||
var title = $.i18n.prop('del.confirm.title');
|
||||
$.dialog.setting.zIndex = getzIndex(true);
|
||||
var navigatorName = "Microsoft Internet Explorer";
|
||||
if( navigator.appName == navigatorName ||"default,shortcut".indexOf(getCookie("JEECGINDEXSTYLE"))>=0){
|
||||
$.dialog.confirm(content, function(){
|
||||
doDelSubmit(url);
|
||||
rowid = '';
|
||||
}, function(){
|
||||
});
|
||||
}else{
|
||||
layer.open({
|
||||
title:title,
|
||||
content:content,
|
||||
icon:7,
|
||||
shade: 0.3,
|
||||
yes:function(index){
|
||||
doDelSubmit(url);
|
||||
rowid = '';
|
||||
},
|
||||
btn:[$.i18n.prop('common.ok'),$.i18n.prop('common.cancel')],
|
||||
btn2:function(index){
|
||||
layer.close(index);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行操作
|
||||
*
|
||||
* @param url
|
||||
* @param index
|
||||
*/
|
||||
function doDelSubmit(url) {
|
||||
$.ajax({
|
||||
async : false,
|
||||
cache : false,
|
||||
type : 'POST',
|
||||
url : url,// 请求的action路径
|
||||
error : function() {// 请求失败处理函数
|
||||
},
|
||||
success : function(data) {
|
||||
var d = $.parseJSON(data);
|
||||
if (d.success) {
|
||||
var msg = d.msg;
|
||||
tip(msg);
|
||||
reloadTreeNode();
|
||||
} else {
|
||||
tip(d.msg);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//-->
|
||||
</script>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
<t:dgCol title="编号" field="id" hidden="true"></t:dgCol>
|
||||
<t:dgCol title="common.username" sortable="false" width="100" field="userName" query="true"></t:dgCol>
|
||||
<t:dgCol title="common.real.name" field="realName" width="100" query="true"></t:dgCol>
|
||||
<t:dgCol title="common.user.type" field="userType" dictionary="user_type" width="80"></t:dgCol>
|
||||
<t:dgCol title="common.status" sortable="true" width="100" field="status" replace="common.active_1,common.inactive_0,super.admin_-1"></t:dgCol>
|
||||
</t:datagrid>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@
|
|||
</script>
|
||||
</head>
|
||||
<body style="overflow-y: hidden" scroll="no">
|
||||
<t:formvalid formid="formobj" layout="div" dialog="true" refresh="true" action="functionController.do?saveFunction">
|
||||
<input name="id" type="hidden" value="${function.id}">
|
||||
<t:formvalid formid="formobj" layout="div" dialog="true" callback="@Override callbackTreeLoad" refresh="true" action="functionController.do?saveFunction">
|
||||
<input id="id" name="id" type="hidden" value="${function.id}">
|
||||
<fieldset class="step">
|
||||
<div class="form">
|
||||
<label class="Validform_label"> <t:mutiLang langKey="menu.name"/>: </label>
|
||||
|
|
@ -128,5 +128,39 @@
|
|||
</div>
|
||||
</fieldset>
|
||||
</t:formvalid>
|
||||
<script type="text/javascript">
|
||||
|
||||
function callbackTreeLoad(data){
|
||||
var win = frameElement.api.opener;
|
||||
if (data.success == true) {
|
||||
frameElement.api.close();
|
||||
win.tip(data.msg);
|
||||
} else {
|
||||
if (data.responseText == ''
|
||||
|| data.responseText == undefined) {
|
||||
$.messager.alert('错误', data.msg);
|
||||
$.Hidemsg();
|
||||
} else {
|
||||
try {
|
||||
var emsg = data.responseText
|
||||
.substring(
|
||||
data.responseText
|
||||
.indexOf('错误描述'),
|
||||
data.responseText
|
||||
.indexOf('错误信息'));
|
||||
$.messager.alert('错误', emsg);
|
||||
$.Hidemsg();
|
||||
} catch (ex) {
|
||||
$.messager.alert('错误',
|
||||
data.responseText + "");
|
||||
$.Hidemsg();
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
win.reloadTreeNode();
|
||||
}
|
||||
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
<div region="center" style="padding:0px;border:0px">
|
||||
<t:datagrid name="functionList" title="menu.manage" actionUrl="functionController.do?functionGrid" idField="id" fit="true" fitColumns="true" treegrid="true" pagination="false" btnCls="bootstrap btn btn-normal btn-xs">
|
||||
<t:dgCol title="common.id" field="id" treefield="id" hidden="true"></t:dgCol>
|
||||
<t:dgCol title="common.id" field="parentId" treefield="parentId" hidden="true"></t:dgCol>
|
||||
<t:dgCol title="menu.name" field="functionName" treefield="text" width="40"></t:dgCol>
|
||||
<t:dgCol title="common.icon" field="TSIcon_iconPath" treefield="code" image="true" ></t:dgCol>
|
||||
<t:dgCol title="funcType" field="functionType" treefield="functionType" replace="funcType.page_0,funcType.from_1" width="20"></t:dgCol>
|
||||
|
|
@ -12,7 +13,7 @@
|
|||
<t:dgCol title="menu.order" field="functionOrder" treefield="order"></t:dgCol>
|
||||
<t:dgCol title="menu.funiconstyle" field="functionIconStyle" treefield="iconStyle" width="25"></t:dgCol>
|
||||
<t:dgCol title="common.operation" field="opt" width="100"></t:dgCol>
|
||||
<t:dgDelOpt url="functionController.do?del&id={id}" title="common.delete" urlclass="ace_button" urlStyle="background-color:#ec4758;" urlfont="fa-trash-o"></t:dgDelOpt>
|
||||
<t:dgFunOpt funname="delMenu(id)" title="common.delete" urlclass="ace_button" urlStyle="background-color:#ec4758;" urlfont="fa-trash-o"></t:dgFunOpt>
|
||||
<t:dgFunOpt funname="operationDetail(id)" title="button.setting" urlclass="ace_button" urlfont="fa-cog"></t:dgFunOpt>
|
||||
<t:dgFunOpt funname="operationData(id,src)" title="数据规则" urlclass="ace_button" urlStyle="background-color:#1a7bb9;" urlfont="fa-database"></t:dgFunOpt>
|
||||
<t:dgToolBar title="common.add.param" langArg="common.menu" icon="fa fa-plus" url="functionController.do?addorupdate" height="400" funname="addFun"></t:dgToolBar>
|
||||
|
|
@ -49,7 +50,7 @@ function operationData(fucntionId, functionUrl){
|
|||
}
|
||||
$('#operationDetailpanel').panel("refresh", "functionController.do?dataRule&functionId=" +fucntionId);
|
||||
} else {
|
||||
var datarule = layer.confirm('数据权限规则配置，针对的是列表加载数据请求URL，不是列表页面请求地址，一般是 *Controller.do?datagrid', {
|
||||
var datarule = layer.confirm('<b>友好提醒：</b> 菜单URL不是加载数据请求，加载数据请求格式一般是： *Controller.do?datagrid ，请注意菜单地址是否正确 ! ', {
|
||||
btn: ['确认','取消'],
|
||||
area:['450px','200px']
|
||||
}, function(){
|
||||
|
|
@ -78,32 +79,39 @@ function addFun(title,url, id) {
|
|||
}
|
||||
add(title,url,'functionList',700,480);
|
||||
}
|
||||
function reloadTable(){
|
||||
var node = $('#functionList').treegrid('getSelected');
|
||||
|
||||
function reloadTreeNode(){
|
||||
var node = $('#functionList').treegrid('getSelected');
|
||||
if (node) {
|
||||
var pnode = $('#functionList').treegrid('getParent',node.id);
|
||||
if(pnode){
|
||||
$('#functionList').treegrid('reload',pnode.id);
|
||||
}else{
|
||||
$('#functionList').treegrid('reload',node.id);
|
||||
}
|
||||
var pnode = $('#functionList').treegrid('getParent',node.id);
|
||||
if(pnode){
|
||||
if(node.parentId==""){
|
||||
$('#functionList').treegrid('reload');
|
||||
}else{
|
||||
$('#functionList').treegrid('reload',pnode.id);
|
||||
}
|
||||
|
||||
}else{
|
||||
if(node.parentId==""){
|
||||
$('#functionList').treegrid('reload');
|
||||
}else{
|
||||
$('#functionList').treegrid('reload',pnode.id);
|
||||
}
|
||||
}
|
||||
}else{
|
||||
$('#functionList').treegrid('reload');
|
||||
$('#functionList').treegrid('reload');
|
||||
}
|
||||
}
|
||||
|
||||
//删除调用函数
|
||||
function delObj(url,name) {
|
||||
gridname=name;
|
||||
createdialogDel($.i18n.prop('del.confirm.title'), $.i18n.prop('del.this.confirm.msg'), url,name);
|
||||
}
|
||||
|
||||
function createdialogDel(title, content, url,name,noShade) {
|
||||
//删除菜单
|
||||
function delMenu(id,name) {
|
||||
var url = "functionController.do?del&id="+id
|
||||
var content = $.i18n.prop('del.this.confirm.msg');
|
||||
var title = $.i18n.prop('del.confirm.title');
|
||||
$.dialog.setting.zIndex = getzIndex(true);
|
||||
var navigatorName = "Microsoft Internet Explorer";
|
||||
if( navigator.appName == navigatorName ||"default,shortcut".indexOf(getCookie("JEECGINDEXSTYLE"))>=0){
|
||||
$.dialog.confirm(content, function(){
|
||||
doDelSubmit(url,name);
|
||||
doDelSubmit(url);
|
||||
rowid = '';
|
||||
}, function(){
|
||||
});
|
||||
|
|
@ -112,9 +120,9 @@ function createdialogDel(title, content, url,name,noShade) {
|
|||
title:title,
|
||||
content:content,
|
||||
icon:7,
|
||||
shade: !noShade?0.3:0,
|
||||
shade: 0.3,
|
||||
yes:function(index){
|
||||
doDelSubmit(url,name);
|
||||
doDelSubmit(url);
|
||||
rowid = '';
|
||||
},
|
||||
btn:[$.i18n.prop('common.ok'),$.i18n.prop('common.cancel')],
|
||||
|
|
@ -131,25 +139,11 @@ function createdialogDel(title, content, url,name,noShade) {
|
|||
* @param url
|
||||
* @param index
|
||||
*/
|
||||
function doDelSubmit(url,name,data) {
|
||||
gridname=name;
|
||||
var paramsData = data;
|
||||
if(!paramsData){
|
||||
paramsData = new Object();
|
||||
if (url.indexOf("&") != -1) {
|
||||
var str = url.substr(url.indexOf("&")+1);
|
||||
url = url.substr(0,url.indexOf("&"));
|
||||
var strs = str.split("&");
|
||||
for(var i = 0; i < strs.length; i ++) {
|
||||
paramsData[strs[i].split("=")[0]]=(strs[i].split("=")[1]);
|
||||
}
|
||||
}
|
||||
}
|
||||
function doDelSubmit(url) {
|
||||
$.ajax({
|
||||
async : false,
|
||||
cache : false,
|
||||
type : 'POST',
|
||||
data : paramsData,
|
||||
url : url,// 请求的action路径
|
||||
error : function() {// 请求失败处理函数
|
||||
},
|
||||
|
|
@ -158,28 +152,13 @@ function doDelSubmit(url,name,data) {
|
|||
if (d.success) {
|
||||
var msg = d.msg;
|
||||
tip(msg);
|
||||
reloadTableDel();
|
||||
reloadTreeNode();
|
||||
} else {
|
||||
tip(d.msg);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
function reloadTableDel(){
|
||||
var node = $('#functionList').treegrid('getSelected');
|
||||
if (node) {
|
||||
var pnode = $('#functionList').treegrid('getParent',node.id);
|
||||
if(pnode){
|
||||
$('#functionList').treegrid('reload',pnode.id);
|
||||
}else{
|
||||
$('#functionList').treegrid('reload');
|
||||
}
|
||||
}else{
|
||||
$('#functionList').treegrid('reload');
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -110,13 +110,15 @@ function formSubmit(){
|
|||
}
|
||||
|
||||
function callbackOrg(data){
|
||||
|
||||
if(data.success==true){
|
||||
alert(data.msg);
|
||||
parent.tip(data.msg);
|
||||
parent.loadTree();
|
||||
location.reload();
|
||||
}else{
|
||||
alert(data.msg);
|
||||
parent.tip(data.msg);
|
||||
}
|
||||
|
||||
//tip(data.msg);
|
||||
}
|
||||
</script>
|
||||
|
|
@ -147,6 +147,7 @@ function GetAuthNode() {
|
|||
<t:dgCol title="编号" field="id" hidden="true"></t:dgCol>
|
||||
<t:dgCol title="common.username" sortable="false" field="userName" query="true" width="50"></t:dgCol>
|
||||
<t:dgCol title="common.real.name" field="realName" query="true" width="50"></t:dgCol>
|
||||
<t:dgCol title="common.department" sortable="false" field="userOrgList.tsDepart.departname" query="false" width="60"></t:dgCol>
|
||||
<t:dgCol title="common.status" sortable="true" width="20" field="status" replace="common.active_1,common.inactive_0,super.admin_-1"></t:dgCol>
|
||||
<t:dgCol title="common.operation" field="opt" width="130"></t:dgCol>
|
||||
<t:dgDelOpt title="解除机构关系" url="organzationController.do?delUserOrg&userid={id}&departid=${departid }" urlclass="ace_button" urlfont="fa-trash-o"/>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
<t:dgCol title="编号" field="id" hidden="true"></t:dgCol>
|
||||
<t:dgCol title="common.username" sortable="false" field="userName" query="true"></t:dgCol>
|
||||
<t:dgCol title="common.real.name" field="realName" query="true"></t:dgCol>
|
||||
<t:dgCol title="common.user.type" field="userType" dictionary="user_type"></t:dgCol>
|
||||
<t:dgCol title="common.status" sortable="true" field="status" replace="common.active_1,common.inactive_0,super.admin_-1"></t:dgCol>
|
||||
</t:datagrid>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -110,8 +110,12 @@ function formSubmit(){
|
|||
}
|
||||
|
||||
function callbackOrg(data){
|
||||
|
||||
if(data.success==true){
|
||||
parent.layer.alert(data.msg, {
|
||||
parent.tip(data.msg);
|
||||
parent.loadTree();
|
||||
location.reload();
|
||||
/* parent.layer.alert(data.msg, {
|
||||
icon: 1,
|
||||
shadeClose: false,
|
||||
title: '提示'
|
||||
|
|
@ -119,16 +123,18 @@ function callbackOrg(data){
|
|||
parent.loadTree();
|
||||
location.reload();
|
||||
parent.layer.close(index);
|
||||
});
|
||||
}); */
|
||||
}else{
|
||||
parent.layer.alert(data.msg, {
|
||||
parent.tip(data.msg);
|
||||
/* parent.layer.alert(data.msg, {
|
||||
icon: 0,
|
||||
shadeClose: false,
|
||||
title: '提示'
|
||||
},function(index){
|
||||
parent.layer.close(index);
|
||||
});
|
||||
}); */
|
||||
}
|
||||
|
||||
//tip(data.msg);
|
||||
}
|
||||
</script>
|
||||
|
|
@ -141,8 +141,12 @@ function formSubmit(){
|
|||
}
|
||||
|
||||
function callbackOrg(data){
|
||||
|
||||
if(data.success==true){
|
||||
parent.layer.alert(data.msg, {
|
||||
parent.tip(data.msg);
|
||||
parent.loadTree();
|
||||
location.reload();
|
||||
/* parent.layer.alert(data.msg, {
|
||||
icon: 1,
|
||||
shadeClose: false,
|
||||
title: '提示'
|
||||
|
|
@ -150,16 +154,18 @@ function callbackOrg(data){
|
|||
parent.loadTree();
|
||||
location.reload();
|
||||
parent.layer.close(index);
|
||||
});
|
||||
}); */
|
||||
}else{
|
||||
parent.layer.alert(data.msg, {
|
||||
parent.tip(data.msg);
|
||||
/* parent.layer.alert(data.msg, {
|
||||
icon: 0,
|
||||
shadeClose: false,
|
||||
title: '提示'
|
||||
},function(index){
|
||||
parent.layer.close(index);
|
||||
});
|
||||
}); */
|
||||
}
|
||||
|
||||
//tip(data.msg);
|
||||
}
|
||||
</script>
|
||||
|
|
@ -110,8 +110,12 @@ function formSubmit(){
|
|||
}
|
||||
|
||||
function callbackOrg(data){
|
||||
|
||||
if(data.success==true){
|
||||
parent.layer.alert(data.msg, {
|
||||
parent.tip(data.msg);
|
||||
parent.loadTree();
|
||||
location.reload();
|
||||
/* parent.layer.alert(data.msg, {
|
||||
icon: 1,
|
||||
shadeClose: false,
|
||||
title: '提示'
|
||||
|
|
@ -119,16 +123,18 @@ function callbackOrg(data){
|
|||
parent.loadTree();
|
||||
location.reload();
|
||||
parent.layer.close(index);
|
||||
});
|
||||
}); */
|
||||
}else{
|
||||
parent.layer.alert(data.msg, {
|
||||
parent.tip(data.msg);
|
||||
/* parent.layer.alert(data.msg, {
|
||||
icon: 0,
|
||||
shadeClose: false,
|
||||
title: '提示'
|
||||
},function(index){
|
||||
parent.layer.close(index);
|
||||
});
|
||||
}); */
|
||||
}
|
||||
|
||||
//tip(data.msg);
|
||||
}
|
||||
</script>
|
||||
|
|
@ -141,8 +141,12 @@ function formSubmit(){
|
|||
}
|
||||
|
||||
function callbackOrg(data){
|
||||
|
||||
if(data.success==true){
|
||||
parent.layer.alert(data.msg, {
|
||||
parent.tip(data.msg);
|
||||
parent.loadTree();
|
||||
location.reload();
|
||||
/* parent.layer.alert(data.msg, {
|
||||
icon: 1,
|
||||
shadeClose: false,
|
||||
title: '提示'
|
||||
|
|
@ -150,16 +154,18 @@ function callbackOrg(data){
|
|||
parent.loadTree();
|
||||
location.reload();
|
||||
parent.layer.close(index);
|
||||
});
|
||||
}); */
|
||||
}else{
|
||||
parent.layer.alert(data.msg, {
|
||||
parent.tip(data.msg);
|
||||
/* parent.layer.alert(data.msg, {
|
||||
icon: 0,
|
||||
shadeClose: false,
|
||||
title: '提示'
|
||||
},function(index){
|
||||
parent.layer.close(index);
|
||||
});
|
||||
}); */
|
||||
}
|
||||
|
||||
//tip(data.msg);
|
||||
}
|
||||
</script>
|
||||
|
|
@ -110,8 +110,12 @@ function formSubmit(){
|
|||
}
|
||||
|
||||
function callbackOrg(data){
|
||||
|
||||
if(data.success==true){
|
||||
parent.layer.alert(data.msg, {
|
||||
parent.tip(data.msg);
|
||||
parent.loadTree();
|
||||
location.reload();
|
||||
/* parent.layer.alert(data.msg, {
|
||||
icon: 1,
|
||||
shadeClose: false,
|
||||
title: '提示'
|
||||
|
|
@ -119,16 +123,18 @@ function callbackOrg(data){
|
|||
parent.loadTree();
|
||||
location.reload();
|
||||
parent.layer.close(index);
|
||||
});
|
||||
}); */
|
||||
}else{
|
||||
parent.layer.alert(data.msg, {
|
||||
parent.tip(data.msg);
|
||||
/* parent.layer.alert(data.msg, {
|
||||
icon: 0,
|
||||
shadeClose: false,
|
||||
title: '提示'
|
||||
},function(index){
|
||||
parent.layer.close(index);
|
||||
});
|
||||
}); */
|
||||
}
|
||||
|
||||
//tip(data.msg);
|
||||
}
|
||||
</script>
|
||||
|
|
@ -141,8 +141,12 @@ function formSubmit(){
|
|||
}
|
||||
|
||||
function callbackOrg(data){
|
||||
|
||||
if(data.success==true){
|
||||
parent.layer.alert(data.msg, {
|
||||
parent.tip(data.msg);
|
||||
parent.loadTree();
|
||||
location.reload();
|
||||
/* parent.layer.alert(data.msg, {
|
||||
icon: 1,
|
||||
shadeClose: false,
|
||||
title: '提示'
|
||||
|
|
@ -150,16 +154,18 @@ function callbackOrg(data){
|
|||
parent.loadTree();
|
||||
location.reload();
|
||||
parent.layer.close(index);
|
||||
});
|
||||
}); */
|
||||
}else{
|
||||
parent.layer.alert(data.msg, {
|
||||
parent.tip(data.msg);
|
||||
/* parent.layer.alert(data.msg, {
|
||||
icon: 0,
|
||||
shadeClose: false,
|
||||
title: '提示'
|
||||
},function(index){
|
||||
parent.layer.close(index);
|
||||
});
|
||||
}); */
|
||||
}
|
||||
|
||||
//tip(data.msg);
|
||||
}
|
||||
</script>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
<t:dgCol title="编号" field="id" hidden="true"></t:dgCol>
|
||||
<t:dgCol title="common.username" sortable="false" field="userName" width="100" query="true"></t:dgCol>
|
||||
<t:dgCol title="common.real.name" field="realName" query="true" width="100"></t:dgCol>
|
||||
<t:dgCol title="common.user.type" field="userType" dictionary="user_type" width="80"></t:dgCol>
|
||||
<t:dgCol title="common.status" sortable="true" field="status" width="100" replace="common.active_1,common.inactive_0,super.admin_-1"></t:dgCol>
|
||||
</t:datagrid>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue