From 02f8a3fe1fe54980fb55f4655c8e46fb782525a2 Mon Sep 17 00:00:00 2001 From: zxm <154040976@qq.com> Date: Thu, 30 Mar 2023 21:35:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=B7=E5=81=87=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=EF=BC=8C=E6=8A=A5=E9=94=99=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/ftl/act/leave/add-leave.ftl | 6 -- .../resources/ftl/act/leave/leaveList.ftl | 69 ++++++------------- 2 files changed, 21 insertions(+), 54 deletions(-) diff --git a/len-activiti/src/main/resources/ftl/act/leave/add-leave.ftl b/len-activiti/src/main/resources/ftl/act/leave/add-leave.ftl index dd70421..91c6a8f 100644 --- a/len-activiti/src/main/resources/ftl/act/leave/add-leave.ftl +++ b/len-activiti/src/main/resources/ftl/act/leave/add-leave.ftl @@ -1,8 +1,3 @@ -<#--Created by IntelliJ IDEA. -User: zxm -Date: 2017/12/20 -Time: 10:00 -To change this template use File | Settings | File Templates.--> @@ -86,7 +81,6 @@ To change this template use File | Settings | File Templates.--> layui.use(['form', 'layer'], function () { $ = layui.jquery; var form = layui.form - , layer = layui.layer , laydate = layui.laydate; var d = new Date(); var day = d.getFullYear() + "-" + (parseInt(d.getMonth()) + 1) + '-' + d.getDate(); diff --git a/len-activiti/src/main/resources/ftl/act/leave/leaveList.ftl b/len-activiti/src/main/resources/ftl/act/leave/leaveList.ftl index c933605..b474644 100644 --- a/len-activiti/src/main/resources/ftl/act/leave/leaveList.ftl +++ b/len-activiti/src/main/resources/ftl/act/leave/leaveList.ftl @@ -1,35 +1,15 @@ -<#-- Created by IntelliJ IDEA. - User: zxm - Date: 2018/1/15 - Time: 16:53 - To change this template use File | Settings | File Templates. -流程部署--> - - - - - 请假流程示例 - <#include "/system/base/head.ftl"> - - - +<#include "/system/base/head.ftl"> + +<#--搜索区域-->
-
- 开始时间： - - - - 结束时间： - - - -
+ +<#--按钮-->
+<#--表格-->
+ + +<#--表格toolbar--> + + + + + + - - -- Gitee From e1af5a3e4b77e555df8a338cfbae7a710f0dae58 Mon Sep 17 00:00:00 2001 From: zxm <154040976@qq.com> Date: Thu, 30 Mar 2023 22:45:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E=E6=94=B9=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/ftl/system/base/formHead.ftl | 1 + .../main/resources/ftl/system/base/head.ftl | 4 +- .../resources/ftl/system/depart/userList.ftl | 300 ------------------ .../src/main/resources/ftl/system/job/add.ftl | 2 +- .../main/resources/ftl/system/menu/add.ftl | 31 +- .../resources/ftl/system/menu/menuList.ftl | 10 +- .../main/resources/ftl/system/menu/update.ftl | 13 +- .../main/resources/ftl/system/role/add.ftl | 2 +- .../main/resources/ftl/system/role/update.ftl | 2 +- .../main/resources/ftl/system/user/add.ftl | 11 +- .../src/main/resources/plugin/html/icon.html | 12 +- .../src/main/resources/plugin/tools/tool.js | 10 +- 12 files changed, 62 insertions(+), 336 deletions(-) delete mode 100644 len-sys/src/main/resources/ftl/system/depart/userList.ftl diff --git a/len-sys/src/main/resources/ftl/system/base/formHead.ftl b/len-sys/src/main/resources/ftl/system/base/formHead.ftl index 6650071..4c93aa1 100644 --- a/len-sys/src/main/resources/ftl/system/base/formHead.ftl +++ b/len-sys/src/main/resources/ftl/system/base/formHead.ftl @@ -5,6 +5,7 @@ form表单 引用 --> <#include "system/base/head.ftl"> + \ No newline at end of file + + diff --git a/len-sys/src/main/resources/ftl/system/depart/userList.ftl b/len-sys/src/main/resources/ftl/system/depart/userList.ftl deleted file mode 100644 index 423fa22..0000000 --- a/len-sys/src/main/resources/ftl/system/depart/userList.ftl +++ /dev/null @@ -1,300 +0,0 @@ - -
-
- 用户名： - - - - 用户名： - - - -
-
- - -
-
-
-
- <@shiro.hasPermission name="user:select"> - - - <@shiro.hasPermission name="user:select"> - - - <@shiro.hasPermission name="user:del"> - - - <@shiro.hasPermission name="user:repass"> - - -
-
-
- - - - - diff --git a/len-sys/src/main/resources/ftl/system/job/add.ftl b/len-sys/src/main/resources/ftl/system/job/add.ftl index bb222d7..4541485 100644 --- a/len-sys/src/main/resources/ftl/system/job/add.ftl +++ b/len-sys/src/main/resources/ftl/system/job/add.ftl @@ -1,4 +1,4 @@ -<#include "/system/base/head.ftl"> +<#include "/system/base/formHead.ftl">
diff --git a/len-sys/src/main/resources/ftl/system/menu/add.ftl b/len-sys/src/main/resources/ftl/system/menu/add.ftl index 78bf383..6748e7f 100644 --- a/len-sys/src/main/resources/ftl/system/menu/add.ftl +++ b/len-sys/src/main/resources/ftl/system/menu/add.ftl @@ -1,4 +1,4 @@ -<#include "/system/base/head.ftl"> +<#include "/system/base/formHead.ftl">
@@ -9,6 +9,8 @@
+ + <#--类型-->
+ + <#--父级菜单-->
+ + <#--名称-->
+ + <#--url-->
-
+ <#--权限--> +
@@ -65,15 +74,17 @@ autocomplete="off" class="layui-input">
+ + <#--图标-->
-