From 548159edfe920370eb74bc11eb74c46ff2341e6d Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 14 Aug 2020 09:51:18 +0800 Subject: [PATCH] vue index --- .../migrations/0019_auto_20200813_1744.py | 32 +++++++++++++++++++ server/apps/project/models.py | 4 +-- server/apps/project/serializers.py | 5 +++ server/apps/project/urls.py | 1 + server/apps/project/views.py | 12 ++++++- 5 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 server/apps/project/migrations/0019_auto_20200813_1744.py diff --git a/server/apps/project/migrations/0019_auto_20200813_1744.py b/server/apps/project/migrations/0019_auto_20200813_1744.py new file mode 100644 index 0000000..0b9568e --- /dev/null +++ b/server/apps/project/migrations/0019_auto_20200813_1744.py @@ -0,0 +1,32 @@ +# Generated by Django 3.0.7 on 2020-08-13 09:44 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('project', '0018_certapp_level'), + ] + + operations = [ + migrations.RemoveField( + model_name='unit', + name='factory', + ), + migrations.RemoveField( + model_name='unit', + name='factory_v', + ), + migrations.RemoveField( + model_name='unit', + name='subapplication', + ), + migrations.AddField( + model_name='unit', + name='certapp', + field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='project.CertApp', verbose_name='所属业务'), + preserve_default=False, + ), + ] diff --git a/server/apps/project/models.py b/server/apps/project/models.py index 888ec8d..e4b99ad 100644 --- a/server/apps/project/models.py +++ b/server/apps/project/models.py @@ -159,12 +159,10 @@ class Unit(CommonBModel): """ 认证单元,一个单元一张证书 """ - factory = models.ForeignKey(Enterprise, on_delete=models.DO_NOTHING) - factory_v = JSONField(verbose_name='生产厂', blank=True) name = models.CharField('单元名称', max_length=200) description = models.TextField('单元描述', blank=True) unittype = models.ForeignKey(UnitType, verbose_name='单元类型', on_delete = models.SET_NULL, null=True, blank=True) - subapplication = models.ForeignKey(Application, verbose_name='所属子申请', on_delete = models.CASCADE) + certapp = models.ForeignKey(CertApp, verbose_name='所属业务', on_delete = models.CASCADE) class Meta: verbose_name = '认证单元' diff --git a/server/apps/project/serializers.py b/server/apps/project/serializers.py index a87a020..2898f8a 100644 --- a/server/apps/project/serializers.py +++ b/server/apps/project/serializers.py @@ -43,4 +43,9 @@ class CertappSerializer(serializers.ModelSerializer): create_by_ = UserListSerializer(source='create_by', read_only=True) class Meta: model = CertApp + fields = '__all__' + +class UnitSerializer(serializers.ModelSerializer): + class Meta: + model = Unit fields = '__all__' \ No newline at end of file diff --git a/server/apps/project/urls.py b/server/apps/project/urls.py index bdd946f..1a101e0 100644 --- a/server/apps/project/urls.py +++ b/server/apps/project/urls.py @@ -6,6 +6,7 @@ router = routers.DefaultRouter() router.register('application', ApplicationViewSet, basename="application") router.register('subapplication', SubApplicationViewSet, basename="subapplication") router.register('certapp', CertappViewset, basename="certapp") +router.register('unit', UnitViewSet, basename="unit") urlpatterns = [ path('', include(router.urls)) ] \ No newline at end of file diff --git a/server/apps/project/views.py b/server/apps/project/views.py index 26c2ac6..7416146 100644 --- a/server/apps/project/views.py +++ b/server/apps/project/views.py @@ -1,5 +1,6 @@ from django.shortcuts import render import rest_framework +from rest_framework.serializers import ModelSerializer from rest_framework.viewsets import ModelViewSet, GenericViewSet from rest_framework.response import Response from rest_framework import status @@ -79,4 +80,13 @@ class CertappViewset(CreateUpdateCustomMixin, ModelViewSet): serializer.is_valid(raise_exception=True) self.perform_create(serializer) headers = self.get_success_headers(serializer.data) - return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers) \ No newline at end of file + return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers) + +class UnitViewSet(CreateUpdateCustomMixin, ModelViewSet): + """ + 产品单元 + """ + perms_map = {'get': 'certapp_view', 'post':'certapp_create', 'put':'certapp_update','delete': 'certapp_delete'} + queryset = Unit.objects.all() + serializer_class = UnitSerializer + ordering = ['-create_time'] \ No newline at end of file