From 31d27552563ca25919e2f736f747c92b4717e17f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 29 Jul 2020 14:48:35 +0800 Subject: [PATCH] application evalutaion --- server/apps/application/apps.py | 5 -- server/apps/application/models.py | 20 -------- server/apps/certset/models.py | 27 +++++++++- .../apps/{application => project}/__init__.py | 0 server/apps/{application => project}/admin.py | 0 server/apps/project/apps.py | 5 ++ .../migrations/__init__.py | 0 server/apps/project/models.py | 46 ++++++++++++++++++ server/apps/{application => project}/tests.py | 0 server/apps/{application => project}/views.py | 0 server/requirements.txt | Bin 2336 -> 2656 bytes 11 files changed, 76 insertions(+), 27 deletions(-) delete mode 100644 server/apps/application/apps.py delete mode 100644 server/apps/application/models.py rename server/apps/{application => project}/__init__.py (100%) rename server/apps/{application => project}/admin.py (100%) create mode 100644 server/apps/project/apps.py rename server/apps/{application => project}/migrations/__init__.py (100%) create mode 100644 server/apps/project/models.py rename server/apps/{application => project}/tests.py (100%) rename server/apps/{application => project}/views.py (100%) diff --git a/server/apps/application/apps.py b/server/apps/application/apps.py deleted file mode 100644 index 8acf66b..0000000 --- a/server/apps/application/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class ApplicationConfig(AppConfig): - name = 'application' diff --git a/server/apps/application/models.py b/server/apps/application/models.py deleted file mode 100644 index fd04b0f..0000000 --- a/server/apps/application/models.py +++ /dev/null @@ -1,20 +0,0 @@ -from django.db import models -from apps.system.models import CommonAModel, Dict, User, CommonBModel -from apps.certset.models import ImplementRule -from simple_history.models import HistoricalRecords -from rest_framework.exceptions import ParseError -# Create your models here. - -class Application(CommonBModel): - """ - 认证项目申请 - """ - status_choices = ( - ('草稿', '草稿'), - ('已申请', '已申请'), - ('已受理', '已受理'), - ('进行中', '进行中'), - ('已中止', '已中止'), - ('已完成', '已完成') - ) - pass \ No newline at end of file diff --git a/server/apps/certset/models.py b/server/apps/certset/models.py index d1cc06c..ccf5361 100644 --- a/server/apps/certset/models.py +++ b/server/apps/certset/models.py @@ -31,8 +31,8 @@ class ImplementRule(CommonAModel): code = models.CharField('编号', max_length=30, unique=True) cert_field = models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='所属认证领域', related_name= 'implementrule_cert_field') standards = models.ManyToManyField(Standard, blank=True, verbose_name='依据标准', related_name='implementrules_standards') - ccc_list = models.ManyToManyField(Dict, blank=True, verbose_name='CCC产品认证目录', related_name= 'implementrule_ccc_list') - pv_scope = models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='自愿性产品认证范围', related_name= 'implementrule_pv_scope') + ccc_list = models.ManyToManyField(Dict, blank=True, verbose_name='CCC产品分类', related_name= 'implementrule_ccc_list') + pv_scope = models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='自愿性产品认证专业范围', related_name= 'implementrule_pv_scope') pv_class = models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='自愿性产品认证产品分类', related_name= 'implementrule_pv_class') cnas_scope = models.ManyToManyField(Dict, blank=True, verbose_name='CNAS业务范围', related_name= 'implementrule_cnas_scope') economy_class = models.ManyToManyField(Dict, blank=True, verbose_name='国民经济分类', related_name= 'implementrule_economy_class') @@ -60,3 +60,26 @@ class UnitType(CommonAModel): def __str__(self): return self.name +class EvaluationSheet(CommonAModel): + """ + 评审表 + """ + cert_field = models.ForeignKey(Dict, verbose_name='涉及认证领域', related_name='application_cert_field') + major = models.ManyToManyField(Dict, verbose_name='涉及CCC/pv/cnas分类', related_name='application_major') + is_default = models.BooleanField('是否该领域默认', default=False) + class Meta: + verbose_name = '评审表' + verbose_name_plural = verbose_name + + def __str__(self): + return self.name + +class EvaluationItem(CommonAModel): + content = models.TextField('内容', blank=True) + sheet = models.ForeignKey(EvaluationSheet, verbose_name='所属评审表') + class Meta: + verbose_name = '评审表项目' + verbose_name_plural = verbose_name + + def __str__(self): + return self.content \ No newline at end of file diff --git a/server/apps/application/__init__.py b/server/apps/project/__init__.py similarity index 100% rename from server/apps/application/__init__.py rename to server/apps/project/__init__.py diff --git a/server/apps/application/admin.py b/server/apps/project/admin.py similarity index 100% rename from server/apps/application/admin.py rename to server/apps/project/admin.py diff --git a/server/apps/project/apps.py b/server/apps/project/apps.py new file mode 100644 index 0000000..2c64289 --- /dev/null +++ b/server/apps/project/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class ProjectConfig(AppConfig): + name = 'project' diff --git a/server/apps/application/migrations/__init__.py b/server/apps/project/migrations/__init__.py similarity index 100% rename from server/apps/application/migrations/__init__.py rename to server/apps/project/migrations/__init__.py diff --git a/server/apps/project/models.py b/server/apps/project/models.py new file mode 100644 index 0000000..5ac50a2 --- /dev/null +++ b/server/apps/project/models.py @@ -0,0 +1,46 @@ +from django.db import models +from apps.system.models import CommonAModel, Dict, User, CommonBModel +from apps.certset.models import ImplementRule +from simple_history.models import HistoricalRecords +from rest_framework.exceptions import ParseError +from apps.crm.models import Enterprise +from django.contrib.postgres.fields import JSONField +# Create your models here. + +class Project(CommonBModel): + pass + +class Application(CommonBModel): + """ + 认证申请 + """ + status_choices = ( + ('草稿', '草稿'), + ('已申请', '已申请'), + ('已受理', '已受理'), + ('进行中', '进行中'), + ('已中止', '已中止'), + ('已完成', '已完成') + ) + number = models.CharField('项目申请编号', max_length = 50) + cert_field = models.ForeignKey(Dict, verbose_name='认证领域', related_name='application_cert_field') + major = models.ForeignKey(Dict, verbose_name='涉及CCC/pv/cnas分类', related_name='application_major') + applicant = JSONField(verbose_name='申请方') + apply_date = models.DateField('申请日期', null=True, blank=True) + accept_date = models.DateField('受理日期', null=True, blank=True) + manufacturer = JSONField(verbose_name='制造商', blank=True) + factory = JSONField(verbose_name='生产厂', blank=True) + project = models.ForeignKey('归属项目', null=True, blank=True) + + class Meta: + verbose_name = '认证申请' + verbose_name_plural = verbose_name + + def __str__(self): + return self.number + +class Unit(CommonBModel): + """ + 认证单元 + """ + pass diff --git a/server/apps/application/tests.py b/server/apps/project/tests.py similarity index 100% rename from server/apps/application/tests.py rename to server/apps/project/tests.py diff --git a/server/apps/application/views.py b/server/apps/project/views.py similarity index 100% rename from server/apps/application/views.py rename to server/apps/project/views.py diff --git a/server/requirements.txt b/server/requirements.txt index 0c5b930fc13e474276f967817d0051386fcc0563..98d019513630e5ce637d42d40f7dd4061d745e89 100644 GIT binary patch delta 308 zcmZ1=^gv|7G0jAVWQGieRE87=U4{aNB8Ge*nF^#!7%CZTfzXgakHHj(4L9z$W>VE< zCve^BB^B>OmG8flUQF5NtNcPK4?LAiET(7Ni^G$r7;lis4Q++q{~slnDTe CBswkt delta 28 kcmaDLvOs9Uv5ntMm?kGMAKUE5!o@Us1>395U)Xb)0Jh%??f?J)