wushaodong 4 anni fa
parent
commit
6a6eeb50a0
3 ha cambiato i file con 4 aggiunte e 3 eliminazioni
  1. 2 1
      apps/account/views.py
  2. 1 1
      apps/customer/views.py
  3. 1 1
      uis/views/report_check/index.html

+ 2 - 1
apps/account/views.py

@@ -326,7 +326,8 @@ class EmployeeTreeView(APIView):
                 'field': 'store',
                 'children': [],
             }
-            employees = User.objects.filter(store_id=store_id, is_active=True).values('id', 'name')
+            office_user_id = OfficeStoreUser.objects.filter(store_id=store_id).values('office_user_id')
+            employees = User.objects.filter(Q(store_id=store_id) | Q(id__in=office_user_id), is_active=True).values('id', 'name')
             for employee in employees:
                 user_item = {
                     'title': employee['name'],

+ 1 - 1
apps/customer/views.py

@@ -482,4 +482,4 @@ class ListCountView(APIView):
             'review_count': review_count,  # 跟踪审核数量
             'order_count': order_count,  # 进度审核数量
         }
-        return response_ok(data)
+        return response_ok(data)

+ 1 - 1
uis/views/report_check/index.html

@@ -134,7 +134,7 @@
                 layer.open({
                     type: 2,
                     title: '分配客户',
-                    area: ['30%', '40%'],
+                    area: ['40%', '60%'],
                     btn: ['分配', '取消'],
                     yes: function (index, dom) {
                         layui.onSubmitChild = function (data) {