gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突 提交本地

Browse Source
This commit is contained in:
zhangshilin
2018-03-17 17:09:19 +08:00
parent b96389e37f
commit d5a2a32c51
25 changed files with 2737 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp
View File

@@ -300,7 +300,7 @@
<li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)"><spring:message code="edit"/></a></li>
</shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/basics/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
<li><a href="${ctx}/basics/serviceDictInfo/delete?mulitId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
</shiro:hasPermission>
</ul>

2
src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
View File

@@ -293,7 +293,7 @@
<li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)"><spring:message code="edit"/></a></li>
</shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/basics/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
<li><a href="${ctx}/basics/serviceDictInfo/delete?mulitId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
</shiro:hasPermission>
</ul>

2
src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
View File

@@ -296,7 +296,7 @@
<li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)"><spring:message code="edit"/></a></li>
</shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
<li><a href="${ctx}/basics/sysDictInfo/delete?mulitId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
</shiro:hasPermission>
</ul>

2
src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
View File

@@ -296,7 +296,7 @@
<li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)"><spring:message code="edit"/></a></li>
</shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
<li><a href="${ctx}/basics/sysDictInfo/delete?mulitId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
</shiro:hasPermission>
</ul>