Merge remote-tracking branch 'origin/master'

uis/views/customer/index.html

@@ -133,6 +133,22 @@
         </div>
     </div>
 </div>
+
+<script type="text/html" id="customer_datagrid-operate-bar">
+    <div class="layui-btn-group">
+        <a class="layui-btn layui-btn-xs" lay-event="customer_search"
+            >查看</a>
+    </div>
+    <div class="layui-btn-group">
+        <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="add_review"
+            >跟踪报告</a>
+    </div>
+    <div class="layui-btn-group">
+          <a class="layui-btn layui-btn-xs layui-btn-warm" data-permission="inner_review" lay-event="internal_trace"
+            >内部跟踪</a>
+    </div>
+</script>
+
 <script src="../../layuiadmin/layui/layui.js?t=1"></script>
 <script>
     layui.config({
@@ -180,28 +196,6 @@
             ]]
         });
 
-        //操作栏的模板字符串
-        var templateToolbar = `<div class="layui-btn-group">
-            <a class="layui-btn layui-btn-xs" lay-event="customer_search"
-            >查看</a>
-            <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="add_review"
-            >跟踪报告</a>
-            <a class="layui-btn layui-btn-xs layui-btn-warm" lay-event="internal_trace"
-            >内部跟踪</a>
-        </div>`;
-
-        //判断内部跟踪权限
-        var permissions = layui.data(layui.setter.tableName)['permissions'];
-        var is_has = permissions.indexOf('inner_review') !== -1;
-        if (!is_has) {
-            templateToolbar = `<div class="layui-btn-group">
-                <a class="layui-btn layui-btn-xs" lay-event="customer_search"
-                >查看</a>
-                <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="add_review"
-                >跟踪报告</a>
-            </div>`;
-        }
-
         table.render({
             elem: '#customer_datagrid'
             , url: '/customer/new_customer/'
@@ -227,10 +221,13 @@
                 , {field: 'create_time_f', title: '建档时间', width: 150}
                 , {field: 'create_user_text', title: '建档人', width: 100}
                 , {field: 'notes', title: '备注', width: 200}
-                , {width: is_has ? 220 : 160, align: 'center', fixed: 'right', toolbar: templateToolbar}
+                , {width: 220, align: 'center', fixed: 'right', toolbar: "#customer_datagrid-operate-bar"}
             ]]
             , page: true
             , height: 'full-108'
+            , done: function () {
+                layui.index.removeNoPermButtons();
+            }
         });
 
         var manager_stores = layui.data(layui.setter.tableName)['manager_stores'];