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)
+    edition_text = serializers.CharField(source='get_edition_display', read_only=True)
     user_text = serializers.CharField(source='user.username', read_only=True)
     username = serializers.SerializerMethodField()
     image = serializers.SerializerMethodField()

apps/admin/tenant/views.py

@@ -162,4 +162,4 @@ class MemberRemindViewSet(APIView):
             }
             notice = Notices.objects.create(**notice_data)
             NoticesToUser.objects.create(notice=notice, user=user)
-        return response_ok()
+        return response_ok()

apps/tenant/notices/models.py

@@ -31,7 +31,7 @@ class Notices(models.Model):
     title = models.CharField(max_length=50, verbose_name=u'标题')
     create_time = models.DateTimeField(verbose_name='发布时间', auto_now_add=True)
     create_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u"创建者", on_delete=models.PROTECT,
-                                    editable=False,blank=True),
+                                    editable=False,),
     tenant = models.ForeignKey(Tenant, verbose_name=u'企业', on_delete=models.PROTECT, blank=True)
     type = models.PositiveSmallIntegerField(verbose_name=u'通知类型', choices=TYPE_CHOICES, default=NOTICE)
     range = models.PositiveSmallIntegerField(verbose_name=u'通知范围', choices=RANGE_CHOICES, default=ALL)

apps/tenant/repair_order/views.py

@@ -117,7 +117,7 @@ class RepairOrderViewSet(CustomModelViewSet):
     def turn_employee(self, request, pk):
         # 转单
         try:
-            user_ids = self.request.data.get('user_ids')
+            user_ids = request.data.get('user_id')
             if not user_ids:
                 return response_error('请选择维修工人！')
             user = self.request.user

apps/wxapp/serializers.py

@@ -40,6 +40,7 @@ class WechatLoginSerializer(serializers.Serializer):
             payload = jwt_payload_handler(user)
             customer_log(customer_wechat.customer, BizLog.INSERT, u'用户微信登录，username=%s' % user.username)
             tenant_id = customer_wechat.customer.tenant and customer_wechat.customer.tenant.id or ''
+            tenant_edition = customer_wechat.customer.tenant and customer_wechat.customer.tenant.edition or Tenant.EDITION_1
             company_no = customer_wechat.customer.tenant and customer_wechat.customer.tenant.company_no or ''
             nick_name = customer_wechat.customer.tenant and customer_wechat.customer.tenant.company_name or settings.WEAPP['nick_name']
             is_validity = Tenant.check_validity(company_no)
@@ -49,6 +50,7 @@ class WechatLoginSerializer(serializers.Serializer):
                 'token': jwt_encode_handler(payload),
                 'openid': customer_wechat.openid,
                 'tenant_id': tenant_id,
+                'tenant_edition': tenant_edition,
                 'is_validity': is_validity,
                 'nick_name': nick_name,
                 'name': customer_wechat.customer.name or '',
@@ -79,11 +81,13 @@ class WechatBindSerializer(serializers.Serializer):
             payload = jwt_payload_handler(user)
             customer_log(customer, BizLog.INSERT, u'用户微信登录，username=%s' % user.username)
             tenant_id = ''
+            tenant_edition = Tenant.EDITION_1
             nick_name = settings.WEAPP['nick_name']
             if customer.tenant:
                 tenant_id = customer.tenant.id
                 company_no = customer.tenant.company_no
                 nick_name = customer.tenant.company_name
+                tenant_edition = customer.tenant.edition
             elif company_no:
                 # 扫二维码，没有绑定企业的用户之间绑定企业
                 tenant = Tenant.objects.filter(company_no=company_no).first()
@@ -93,6 +97,7 @@ class WechatBindSerializer(serializers.Serializer):
                     tenant_id = tenant.id
                     company_no = tenant.company_no
                     nick_name = tenant.company_name
+                    tenant_edition = tenant.edition
             is_validity = Tenant.check_validity(company_no)
             return {
                 'token': jwt_encode_handler(payload),
@@ -105,6 +110,7 @@ class WechatBindSerializer(serializers.Serializer):
                 'user_type': customer.type,  # 用户类别，1为平台管理员，2为管理者，3检修人，4报修人
                 'forbid_baoxiu': 'true' and customer.status == Employee.DISABLE or 'false',  # 是否禁用报修,
                 'tenant_id': tenant_id,
+                'tenant_edition': tenant_edition,
                 'emplate_id': [settings.WEAPP['message_template_finish'],settings.WEAPP['message_template_wait_check'],
                                settings.WEAPP['message_template_dispatch'],],
             }

apps/wxapp/tenant/views.py

@@ -44,6 +44,7 @@ class GetTenantView(APIView):
                 'position':emplayee.position,
                 'wxapp_img':emplayee.tenant.wxapp_img,
                 'user_type_text':emplayee.get_type_display(),
+                'edition_text':emplayee.tenant.get_edition_display(),
             }
             return response_ok(data)
         else:

uis/tenant/company/index.html

@@ -128,6 +128,7 @@
                 {field: 'company_no', title: '企业编号', width: 100}
                 , {field: 'company_name', title: '企业名称', width: 200}
                 , {field: 'organ_code', title: '组织代码', width: 150}
+                , {field: 'edition_text', title: '版本', width: 100}
                 , {field: 'name', title: '联系人姓名', width: 120}
                 , {field: 'tel', title: '联系人电话', width: 120}
                 , {field: 'address', title: '联系人地址', width: 200}

uis/zzlyadmin/tenant/index.html

@@ -125,6 +125,7 @@
                 {field: 'company_no', title: '企业编号', width: 100}
                 , {field: 'company_name', title: '企业名称', width: 200}
                 , {field: 'organ_code', title: '组织代码', width: 150}
+                , {field: 'edition_text', title: '版本', width: 100}
                 , {field: 'name', title: '联系人姓名', width: 120}
                 , {field: 'tel', title: '联系人电话', width: 120}
                 , {field: 'address', title: '联系人地址', width: 200}

utils/wx/wechat.py

@@ -244,12 +244,6 @@ class WeChat(object):
         full_filename = "%s%s" % (settings.MEDIA_ROOT, filename)
         with open(full_filename, 'wb') as destination:
             destination.write(result.content)
-
-
-        # with open('aa.png', 'wb') as f:
-        #     f.write(result.content)
-        #     print(4444444444,f)
-
         return filename
 
     @staticmethod