Merge remote-tracking branch 'origin/group1-dict'

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) {
+            var httpRequest = new HttpRequest(Feng.ctxPath + "/dict/deleteDict", 'post', function (data) {
-            //     Feng.success("删除成功!");
+                Feng.success("删除成功!");
-            //     Dict.search();
+                Dict.search();
-            // }, function (data) {
+            }, function (data) {
-            //     Feng.error("删除失败!" + data.responseJSON.message + "!");
+                Feng.error("删除失败!" + data.message + "!");
-            // });
+            });
-            // ajax.set("dictId", data.dictId);
+            httpRequest.set(data);
-            // ajax.start();
+            httpRequest.start(true);
         };
         Feng.confirm("是否删除?", operation);
     };

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: '字典描述'},

src/main/webapp/pages/modular/system/dict/dict_add.html

@@ -20,12 +20,24 @@
                             <input id="dictName" name="dictName" placeholder="请输入字典名称" type="text" class="layui-input" lay-verify="required" required/>
                         </div>
                     </div>
+                    <div class="layui-inline layui-col-md12">
+                        <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-md12">
                         <label class="layui-form-label">字典编码<span style="color: red;">*</span></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-md12">
+                        <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">上级字典<span style="color: red;">*</span></label>
                         <div class="layui-input-block">

src/main/webapp/pages/modular/system/dict/dict_edit.html

@@ -21,12 +21,24 @@
                             <input id="dictName" name="dictName" placeholder="请输入字典名称" type="text" class="layui-input" lay-verify="required" required/>
                         </div>
                     </div>
+                    <div class="layui-inline layui-col-md12">
+                        <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-md12">
                         <label class="layui-form-label">字典编码<span style="color: red;">*</span></label>
                         <div class="layui-input-block">
                             <input id="dictCode" name="dictCode" placeholder="请输入字典编码" type="text" class="layui-input layui-disabled" lay-verify="required" disabled required/>
                         </div>
                     </div>
+                    <div class="layui-inline layui-col-md12">
+                        <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">上级字典<span style="color: red;">*</span></label>
                         <div class="layui-input-block">