diff --git a/src/main/webapp/assets/modular/system/dict/dict.js b/src/main/webapp/assets/modular/system/dict/dict.js index efcb0e7f..79e3e426 100644 --- a/src/main/webapp/assets/modular/system/dict/dict.js +++ b/src/main/webapp/assets/modular/system/dict/dict.js @@ -23,7 +23,6 @@ layui.use(['table', 'treeTable', 'func', 'HttpRequest'], function () { {type: 'checkbox'}, {field: 'dictName', align: "center", title: '字典名称'}, {field: 'dictCode', align: "center", title: '字典编码'}, - {field: 'dictNamePinYin', align: "center", title: '字典拼音'}, {align: 'center', toolbar: '#tableBar', title: '操作'} ]; }; @@ -43,7 +42,7 @@ layui.use(['table', 'treeTable', 'func', 'HttpRequest'], function () { */ Dict.openAddDlg = function () { func.open({ - height: 550, + height: 680, title: '添加字典', content: Feng.ctxPath + '/view/dict/addView?dictTypeId=' + $("#dictTypeId").val(), tableId: Dict.tableId, @@ -60,7 +59,7 @@ layui.use(['table', 'treeTable', 'func', 'HttpRequest'], function () { */ Dict.openEditDlg = function (data) { func.open({ - height: 550, + height: 680, title: '修改字典', content: Feng.ctxPath + '/view/dict/editView?dictId=' + data.dictId, tableId: Dict.tableId, @@ -77,14 +76,14 @@ layui.use(['table', 'treeTable', 'func', 'HttpRequest'], function () { */ Dict.onDeleteItem = function (data) { var operation = function () { - // var ajax = new $ax(Feng.ctxPath + "/dict/delete", function (data) { - // Feng.success("删除成功!"); - // Dict.search(); - // }, function (data) { - // Feng.error("删除失败!" + data.responseJSON.message + "!"); - // }); - // ajax.set("dictId", data.dictId); - // ajax.start(); + var httpRequest = new HttpRequest(Feng.ctxPath + "/dict/deleteDict", 'post', function (data) { + Feng.success("删除成功!"); + Dict.search(); + }, function (data) { + Feng.error("删除失败!" + data.message + "!"); + }); + httpRequest.set(data); + httpRequest.start(true); }; Feng.confirm("是否删除?", operation); }; diff --git a/src/main/webapp/assets/modular/system/dictType/dictType.js b/src/main/webapp/assets/modular/system/dictType/dictType.js index 769279e8..f51d3665 100644 --- a/src/main/webapp/assets/modular/system/dictType/dictType.js +++ b/src/main/webapp/assets/modular/system/dictType/dictType.js @@ -34,7 +34,7 @@ layui.use(['table', 'func', 'HttpRequest', 'form'], function () { } } }, - {field: 'dictTypeNamePinYin', align: "center", sort: true, title: '名词拼音'}, + {field: 'dictTypeNamePinyin', align: "center", sort: true, title: '名词拼音'}, {field: 'dictTypeCode', align: "center", sort: true, title: '类型编码', minWidth: 166}, {field: 'dictTypeBusCode', align: "center", sort: true, title: '业务编码', minWidth: 166}, {field: 'dictTypeDesc', align: "center", sort: true, title: '字典描述'}, diff --git a/src/main/webapp/pages/modular/system/dict/dict_add.html b/src/main/webapp/pages/modular/system/dict/dict_add.html index d9503be7..dabf742f 100644 --- a/src/main/webapp/pages/modular/system/dict/dict_add.html +++ b/src/main/webapp/pages/modular/system/dict/dict_add.html @@ -20,12 +20,24 @@ +
+ +
+ +
+
+
+ +
+ +
+
diff --git a/src/main/webapp/pages/modular/system/dict/dict_edit.html b/src/main/webapp/pages/modular/system/dict/dict_edit.html index c93fb215..783262a2 100644 --- a/src/main/webapp/pages/modular/system/dict/dict_edit.html +++ b/src/main/webapp/pages/modular/system/dict/dict_edit.html @@ -21,12 +21,24 @@
+
+ +
+ +
+
+
+ +
+ +
+