diff --git a/client/.env.production b/client/.env.production
index 80c8103..1db701b 100644
--- a/client/.env.production
+++ b/client/.env.production
@@ -2,5 +2,5 @@
ENV = 'production'
# base api
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://121.36.23.77:8000'
diff --git a/client/src/views/system/dict.vue b/client/src/views/system/dict.vue
index 2366558..e0a8edd 100644
--- a/client/src/views/system/dict.vue
+++ b/client/src/views/system/dict.vue
@@ -58,6 +58,9 @@
stripe
highlight-current-row
max-height="600"
+ row-key="id"
+ default-expand-all
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
@@ -138,6 +141,12 @@
+
+
+
+
+
+
有效
@@ -182,7 +191,8 @@ const defaultDict = {
description: '',
sort: 1,
type: null,
- is_deleted: false
+ is_deleted: false,
+ parent:null
}
export default {
components: { Pagination, Treeselect },
@@ -190,6 +200,7 @@ export default {
return {
dicttype: Object.assign({}, defaultDictType),
dict: Object.assign({}, defaultDict),
+ search:'',
dictList: [],
listLoading: true,
listQuery: {
@@ -209,7 +220,7 @@ export default {
},
filterDictTypeText: '',
treeLoding: false,
- dictTypeData: []
+ dictTypeData: [],
}
},
computed: {},
@@ -236,7 +247,7 @@ export default {
this.listLoading = true
getDictList(this.listQuery).then(response => {
if (response.data) {
- this.dictList = response.data
+ this.dictList = genTree(response.data)
this.listLoading = false
}
}).catch(error=>{this.listLoading = false})
diff --git a/docs/实施规则/副本强制性产品认证信息报告基础代码表20190505.xlsx b/docs/实施规则/副本强制性产品认证信息报告基础代码表20190505.xlsx
new file mode 100644
index 0000000..7ebba5d
Binary files /dev/null and b/docs/实施规则/副本强制性产品认证信息报告基础代码表20190505.xlsx differ
diff --git a/docs/实施规则/副本管理体系及服务认证信息报告基础代码表20200212.xlsx b/docs/实施规则/副本管理体系及服务认证信息报告基础代码表20200212.xlsx
new file mode 100644
index 0000000..dbce164
Binary files /dev/null and b/docs/实施规则/副本管理体系及服务认证信息报告基础代码表20200212.xlsx differ
diff --git a/docs/实施规则/副本自愿性产品认证信息报告基础代码表20200414.xlsx b/docs/实施规则/副本自愿性产品认证信息报告基础代码表20200414.xlsx
new file mode 100644
index 0000000..cd8027f
Binary files /dev/null and b/docs/实施规则/副本自愿性产品认证信息报告基础代码表20200414.xlsx differ
diff --git a/server/apps/certset/__init__.py b/server/apps/certset/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/server/apps/certset/admin.py b/server/apps/certset/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/server/apps/certset/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/server/apps/certset/apps.py b/server/apps/certset/apps.py
new file mode 100644
index 0000000..4ff05bc
--- /dev/null
+++ b/server/apps/certset/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class CertsetConfig(AppConfig):
+ name = 'certset'
diff --git a/server/apps/certset/migrations/__init__.py b/server/apps/certset/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/server/apps/certset/models.py b/server/apps/certset/models.py
new file mode 100644
index 0000000..6f30498
--- /dev/null
+++ b/server/apps/certset/models.py
@@ -0,0 +1,21 @@
+from django.db import models
+from apps.system.models import CommonAModel
+# Create your models here.
+
+class Standard(CommonAModel):
+ status_choices = (
+ ('现行', '现行'),
+ ('即将实施', '即将实施'),
+ ('作废', '作废'),
+ ('废止', '废止')
+ )
+ name = models.CharField('标准名称', max_length=1000)
+ code = models.CharField('编号', max_length=30, null=True, blank=True)
+ publish_date = models.DateField('发布日期')
+ implement_date = models.DateField('实施日期')
+ status = models.CharField('状态', max_length=50,
+ choices=status_choices, default='状态')
+
+ pass
+class ImplementRule(CommonAModel):
+ pass
\ No newline at end of file
diff --git a/server/apps/certset/tests.py b/server/apps/certset/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/server/apps/certset/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/server/apps/certset/views.py b/server/apps/certset/views.py
new file mode 100644
index 0000000..91ea44a
--- /dev/null
+++ b/server/apps/certset/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
diff --git a/server/apps/system/migrations/0019_auto_20200612_1448.py b/server/apps/system/migrations/0019_auto_20200612_1448.py
new file mode 100644
index 0000000..079f773
--- /dev/null
+++ b/server/apps/system/migrations/0019_auto_20200612_1448.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.0.7 on 2020-06-12 06:48
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('system', '0018_auto_20200610_1457'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='file',
+ name='create_by',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='file_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
+ ),
+ migrations.AlterField(
+ model_name='file',
+ name='update_by',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='file_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
+ ),
+ ]
diff --git a/server/apps/system/models.py b/server/apps/system/models.py
index 7641fb2..fbabf8f 100644
--- a/server/apps/system/models.py
+++ b/server/apps/system/models.py
@@ -172,9 +172,9 @@ class CommonAModel(SoftModel):
业务用基本表A,包含create_by, update_by字段
"""
create_by = models.ForeignKey(
- User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='创建人', related_name='create_by')
+ User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='创建人', related_name= '%(class)s_create_by')
update_by = models.ForeignKey(
- User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='最后编辑人', related_name='update_by')
+ User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='最后编辑人', related_name= '%(class)s_update_by')
class Meta:
abstract = True
@@ -184,11 +184,11 @@ class CommonBModel(SoftModel):
业务用基本表B,包含create_by, update_by, belong_dept字段
"""
create_by = models.ForeignKey(
- User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='创建人', related_name='create_by')
+ User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='创建人', related_name = '%(class)s_create_by')
update_by = models.ForeignKey(
- User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='最后编辑人', related_name='update_by')
+ User, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='最后编辑人', related_name = '%(class)s_update_by')
belong_dept = models.ForeignKey(
- Organization, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='所属部门', related_name='belong_dept')
+ Organization, null=True, blank=True, on_delete=models.SET_NULL, verbose_name='所属部门', related_name= '%(class)s_belong_dept')
class Meta:
abstract = True
diff --git a/server/server/settings.py b/server/server/settings.py
index 2ce89a3..bfecdc6 100644
--- a/server/server/settings.py
+++ b/server/server/settings.py
@@ -43,9 +43,10 @@ INSTALLED_APPS = [
'rest_framework',
'corsheaders',
"django_filters",
+ 'simple_history',
'apps.system',
'apps.crm',
- 'simple_history'
+ 'apps.certset'
]
MIDDLEWARE = [