소스 검색

跟踪报告

wushaodong 4 년 전
부모
커밋
f0f0816ed8
3개의 변경된 파일25개의 추가작업 그리고 33개의 파일을 삭제
  1. 1 1
      apps/customer/filters.py
  2. 1 0
      apps/customer/views.py
  3. 23 32
      uis/views/customer/index.html

+ 1 - 1
apps/customer/filters.py

@@ -18,4 +18,4 @@ class NewCustomerFilter(django_filters.FilterSet):
 
     class Meta:
         model = NewCustomer
-        fields = '__all__'
+        fields = '__all__'

+ 1 - 0
apps/customer/views.py

@@ -183,6 +183,7 @@ class StageCountView(APIView):
                                                        Q(track_user__store_id__in=request.user.get_manager_range()),
                                                        stage_progress=stage)
             stage_count = {
+                'stage_id': stage.id,    # 阶段名称
                 'stage': stage.name,    # 阶段名称
                 'total_count': new_customers.count(),   # 总人数
                 'today_count': new_customers.filter(next_time=time_now).count(),  # 今日人数

+ 23 - 32
uis/views/customer/index.html

@@ -78,14 +78,8 @@
                             <button class="layui-btn" id="customer_order"><i
                                     class="layui-icon layui-icon-add-circle"></i>预约量房
                             </button>
-                            <button class="layui-nav">
-                                <div class="layui-nav-item">
-                                    <a href="javascript:;" style="color:#fff;">导出</a>
-                                    <dl class="layui-nav-child">
-                                        <dd><a href="#" id="btn_list">列表</a></dd>
-                                        <dd><a href="#" id="btn_detail">明细</a></dd>
-                                    </dl>
-                                </div>
+                            <button class="layui-btn" id="btn_list"><i
+                                    class="layui-icon layui-icon-add-circle"></i>导出
                             </button>
                         </div>
                         <form class="layui-form" lay-filter="query-form-element">
@@ -107,10 +101,10 @@
                     </div>
 
                     <div class="tableContent">
-                        <div style="width: 400px">
+                        <div style="width: 375px">
                             <table class="layui-hide" id="customer_log" lay-filter="customer-operate-log"></table>
                         </div>
-                        <div style="width: calc(100% - 420px)">
+                        <div style="width: calc(100% - 400px)">
                             <table class="layui-hide" id="customer_datagrid" lay-filter="customer-operate"></table>
                         </div>
                     </div>
@@ -119,7 +113,8 @@
                         <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" data-permission="customer.view_new_customer"
+                            <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="add_review"
+                               data-permission="customer.view_new_customer"
                             >跟踪报告</a>
                         </div>
                     </script>
@@ -145,9 +140,9 @@
             , url: '/customer/stage_count/'
             , cols: [[
                 {field: 'stage', title: '阶段', width: 100}
-                , {field: 'total', title: "总人数", width: 100, sort: true}
-                , {field: 'today_count', title: '今日', width: 100, sort: true}
-                , {field: 'overdue_count', title: '逾期', width: 100, sort: true}
+                , {field: 'total_count', title: "总人数", width: 90, sort: true}
+                , {field: 'today_count', title: '今日', width: 90, sort: true}
+                , {field: 'overdue_count', title: '逾期', width: 90, sort: true}
             ]]
         });
 
@@ -208,7 +203,7 @@
         var _params1 = {};
         $('#btn_list').on('click', function () {
             $.get({
-                url: '/order/?export=true',
+                url: '/customer/new_customer/',
                 dataType: 'json',
                 data: _params1,
                 success: function (res) {
@@ -216,26 +211,11 @@
                         layer.msg(res.msg);
                         return;
                     }
-                    table.exportFile('datagrid', res,)
-                }
-            })
-        });
-        //导出明细
-        var _params2 = {};
-        $('#btn_detail').on('click', function () {
-            $.get({
-                url: '/order/?export=true',
-                dataType: 'json',
-                data: _params2,
-                success: function (res) {
-                    if (res.code === 1) {
-                        layer.msg(res.msg);
-                        return;
-                    }
-                    table.exportFile('datagrid', res,)
+                    table.exportFile('customer_datagrid', res,)
                 }
             })
         });
+
         //监听工具条
         table.on('tool(customer-operate)', function (obj) {
             var data = obj.data;
@@ -267,6 +247,17 @@
             }
         });
 
+        table.on('row(customer-operate-log)', function (obj) {
+            var data = obj.data;
+            table.reload('customer_datagrid', {
+                where: {stage_progress:data.stage_id}
+                , page: {curr: 1}
+            });
+
+            //标注选中样式
+            obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
+        });
+
         form.on('submit(query-form-element)', function (data) {
             table.reload('customer_datagrid', {
                 where: data.field