Merge remote-tracking branch 'origin/master'

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()
 

apps/tenant/models.py

@@ -16,7 +16,7 @@ class Tenant(models.Model):
     company_no = models.CharField(max_length=10, verbose_name=u'企业编号', blank=True, null=True)
     company_name = models.CharField(max_length=200, verbose_name=u'企业名称', blank=True, null=True)
     organ_code = models.CharField(max_length=200, verbose_name=u'组织代码', blank=True, null=True)
-    wxapp_img = models.CharField(verbose_name=u'小程序二维码', max_length=250)
+    wxapp_img = models.CharField(verbose_name=u'小程序二维码', max_length=250, null=True)
     name = models.CharField(max_length=20, verbose_name=u'联系人名称')
     tel = models.CharField(max_length=20, verbose_name=u'联系人电话')
     address = models.CharField(max_length=200, verbose_name=u'地址', blank=True, null=True)

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 = {

apps/wxapp/inspection_order/views.py

@@ -16,7 +16,7 @@ from apps.tenant import tenant_log
 
 class InspectionOrderDetailView(generics.RetrieveAPIView):
     permission_classes = [isLogin, ]
-    queryset = InspectionOrder.objects.filter(status=InspectionOrder.NOT_REPAIR)
+    queryset = InspectionOrder.objects.filter()
     serializer_class = InspectionOrderDetailSerializer
 
     def retrieve(self, request, *args, **kwargs):
@@ -24,6 +24,10 @@ class InspectionOrderDetailView(generics.RetrieveAPIView):
         serializer = self.get_serializer(instance)
         return response_ok(serializer.data)
 
+    def filter_queryset(self, queryset):
+        # queryset = queryset.filter(tenant=self.request.user.employee.tenant, user=self.request.user)
+        f = InspectionOrderFilter(self.request.GET, queryset=queryset)
+        return f.qs
 
 class InspectionOrderAllView(generics.ListAPIView):
     permission_classes = [isLogin, ]

apps/wxapp/repair_order/views.py

@@ -49,14 +49,12 @@ class RepairOrderCountView(APIView):
             return response_ok({
                 'NOT_CHECKED_COUNT':0,
                 'CHECKED_COUNT':0,
-                'FINISH_COUNT': 0,
                 'APPRAISE_COUNT': 0,
             })
         queryset = RepairOrder.objects.filter(delete=False, tenant=self.request.user.employee.tenant)
         return response_ok({
             'NOT_CHECKED_COUNT':queryset.filter(status__lte=settings.CHECKED).count(),
             'CHECKED_COUNT':queryset.filter(status=settings.CHECKED).count(),
-            'FINISH_COUNT': queryset.filter(status =settings.FINISH).count(),
             'APPRAISE_COUNT': queryset.filter(status=settings.APPRAISE, user = request.user).count(),
         })
 

apps/wxapp/tenant/views.py

@@ -34,9 +34,11 @@ class GetTenantView(APIView):
         emplayee = Employee.objects.filter(user=request.user).first()
         if emplayee:
             data = {
+                'tenant_id':emplayee.tenant.id,
                 'company_no':emplayee.tenant.company_no,
                 'company_name':emplayee.tenant.company_name,
                 'position':emplayee.position,
+                'wxapp_img':emplayee.tenant.wxapp_img,
                 'user_type_text':emplayee.get_type_display(),
             }
             return response_ok(data)

uis/zzlyadmin/tenant/detail.html

@@ -21,8 +21,9 @@
         }
         /*企业营业执照样式*/
         .imgStyle{
-            width: 100px;
-            height: 100px;
+            margin: 10px 0;
+            width: 200px;
+            height: auto;
         }
     </style>
 </head>
@@ -77,7 +78,7 @@
                         <h3>拒绝原因：{{ d.reject_reason  || ''}}</h3>
                     </li>
                     {{# if(d.image){ }}
-                    <li class="tenant-li">
+                    <li class="tenant-li" id="check_img">
                         <h3>企业营业执照：</h3>
                         <img src="{{d.image}}" class="imgStyle" />
                     </li>
@@ -111,24 +112,17 @@
         var $ = layui.$
             , laytpl = layui.laytpl;
         var data = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
-
         var getTpl = tenant_detail_demo.innerHTML
             , tenant_detail = document.getElementById('tenant_detail');
         laytpl(getTpl).render(data, function (html) {
             tenant_detail.innerHTML = html;
         });
-        // admin.req({
-        //     url: '/tenant/repair_order/get_repair_order_record/'
-        //     , data: {order_id: data.id}
-        //     , type: 'get'
-        //     , done: function (res) {
-        //        var getTpl2 = invest_record_demo.innerHTML
-        //            , invest_record = document.getElementById('invest_record');
-        //          laytpl(getTpl2).render(res.data, function (html) {
-        //          invest_record.innerHTML = html;
-        //         });
-        //     }
-        // });
+        //点击企业执照图片
+        $('#check_img').on('click', function(e) {
+          //  打开新的页面，渲染图片
+          var newPage=window.open();
+          newPage.document.write("<img src="+ data.image +" />")
+        })
     });
 </script>
 </body>

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}