...

apps/activity/filters.py

@@ -41,6 +41,7 @@ class MemberCouponFilter(django_filters.FilterSet):
 
 class OrderFilter(django_filters.FilterSet):
     activity_name = django_filters.CharFilter(field_name='activity__title', lookup_expr='icontains')
+    branch_name = django_filters.CharFilter(field_name='branch__name', lookup_expr='icontains')
     activity = django_filters.CharFilter(field_name='activity')
     delete = django_filters.CharFilter(field_name='delete')
 

apps/activity/serializers.py

@@ -87,6 +87,7 @@ class OrderSerializer(serializers.ModelSerializer):
     activity_name = serializers.CharField(source='activity.title', read_only=True)
     member_name = serializers.CharField(source='member.nickname', read_only=True)
     member_tel = serializers.CharField(source='member.tel', read_only=True)
+    branch_name = serializers.CharField(source='branch.name', read_only=True)
     status_text = serializers.CharField(source='get_status_display', read_only=True)
     delete_text = serializers.SerializerMethodField()
     create_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M', read_only=True)

apps/activity/views.py

@@ -107,7 +107,11 @@ def coupon_cancel_write_off(request):
 
 @token_required
 def order_list(request):
-    f = OrderFilter(request.GET, queryset=Order.objects.filter(branch=request.user.branch))
+    if request.user.is_superuser:
+        rows = Order.objects.filter()
+    else:
+        rows = Order.objects.filter(branch=request.user.branch)
+    f = OrderFilter(request.GET, queryset=rows)
     rows, total = utils.get_page_data(request, f.qs)
     serializer = OrderSerializer(rows, many=True)
     return DataGridJSONResponse(serializer.data, total)

uis/views/activity/details.html

@@ -110,6 +110,7 @@
                 ,{field:'status_text', title:'状态', width:90}
                 ,{field:'create_time', title:'创建时间', width:180}
               ]]
+              ,page: true
               ,where: {'activity': id, 'delete': 0}
               ,height: 'full-108'
             });
@@ -124,6 +125,7 @@
                 ,{field:'create_time', title:'添加时间', width:300}
                 ,{field:'enabled_text', title:'在用', width:90}
               ]]
+              ,page: true
               ,where: {'activity': id}
               ,height: 'full-108'
             });

uis/views/activity/index.html

@@ -130,7 +130,7 @@
           {type: 'radio', width: 50}
         ,{field:'title', title:'标题', width:200}
         ,{field:'end_date', title:'截止日期',width: 200}
-        ,{field:'amount', title:'费用',width: 100}
+        ,{field:'amount', title:'价格',width: 100}
         ,{field:'rebate', title:'返利',width: 100}
         ,{field:'check_status_text', title:'状态',width: 100}
         ,{field:'branch_name', title:'门店名称',width: 100}

uis/views/branch/index.html

@@ -82,12 +82,6 @@
     var $ = layui.$
     ,form = layui.form;
     var table = layui.table;
-
-    var superuser = layui.data(layui.setter.tableName)['superuser'];
-      if(!superuser){
-          $('#btn_add').remove()
-      }
-
     table.render({
       elem: '#datagrid'
       ,url: '/activity/branch/data/'

uis/views/index.html

@@ -88,13 +88,13 @@
               </dl>
             </li>
 
-            <li data-name="set" class="layui-nav-item">
+            <li data-name="set" class="layui-nav-item" id="manage_set">
               <a href="javascript:;" lay-tips="基础设置" lay-direction="2">
                 <i class="layui-icon layui-icon-set"></i>
                 <cite>基础设置</cite>
               </a>
               <dl class="layui-nav-child">
-                <dd data-name="nav">
+                <dd data-name="nav" id="manage_branch">
                   <a lay-href="branch/index.html">门店管理</a>
                 </dd>
                 <dd data-name="nav" id="manage_employee">
@@ -155,11 +155,10 @@
 
       var superuser = layui.data(layui.setter.tableName)['superuser'];
       if(!superuser){
-          $('#manage_employee').remove()
+          $('#manage_set').remove();
       }else{
            $('#manage_coupon').remove();
            $('#manage_member').remove();
-           $('#manage_order').remove();
       }
       /**$('#LAY-system-side-muen .layui-nav-child dd').each(function () {
           var perm = $(this).data("permission");

uis/views/order/index.html

@@ -61,6 +61,13 @@
                 </div>
             </div>
 
+               <div class="layui-col-xs12 layui-col-sm12">
+                <label class="layui-form-label">门店：</label>
+                <div class="layui-input-block">
+                    <input type="text" name="branch_name" autocomplete="off" class="layui-input">
+                </div>
+            </div>
+
           </div>
           <div class="layui-form-item" style="display: none">
                 <button id="query_search" class="layui-btn" lay-submit lay-filter="query-form-element">查询</button>
@@ -86,7 +93,8 @@
       ,url: '/activity/order/data/'
         ,where: {'delete': 0}
       ,cols: [[
-        {field:'activity_name', title:'活动名称', width:200}
+        {field:'branch_name', title:'门店', width:100}
+        ,{field:'activity_name', title:'活动名称', width:200}
         ,{field:'member_name', title:'会员名称',width: 120}
         ,{field:'member_tel', title:'会员电话',width: 120}
         ,{field:'amount', title:'费用', width:120}