From 9c87f0cc9d1b81307c96a54fd9d07cb191786604 Mon Sep 17 00:00:00 2001
From: chenjinlong <22208488@qq.com>
Date: Fri, 22 Jan 2021 16:16:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90DictType=E3=80=91=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=98=A0=E5=B0=84=20=E9=9D=99=E6=80=81?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dict/{dictionary.js => dictType.js}       | 17 ----------------
 .../modular/system/dict/dictType_edit.js      | 20 ++++++++-----------
 .../dict/{dictionary.html => dictType.html}   |  2 +-
 3 files changed, 9 insertions(+), 30 deletions(-)
 rename src/main/webapp/assets/modular/system/dict/{dictionary.js => dictType.js} (91%)
 rename src/main/webapp/pages/modular/system/dict/{dictionary.html => dictType.html} (99%)

diff --git a/src/main/webapp/assets/modular/system/dict/dictionary.js b/src/main/webapp/assets/modular/system/dict/dictType.js
similarity index 91%
rename from src/main/webapp/assets/modular/system/dict/dictionary.js
rename to src/main/webapp/assets/modular/system/dict/dictType.js
index 3ce48b95..9b148cc3 100644
--- a/src/main/webapp/assets/modular/system/dict/dictionary.js
+++ b/src/main/webapp/assets/modular/system/dict/dictType.js
@@ -186,23 +186,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu
         return false;
     });
 
-    /* 字典-点击表格头工具栏 */
-    // table.on('toolbar(dictTable)', function (obj) {
-    //     if (obj.event === 'add') { // 添加
-    //         Dict.openAddDlg(dictTypeObj.data);
-    //     } else if (obj.event === 'del') { // 删除
-    //         var checkRows = table.checkStatus('dictTable');
-    //         if (checkRows.data.length === 0) {
-    //             layer.msg('请选择要删除的数据', {icon: 2});
-    //             return;
-    //         }
-    //         var ids = checkRows.data.map(function (d) {
-    //             return d.dictDataId;
-    //         });
-    //         doDel2({ids: ids});
-    //     }
-    // });
-
     /* 字典-渲染表格 */
     var dictTable = table.render({
         elem: '#dictTable',
diff --git a/src/main/webapp/assets/modular/system/dict/dictType_edit.js b/src/main/webapp/assets/modular/system/dict/dictType_edit.js
index 7aad296d..23b50583 100644
--- a/src/main/webapp/assets/modular/system/dict/dictType_edit.js
+++ b/src/main/webapp/assets/modular/system/dict/dictType_edit.js
@@ -5,27 +5,23 @@ layui.use(['form', 'admin', 'HttpRequest'], function () {
     var HttpRequest = layui.HttpRequest;
 
     //获取详情信息，填充表单
-	var request = new HttpRequest(Feng.ctxPath + "/dictType/getDictDetail?dictTypeId=" + Feng.getUrlParam("dictTypeId"), 'get', function (result) {
-		if(result.data.dictTypeClass === 2){
-			$('input,select,textarea').attr("disabled",true).attr('readonly',true);
-		}
-		form.val('dictTypeForm', result.data);
-	}, function (data) {
-		Feng.error("加载失败！" + data.message);
-	});
-	request.start();
+    var request = new HttpRequest(Feng.ctxPath + "/dictType/getDictDetail?dictTypeId=" + Feng.getUrlParam("dictTypeId"), 'get');
+    var result = request.start();
+    form.val('dictTypeForm', result.data);
+    if(result.data.dictTypeClass === 2){
+        $('input,select,textarea').attr("disabled",true).attr('readonly',true);
+    }
 
     //表单提交事件
     form.on('submit(btnSubmit)', function (data) {
         var request = new HttpRequest(Feng.ctxPath + "/dictType/updateDictType", 'post', function (data) {
             admin.closeThisDialog();
-            Feng.success("更新成功！");
+            Feng.success("修改成功！");
             admin.putTempData('formOk', true);
         }, function (data) {
             admin.closeThisDialog();
-            Feng.error("更新失败！" + data.message);
+            Feng.error("修改失败！" + data.message);
         });
-
         request.set(data.field);
         request.start(true);
     
diff --git a/src/main/webapp/pages/modular/system/dict/dictionary.html b/src/main/webapp/pages/modular/system/dict/dictType.html
similarity index 99%
rename from src/main/webapp/pages/modular/system/dict/dictionary.html
rename to src/main/webapp/pages/modular/system/dict/dictType.html
index efbcf182..7955bded 100644
--- a/src/main/webapp/pages/modular/system/dict/dictionary.html
+++ b/src/main/webapp/pages/modular/system/dict/dictType.html
@@ -1,4 +1,4 @@
-@layout("/layout/_container.html",{js:["/assets/modular/system/dict/dictionary.js"]}){
+@layout("/layout/_container.html",{js:["/assets/modular/system/dict/dictType.js"]}){
 <style>
     #dictTypeTable + .layui-table-view .layui-table-tool-temp {
         padding-right: 0;