wushaodong 4 jaren geleden
bovenliggende
commit
ff9a740db2
3 gewijzigde bestanden met toevoegingen van 3 en 1 verwijderingen
  1. 1 0
      apps/admin/tenant/serializers.py
  2. 1 1
      apps/tenant/repair_order/views.py
  3. 1 0
      uis/zzlyadmin/tenant/index.html

+ 1 - 0
apps/admin/tenant/serializers.py

@@ -10,6 +10,7 @@ from apps.upload.models import Upload
 class TenantSerializer(serializers.ModelSerializer) :
     create_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M', read_only=True)
     status_text = serializers.CharField(source='get_status_display', read_only=True)
+    user_text = serializers.CharField(source='user__username', read_only=True)
     username = serializers.SerializerMethodField()
     image = serializers.SerializerMethodField()
 

+ 1 - 1
apps/tenant/repair_order/views.py

@@ -33,7 +33,7 @@ class GetEmployeeView(APIView):
 
     def get(self, request):
         employees = EmployeeSerializer(
-            Employee.objects.filter(status__lte=Employee.DAY_OFF, type=Employee.EMPLOYEE, ), many=True).data
+            Employee.objects.filter(status__lte=Employee.DAY_OFF, type=Employee.EMPLOYEE, tenant=request.user.employee.tenant), many=True).data
         data = []
         for emp in employees:
             dict = {

+ 1 - 0
uis/zzlyadmin/tenant/index.html

@@ -131,6 +131,7 @@
                 , {field: 'end_date', title: '企业到期日期', width: 120}
                 , {field: 'create_time', title: '申请时间', width: 160}
                 , {field: 'status_text', title: '审核状态', width: 100}
+                , {field: 'user_text', title: '申请人账号', width: 120}
                 , {field: 'username', title: '管理员账号', width: 200}
                 , {field: 'renew_time', title: '续费时间', width: 160}
                 , {field: 'renew_amount', title: '续费金额', width: 120}