瀏覽代碼

bug修复

laiguoran 3 年之前
父節點
當前提交
26b328baaa
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 3 3
      app/public/js/setting.js
  2. 2 1
      app/view/setting/user_permission.ejs

+ 3 - 3
app/public/js/setting.js

@@ -460,11 +460,11 @@ function checkUserForm(status) {
             }
             $('#add-user input[name="account"]').val(trimInvalidChar($('#add-user input[name="account"]').val()));
             $('#add-user input[name="name"]').val(trimInvalidChar($('#add-user input[name="name"]').val()));
-            $('#add-user input[name="company"]').val(trimInvalidChar($('#add-user input[name="company"]').val()));
+            // $('#add-user input[name="company"]').val(trimInvalidChar($('#add-user input[name="company"]').val()));
             $('#add-user input[name="role"]').val(trimInvalidChar($('#add-user input[name="role"]').val()));
             $('#add-user input[name="telephone"]').val(trimInvalidChar($('#add-user input[name="telephone"]').val()));
         } else {
-            if ($('#edit-user select[name="account_group"]').val() == 0) {
+            if ($('#edit-user input[name="account_group"]').val() == 0) {
                 throw '请选择账号组';
             }
             if ($('#edit-user input[name="account"]').val() == '' || $('#add-user input[name="account"]').hasClass('is-invalid')) {
@@ -481,7 +481,7 @@ function checkUserForm(status) {
             }
             $('#edit-user input[name="account"]').val(trimInvalidChar($('#edit-user input[name="account"]').val()));
             $('#edit-user input[name="name"]').val(trimInvalidChar($('#edit-user input[name="name"]').val()));
-            $('#edit-user input[name="company"]').val(trimInvalidChar($('#edit-user input[name="company"]').val()));
+            // $('#edit-user input[name="company"]').val(trimInvalidChar($('#edit-user input[name="company"]').val()));
             $('#edit-user input[name="role"]').val(trimInvalidChar($('#edit-user input[name="role"]').val()));
             $('#edit-user input[name="telephone"]').val(trimInvalidChar($('#edit-user input[name="telephone"]').val()));
         }

+ 2 - 1
app/view/setting/user_permission.ejs

@@ -29,7 +29,7 @@
                     </div>
                 </nav>
                 <div class="tab-content m-3">
-                    <div id="user-purview" class="tab-pane active">
+                    <div id="user-list" class="tab-pane active">
                         <div class="row">
                             <div class="col-3">
                                 <div class="list-group">
@@ -91,6 +91,7 @@
 </div>
 <script>
     const allPermission = JSON.parse('<%- permissionStr %>');
+    const unitList = JSON.parse(unescape('<%- escape(JSON.stringify(unitList)) %>'));
 </script>
 <script src="/public/js/setting.js"></script>
 <script>autoFlashHeight();</script>