diff --git a/client/src/views/accessment/access.vue b/client/src/views/accessment/access.vue
index 947a513..c61adce 100644
--- a/client/src/views/accessment/access.vue
+++ b/client/src/views/accessment/access.vue
@@ -1,49 +1,43 @@
-
-
-
- 认证结果评价
- 创建
-
-
-
- {{ scope.row.number }}
-
-
-
- {{ scope.row.conclusion }}
-
-
-
- {{ scope.row.create_time }}
-
-
-
- {{ scope.row.create_time }}
-
-
-
-
-
+
\ No newline at end of file
diff --git a/server/apps/crm/migrations/0015_certunit_testorgs.py b/server/apps/crm/migrations/0015_certunit_testorgs.py
new file mode 100644
index 0000000..e5b1be5
--- /dev/null
+++ b/server/apps/crm/migrations/0015_certunit_testorgs.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.0.7 on 2020-09-21 02:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('laboratory', '0005_auto_20200824_1649'),
+ ('crm', '0014_auto_20200918_1557'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='certunit',
+ name='testorgs',
+ field=models.ManyToManyField(to='laboratory.TestOrg', verbose_name='检测机构'),
+ ),
+ ]
diff --git a/server/apps/crm/models.py b/server/apps/crm/models.py
index 7a0e0ee..cd9c0e0 100644
--- a/server/apps/crm/models.py
+++ b/server/apps/crm/models.py
@@ -80,6 +80,7 @@ class EnterpriseAddress(CommonAModel):
return self.name
from apps.certset.models import ImplementRule, UnitType, Standard
+from apps.laboratory.models import TestOrg
class Certunit(CommonAModel):
"""
认证单元
@@ -90,3 +91,4 @@ class Certunit(CommonAModel):
unittype = models.ForeignKey(UnitType, verbose_name='单元类型', on_delete = models.DO_NOTHING, related_name='certunit_unittype')
standard = models.ForeignKey(Standard, verbose_name='采用标准', on_delete = models.DO_NOTHING, related_name='certunit_standard')
enterprise = models.ForeignKey(Enterprise, verbose_name='所属公司', on_delete = models.DO_NOTHING, related_name='certunit_enterprise')
+ testorgs = models.ManyToManyField(TestOrg, verbose_name='检测机构')
diff --git a/server/apps/project/migrations/0038_certappunit_testorg.py b/server/apps/project/migrations/0038_certappunit_testorg.py
new file mode 100644
index 0000000..2af9825
--- /dev/null
+++ b/server/apps/project/migrations/0038_certappunit_testorg.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.0.7 on 2020-09-21 02:43
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('laboratory', '0005_auto_20200824_1649'),
+ ('project', '0037_auto_20200918_1557'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='certappunit',
+ name='testorg',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='laboratory.TestOrg', verbose_name='检测机构'),
+ ),
+ ]
diff --git a/server/apps/project/models.py b/server/apps/project/models.py
index e92fb7e..8343c90 100644
--- a/server/apps/project/models.py
+++ b/server/apps/project/models.py
@@ -204,7 +204,7 @@ class Certappunit(CommonBModel):
"""
certunit = models.ForeignKey('crm.Certunit', verbose_name='单元', on_delete=models.CASCADE, related_name='certappunit_certunit')
certapp = models.ForeignKey(CertApp, verbose_name='所属业务', on_delete = models.CASCADE, related_name='certappunit_certapp')
-
+ testorg = models.ForeignKey('laboratory.TestOrg', verbose_name='检测机构', on_delete=models.SET_NULL, null=True, blank=True)
class Meta:
verbose_name = '认证单元'
verbose_name_plural = verbose_name