Merge branch 'master-500-dev-xwx' into 'master-500-dev'

用户管理-【用户管理】-新建用户布局名称和编辑下布局名称不同



See merge request !971

@@ -27,7 +27,7 @@ layui.define(['commonDetail', 'common'], function (exports) {
         // Start Wang 2022/3/25 20:32 KPIFA92AF2D指标修改为KPI143DBD5B
         var interfacekpi = "KPIFABFD741,KPI73C0F7E7,KPI143DBD5B";
         //存储信息
-        var storagekpi = "KPIFB844B8B,KPI5E148DBE,KPIE55684DF,KPIDBFA1EE2";
+        var storagekpi = "KPIFABFD741,KPIFB844B8B,KPI5E148DBE,KPIE55684DF,KPIDBFA1EE2";
 
         reload();
 

@@ -182,7 +182,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
         }
 
         // 表单提交事件
-        form.on('submit(form-restypepage-edit)', function (data) {
+        form.on('submit(btn-restypepage-submit)', function (data) {
             loading = layer.load(2);
             var restypePage = {
                 id: id,
@@ -280,4 +280,4 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
             form.render();
         });
     });
-});
\ No newline at end of file
+});

@@ -81,11 +81,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 contentType: "application/json; charset=utf-8",
                 success: function (res) {
                     if (res.resp_code == 0) {
-                        var msg = res.resp_msg;
-                        if (reloadFlg) {
-                            msg += "，扩展信息更新，即将刷新页面！";
-                        }
-                        layer.msg(msg, {
+                        layer.msg(res.resp_msg, {
                             offset: '15px',
                             icon: 1,
                             time: 2000,
@@ -93,10 +89,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                             layer.closeAll()
                             table.reload('user_table', {});
                             form.render();
-
-                            if (reloadFlg) {
-                                window.location.reload();
-                            }
                         })
                     } else {
                         layer.msg(res.resp_msg, {
@@ -317,8 +309,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                             '    <option value="" style="display:none;"></option>' + selectOption +
                             '</select>';
                     } else if (v.ddicCode == "userLayout") {
-                        var selectOption = '    <option value="layout">默认布局</option>' +
-                            '   <option value="layout-nx">layout-nx</option>';
+                        var selectOption = '    <option value="layout">简约布局</option>' +
+                            '   <option value="layout-nx">经典布局</option>';
 
                         str = '<select data-property="' + v.ddicCode + '" placeholder="' + v.ddicDesc + '" data-id="" data-username="" data-sort="" data-remark="" class="select layui-select select-input-my" name="' + v.ddicCode + '" autocomplete="off">' +
                             '    <option value="" style="display:none;"></option>' + selectOption +

@@ -81,7 +81,7 @@
         <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
       </div>
     </div>
-    <button id="btn-restypepage-submit" class="hide" lay-submit lay-filter="kpi-flag-submit">提交</button>
+    <button id="btn-restypepage-submit" class="hide" lay-submit lay-filter="btn-restypepage-submit">提交</button>
   </form>
   <form class="layui-form layui-form-pane" onsubmit="return false">
     <fieldset class="layui-elem-field layui-field-title">