From 02e2d3d4ca1b74203f543c9f4ca5bad61703cf6a Mon Sep 17 00:00:00 2001 From: lin <290541200@qq.com> Date: Tue, 15 Dec 2020 08:56:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E6=AC=A1=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E6=A8=A1=E5=9D=97=20?= =?UTF-8?q?=E5=8F=AA=E8=AF=BB=20=E9=BB=98=E8=AE=A4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- province-platform/pom.xml | 2 +- ruoyi-admin/pom.xml | 3 +- .../templates/platform/econtype/add.html | 4 +- .../main/resources/vm/html/col2/add.html.vm | 43 ++- .../resources/vm/html/col2/addback2.html.vm | 312 ++++++++++++++++++ sql/脚本/2020/14/单据前缀.sql | 22 ++ 7 files changed, 364 insertions(+), 24 deletions(-) create mode 100644 ruoyi-generator/src/main/resources/vm/html/col2/addback2.html.vm create mode 100644 sql/脚本/2020/14/单据前缀.sql diff --git a/pom.xml b/pom.xml index adfeb487c..61e1fac7e 100644 --- a/pom.xml +++ b/pom.xml @@ -215,7 +215,7 @@ ${ruoyi.version} - + com.ruoyi province-platform diff --git a/province-platform/pom.xml b/province-platform/pom.xml index 0b98a83d2..84594909b 100644 --- a/province-platform/pom.xml +++ b/province-platform/pom.xml @@ -13,7 +13,7 @@ - 平台模块 + 平台基础资料模块 diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index c4d9b55c0..e73c854b8 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -79,13 +79,12 @@ ruoyi-generator - + com.ruoyi province-platform - diff --git a/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html b/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html index dc73b681c..cc382242d 100644 --- a/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html +++ b/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html @@ -51,10 +51,10 @@ - +
- +
diff --git a/ruoyi-generator/src/main/resources/vm/html/col2/add.html.vm b/ruoyi-generator/src/main/resources/vm/html/col2/add.html.vm index 374c614d3..a75e07da2 100644 --- a/ruoyi-generator/src/main/resources/vm/html/col2/add.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/col2/add.html.vm @@ -27,43 +27,50 @@ #if($table.sub)

${functionName}信息

#end - -
#set($cumvar=0) -#set($field=$column.javaField) #set($colcount=$effectivecols.size()) #foreach($column in $effectivecols) -#set($field=$column.javaField) +#if($column.edit && !$column.pk) +#if(($column.usableColumn) || (!$column.superColumn)) #set($parentheseIndex=$column.columnComment.indexOf("（")) #if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) #else -#set($comment=$column.columnComment) + #set($comment=$column.columnComment) #end +#set($field=$column.javaField) #set($dictType=$column.dictType) - #set($cumvar=$cumvar+1) #if($column.htmlType == "textarea") #if($cumvar%2==0) - + + #end -
- -
- -
-
+
+
+
+ +
+ +
+
+
+
#else #if($cumvar%2==1) -
+
+
#end -#parse("\vm\html\col2\formtpl.vm") +#parse("\vm\html\col2\formedittpl.vm") #if($cumvar%2==0 || ($cumvar>=$colcount)) -
+
+
#end #end #end -
+#end +#end + #*
## col-md-6 #foreach($column in $effectivecols) diff --git a/ruoyi-generator/src/main/resources/vm/html/col2/addback2.html.vm b/ruoyi-generator/src/main/resources/vm/html/col2/addback2.html.vm new file mode 100644 index 000000000..374c614d3 --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/html/col2/addback2.html.vm @@ -0,0 +1,312 @@ + + + + +#foreach($column in $columns) +#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime") + + #break +#end +#end +#foreach($column in $columns) +#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "upload") + + #break +#end +#end +#foreach($column in $columns) +#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "summernote") + + #break +#end +#end + + +
+
+#if($table.sub) +

${functionName}信息

+#end + +
+#set($cumvar=0) +#set($field=$column.javaField) +#set($colcount=$effectivecols.size()) +#foreach($column in $effectivecols) +#set($field=$column.javaField) +#set($parentheseIndex=$column.columnComment.indexOf("（")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#set($dictType=$column.dictType) + +#set($cumvar=$cumvar+1) +#if($column.htmlType == "textarea") +#if($cumvar%2==0) +
+#end +
+ +
+ +
+
+#else +#if($cumvar%2==1) +
+#end +#parse("\vm\html\col2\formtpl.vm") +#if($cumvar%2==0 || ($cumvar>=$colcount)) +
+#end +#end +#end + +#* +
## col-md-6 + #foreach($column in $effectivecols) + #set($field=$column.javaField) + ##if($column.insert && !$column.pk) + ##if(($column.usableColumn) || (!$column.superColumn)) + #set($parentheseIndex=$column.columnComment.indexOf("（")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #set($dictType=$column.dictType) + + ##set($cumvar=$cumvar+1) + ##if($cumvar%2==1) + #parse("vm/html/formtpl.vm") + ##end + + ##end + ##end + #end +*# + + + #if($table.sub) +

${subTable.functionName}信息

+
+
+ + +
+
+
+
+
+ #end + +
+ + #foreach($column in $columns) + #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime") + + #break + #end + #end + #foreach($column in $columns) + #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "upload") + + #break + #end + #end + #foreach($column in $columns) + #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "summernote") + + #break + #end + #end + + + \ No newline at end of file diff --git a/sql/脚本/2020/14/单据前缀.sql b/sql/脚本/2020/14/单据前缀.sql new file mode 100644 index 000000000..7921bac0c --- /dev/null +++ b/sql/脚本/2020/14/单据前缀.sql @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('单据号迭代信息', '3', '1', '/config/no', 'C', '0', 'config:no:view', '#', 'admin', sysdate(), '', null, '单据号迭代信息菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('单据号迭代信息查询', @parentId, '1', '#', 'F', '0', 'config:no:list', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('单据号迭代信息新增', @parentId, '2', '#', 'F', '0', 'config:no:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('单据号迭代信息修改', @parentId, '3', '#', 'F', '0', 'config:no:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('单据号迭代信息删除', @parentId, '4', '#', 'F', '0', 'config:no:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('单据号迭代信息导出', @parentId, '5', '#', 'F', '0', 'config:no:export', '#', 'admin', sysdate(), '', null, '');