gitee
/
guns
mirror of https://gitee.com/stylefeng/guns
1
0
Fork 0
Code Issues Releases Wiki Activity

【dict】【config】【organization】修改查询标题 调整系统配置新增字典目录

pull/64/head
chenjinlong 2021-01-26 17:36:21 +08:00
parent c666b24710
commit cc15723acb
12 changed files with 119 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/cn/stylefeng/guns/modular/system/config/ConfigViewController.java
View File

@ -23,7 +23,6 @@ public class ConfigViewController {
@GetResource(name = "系统配置-列表-视图", path = "/view/config")
public String indexView() {
return "/modular/system/config/config.html";
//return "/modular/system/config/sysConfig.html";
}
/**
@ -37,17 +36,6 @@ public class ConfigViewController {
return "/modular/system/config/sysConfig_add.html";
}
/**
* 系统配置—新增-视图
*
* @author jiawei
* @date 2021/1/4 13:34
*/
@GetResource(name = "系统配置—新增-视图", path = "/view/config/addConfigDictView")
public String addConfigDictView() {
return "/modular/system/config/config_add.html";
}
/**
* 系统配置-修改-视图
*

24
src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java
View File

@ -36,6 +36,30 @@ public class DictViewController {
return "/modular/system/dict/dict_add.html";
}
/**
* 字典管理-添加翻译字典-视图
*
* @author chenjinlong
* @date 2021/1/22 16:09
*/
@GetResource(name = "字典管理-添加翻译字典-视图", path = "/view/dict/addTranslationView")
public String addTranslationView() {
return "/modular/system/dict/dict_add_translation.html";
}
/**
* 字典管理-添加系统配置字典-视图
*
* @author chenjinlong
* @date 2021/1/22 16:09
*/
@GetResource(name = "字典管理-添加系统配置字典-视图", path = "/view/dict/addConfigView")
public String addConfigView() {
return "/modular/system/dict/dict_add_config.html";
}
/**
* 字典管理-编辑-视图
*

11
src/main/resources/db/migration/V1.0_20210126_0001__update_translation.sql Normal file
View File

@ -0,0 +1,11 @@
INSERT INTO `guns_beetl_dev`.`sys_dict` (`dict_id`, `dict_code`, `dict_name`, `dict_name_pinyin`, `dict_encode`, `dict_type_code`, `dict_short_name`, `dict_short_code`, `dict_parent_id`, `status_flag`, `dict_sort`, `dict_pids`, `del_flag`, `create_time`, `create_user`, `update_time`, `update_user`) VALUES (1353998066804658177, 'chinese', '中文', 'zw', NULL, 'languages', '', '', -1, 1, 1.00, '-1', 'N', '2021-01-26 17:27:50', 1339550467939639299, NULL, NULL);
INSERT INTO `guns_beetl_dev`.`sys_dict` (`dict_id`, `dict_code`, `dict_name`, `dict_name_pinyin`, `dict_encode`, `dict_type_code`, `dict_short_name`, `dict_short_code`, `dict_parent_id`, `status_flag`, `dict_sort`, `dict_pids`, `del_flag`, `create_time`, `create_user`, `update_time`, `update_user`) VALUES (1353998106784763906, 'english', '英文', 'yw', NULL, 'languages', '', '', -1, 1, 2.00, '-1', 'N', '2021-01-26 17:27:59', 1339550467939639299, NULL, NULL);
INSERT INTO `guns_beetl_dev`.`sys_dict_type` (`dict_type_id`, `dict_type_class`, `dict_type_bus_code`, `dict_type_code`, `dict_type_name`, `dict_type_name_pinyin`, `dict_type_desc`, `status_flag`, `dict_type_sort`, `del_flag`, `create_time`, `create_user`, `update_time`, `update_user`) VALUES (1353997993299480577, 2, '', 'languages', '语种', 'yz', 'i18n 多语言', 1, 7.00, 'N', '2021-01-26 17:27:32', 1339550467939639299, NULL, NULL);
ALTER TABLE `sys_translation` CHANGE COLUMN `language` `tran_language_code` varchar(255) NOT NULL COMMENT '语种字典';
update sys_translation set tran_language_code='chinese' where tran_language_code='1';
update sys_translation set tran_language_code='english' where tran_language_code='2';

2
src/main/webapp/assets/modular/system/config/config.js
View File

@ -107,7 +107,7 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu
func.open({
height: 680,
title: '添加字典',
content: Feng.ctxPath + '/view/config/addConfigDictView',
content: Feng.ctxPath + '/view/dict/addConfigView',
tableId: DictType.tableId
});
};

0
src/main/webapp/assets/modular/system/config/config_add.js → src/main/webapp/assets/modular/system/dict/dict_add_config.js
View File

25
src/main/webapp/assets/modular/system/dict/dict_add_translation.js Normal file
View File

@ -0,0 +1,25 @@
layui.use(['form', 'admin', 'HttpRequest'], function () {
var $ = layui.jquery;
var form = layui.form;
var admin = layui.admin;
var HttpRequest = layui.HttpRequest;
//获取信息详情填充表单
var request = new HttpRequest(Feng.ctxPath + '/dictType/getTranslationDetail', 'get');
var result = request.start();
form.val('dictForm', result.data);
//表单提交事件
form.on('submit(btnSubmit)', function (data) {
var request = new HttpRequest(Feng.ctxPath + "/dict/addDict", 'post', function (data) {
admin.closeThisDialog();
Feng.success("添加成功！");
admin.putTempData('formOk', true);
}, function (data) {
admin.closeThisDialog();
Feng.error("添加失败！" + data.message);
});
request.set(data.field);
request.start(true);
});
});

2
src/main/webapp/pages/modular/system/config/config.html
View File

@ -57,13 +57,11 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">名称:</label>
<div class="layui-input-inline">
<input name="configName" class="layui-input" placeholder="输入字典名称"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">编码:</label>
<div class="layui-input-inline">
<input name="configCode" class="layui-input" placeholder="输入字典键值"/>
</div>

2
src/main/webapp/pages/modular/system/dict/dictType.html
View File

@ -57,13 +57,11 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">字典名称:</label>
<div class="layui-input-inline">
<input name="dictName" class="layui-input" placeholder="输入字典名称"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">字典编码:</label>
<div class="layui-input-inline">
<input name="dictCode" class="layui-input" placeholder="输入字典键值"/>
</div>

2
src/main/webapp/pages/modular/system/config/config_add.html → src/main/webapp/pages/modular/system/dict/dict_add_config.html
View File

@ -1,4 +1,4 @@
@layout("/layout/_form.html",{js:["/assets/modular/system/config/config_add.js"]}){
@layout("/layout/_form.html",{js:["/assets/modular/system/dict/dict_add_config.js"]}){
<form class="layui-form" id="dictForm" lay-filter="dictForm">
<div class="layui-fluid" style="padding-bottom: 75px;">

57
src/main/webapp/pages/modular/system/dict/dict_add_translation.html Normal file
View File

@ -0,0 +1,57 @@
@layout("/layout/_form.html",{js:["/assets/modular/system/dict/dict_add_translation.js"]}){
<form class="layui-form" id="dictForm" lay-filter="dictForm">
<div class="layui-fluid" style="padding-bottom: 75px;">
<div class="layui-card">
<div class="layui-card-body">
<div class="layui-form-item layui-row">
<input id="dictTypeId" name="dictTypeId" type="hidden"/>
<input id="dictTypeCode" name="dictTypeCode" type="hidden"/>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label layui-form-required">字典类型</label>
<div class="layui-input-block">
<input id="dictTypeName" name="dictTypeName" placeholder="" type="text" class="layui-input" lay-verify="required" readonly/>
</div>
</div>
<div class="layui-inline layui-col-md6">
<label class="layui-form-label layui-form-required">字典名称</label>
<div class="layui-input-block">
<input id="dictName" name="dictName" placeholder="请输入字典名称" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
<div class="layui-inline layui-col-md6">
<label class="layui-form-label">字典简称</label>
<div class="layui-input-block">
<input id="dictShortName" name="dictShortName" placeholder="请输入简称" type="text" class="layui-input"/>
</div>
</div>
<div class="layui-inline layui-col-md6">
<label class="layui-form-label layui-form-required">字典编码</label>
<div class="layui-input-block">
<input id="dictCode" name="dictCode" placeholder="请输入字典编码" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
<div class="layui-inline layui-col-md6">
<label class="layui-form-label">编码简写</label>
<div class="layui-input-block">
<input id="dictShortCode" name="dictShortCode" placeholder="请输入编码简写" type="text" class="layui-input"/>
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">排序</label>
<div class="layui-input-block">
<input id="dictSort" name="dictSort" placeholder="请输入字典排序" type="text" class="layui-input" lay-verify="required" required>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="form-group-bottom text-center">
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
<button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;取消&emsp;</button>
</div>
</form>
@}

2
src/main/webapp/pages/modular/system/organization/organization.html
View File

@ -70,13 +70,11 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">组织名称:</label>
<div class="layui-input-inline">
<input name="orgName" class="layui-input" placeholder="组织名称"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">组织编码:</label>
<div class="layui-input-inline">
<input name="orgCode" class="layui-input" placeholder="组织编码"/>
</div>

2
src/main/webapp/pages/modular/system/user/user.html
View File

@ -70,13 +70,11 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">账号:</label>
<div class="layui-input-inline">
<input name="account" class="layui-input" type="text" placeholder="账号"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">姓名:</label>
<div class="layui-input-inline">
<input name="realName" class="layui-input" type="text" placeholder="姓名"/>
</div>