Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

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()));
         }

app/view/login/wxproject.ejs

@@ -54,7 +54,7 @@
         </div>
         <% } %>
         <% } else { %>
-        <p class="text-muted">当前微信未绑定过任何计量项目，请扫码或搜索 关注“纵横造价”服务号绑定项目</p>
+        <p class="text-muted">当前微信未绑定过任何计量项目，请扫码或搜索 关注“纵横云计量”服务号绑定项目</p>
         <div class="w-50"><img class="w-100" src="/public/images/wechat.png"></div>
         <% } %>
     </div>

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>