瀏覽代碼

默认系统选项

wushaodong 4 年之前
父節點
當前提交
c185aad403
共有 3 個文件被更改,包括 19 次插入4 次删除
  1. 16 1
      apps/admin/tenant/views.py
  2. 2 2
      apps/tenant/employee/models.py
  3. 1 1
      uis/tenant/option/edit.html

+ 16 - 1
apps/admin/tenant/views.py

@@ -14,6 +14,7 @@ from rest_framework.decorators import action
 from utils import response_ok, response_error
 from apps.account.models import User
 from .filters import TenantFilter
+from apps.tenant.option.models import Option
 
 class TenantViewSet(CustomModelViewSet):
     permission_classes = [IsAdministratorUser, ]
@@ -52,7 +53,21 @@ class TenantViewSet(CustomModelViewSet):
                     user.save()
                     Employee.objects.filter(user=user).update(tenant=tenant, type=Employee.SUPER)
                 else:
-                    Employee.create_super_admin(tenant, name, username, password)
+                    user = Employee.create_super_admin(tenant, name, username, password)
+                option_data1 = {
+                    'tenant': tenant,
+                    'type': 1,
+                    'name': u'桌椅、板凳',
+                    'create_user': user,
+                }
+                option_data2 = {
+                    'tenant': tenant,
+                    'type': 2,
+                    'name': u'设备老化',
+                    'create_user': user,
+                }
+                Option.objects.create(**option_data1)
+                Option.objects.create(**option_data2)
                 admin_log(request.user, BizLog.INSERT, u'企业[%s]添加超级账号[%s]' % (tenant.company_name,username))
             return response_ok()
         except CustomError as e:

+ 2 - 2
apps/tenant/employee/models.py

@@ -57,7 +57,7 @@ class Employee(models.Model):
     def create_super_admin(tenant,name, username, password):
         # 企业添加管理超级管理员
         user = User.objects.create_superuser_tenant(username, password)
-        instance = Employee.objects.create(
+        Employee.objects.create(
             name=name,
             tel=username,
             gender=settings.MALE,
@@ -65,7 +65,7 @@ class Employee(models.Model):
             tenant=tenant,
             type=Employee.SUPER,
         )
-        return instance
+        return user
 
     @staticmethod
     def get_instance_by_id(id, tenant):

+ 1 - 1
uis/tenant/option/edit.html

@@ -61,7 +61,7 @@
                                 <label class="layui-form-label">说明:</label>
                                 <div class="layui-input-block">
                                     <p>1、报修类型:桌椅、门窗、电脑等</p>
-                                    <p>2、故障原因:人为损坏、自然老化等</p>
+                                    <p>2、故障原因:人为损坏、设备老化等</p>
                                 </div>
                             </div>
                         </div>