diff --git a/client/.env.production b/client/.env.production index 1db701b..86e0c3a 100644 --- a/client/.env.production +++ b/client/.env.production @@ -2,5 +2,5 @@ ENV = 'production' # base api -VUE_APP_BASE_API = 'http://121.36.23.77:8000' +VUE_APP_BASE_API = 'http://121.36.23.77:8036/api' diff --git a/client/src/main.js b/client/src/main.js index 1565358..c19a7d5 100644 --- a/client/src/main.js +++ b/client/src/main.js @@ -32,6 +32,7 @@ if (process.env.NODE_ENV === 'production') { // set ElementUI lang to EN // Vue.use(ElementUI, { locale }) // 如果想要中文版 element-ui,按如下方式声明 +ElementUI.Input.props.clearable.default=true; Vue.use(ElementUI, { size: 'medium' }) Vue.config.productionTip = false diff --git a/client/src/router/index.js b/client/src/router/index.js index 39d7d6d..1411268 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -192,7 +192,29 @@ export const asyncRoutes = [ }, ] }, - + { + path: '/testorg', + component: Layout, + redirect: '/testorg/testorg', + name: 'testorg', + meta: { title: '产品检测', icon: 'example' }, + children: [ + + { + path: 'testorg', + name: 'TestOrg', + component: () => import('@/views/testorg/testorg'), + meta: { title: '实验室信息', icon: 'example', perms: ['testorg_manage'] } + }, + { + path: 'testorgnotice', + name: 'TextOrgNotice', + component: () => import('@/views/testorg/testorgnotice'), + meta: { title: '实验室通知公告', icon: 'example', perms: ['testorg_manage'] } + }, + + ] + }, { path: '/accessment', component: Layout, @@ -215,6 +237,21 @@ export const asyncRoutes = [ }, ] }, + { + path: '/certificate', + component: Layout, + redirect: '/certificate/index', + name: 'CertificateManage', + meta: { title: '证书管理', icon: 'example'}, + children: [ + { + path: 'index', + name: 'Certificate', + component: () => import('@/views/certificate/index'), + meta: { title: '证书管理', icon: 'example', perms: ['certificate_view'] } + }, + ] + }, { path: '/employee', component: Layout, @@ -363,29 +400,6 @@ export const asyncRoutes = [ }, ] }, - { - path: '/testorg', - component: Layout, - redirect: '/testorg/testorg', - name: 'testorg', - meta: { title: '产品检测', icon: 'example' }, - children: [ - - { - path: 'testorg', - name: 'TestOrg', - component: () => import('@/views/testorg/testorg'), - meta: { title: '实验室信息', icon: 'example', perms: ['testorg_manage'] } - }, - { - path: 'testorgnotice', - name: 'TextOrgNotice', - component: () => import('@/views/testorg/testorgnotice'), - meta: { title: '实验室通知公告', icon: 'example', perms: ['testorg_manage'] } - }, - - ] - }, { path: '/system', diff --git a/client/src/styles/index.scss b/client/src/styles/index.scss index c896027..797311f 100644 --- a/client/src/styles/index.scss +++ b/client/src/styles/index.scss @@ -70,7 +70,10 @@ div:focus { .el-form-item { margin-bottom: 16px; } - +.el-card, .el-message { + border-radius: 0px; + overflow: hidden; +} .el-card__body { padding: 6px; } @@ -94,4 +97,7 @@ div:focus { } .el-button+.el-button { margin-left: 1px; +} +.el-button { + border-radius: 0px; } \ No newline at end of file diff --git a/client/src/views/accessment/access.vue b/client/src/views/accessment/access.vue index 15637f1..947a513 100644 --- a/client/src/views/accessment/access.vue +++ b/client/src/views/accessment/access.vue @@ -2,14 +2,48 @@
- 评定结论 + 认证结果评价 + 创建
+ + + + + + + + + + + + + +
\ No newline at end of file diff --git a/client/src/views/accessment/index.vue b/client/src/views/accessment/index.vue index 2e6a03e..c220e67 100644 --- a/client/src/views/accessment/index.vue +++ b/client/src/views/accessment/index.vue @@ -38,7 +38,7 @@ fit stripe highlight-current-row - max-height="600" + > diff --git a/client/src/views/audit/member.vue b/client/src/views/audit/member.vue index 71ddea9..f3f92ce 100644 --- a/client/src/views/audit/member.vue +++ b/client/src/views/audit/member.vue @@ -73,6 +73,7 @@ v-model="formDataMember.identity" placeholder="请选择" :style="{width: '100%'}" + clearable > - - + 添加新成员 保存 重置 - @@ -136,10 +135,8 @@ - - + 保存 - diff --git a/client/src/views/certificate/access.vue b/client/src/views/certificate/access.vue new file mode 100644 index 0000000..947a513 --- /dev/null +++ b/client/src/views/certificate/access.vue @@ -0,0 +1,49 @@ + + \ No newline at end of file diff --git a/client/src/views/certificate/index.vue b/client/src/views/certificate/index.vue new file mode 100644 index 0000000..c220e67 --- /dev/null +++ b/client/src/views/certificate/index.vue @@ -0,0 +1,180 @@ + + diff --git a/server/apps/accessment/__init__.py b/server/apps/accessment/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/server/apps/accessment/admin.py b/server/apps/accessment/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/server/apps/accessment/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/server/apps/accessment/apps.py b/server/apps/accessment/apps.py new file mode 100644 index 0000000..d85037e --- /dev/null +++ b/server/apps/accessment/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class AccessmentConfig(AppConfig): + name = 'accessment' diff --git a/server/apps/accessment/migrations/__init__.py b/server/apps/accessment/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/server/apps/accessment/models.py b/server/apps/accessment/models.py new file mode 100644 index 0000000..6d7ea56 --- /dev/null +++ b/server/apps/accessment/models.py @@ -0,0 +1,16 @@ +from utils import model +from django.contrib.postgres.fields import JSONField +from django.db import models +from rest_framework.exceptions import ParseError +from simple_history.models import HistoricalRecords + +from apps.certset.models import ImplementRule, UnitType, EvaluationItem, Standard +from apps.crm.models import Enterprise +from apps.project.models import CertApp +from apps.system.models import CommonAModel, CommonBModel, Dict, User + +# class Accessment(CommonAModel): +# """ +# 认证评定 +# """ +# number = models.CharField('评定表编号', unique=True, max_length=200) \ No newline at end of file diff --git a/server/apps/accessment/tests.py b/server/apps/accessment/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/server/apps/accessment/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/server/apps/accessment/views.py b/server/apps/accessment/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/server/apps/accessment/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/server/apps/crm/models.py b/server/apps/crm/models.py index a676b6b..10c8ce7 100644 --- a/server/apps/crm/models.py +++ b/server/apps/crm/models.py @@ -79,3 +79,6 @@ class EnterpriseAddress(CommonAModel): def __str__(self): return self.name +# class Product(CommonAModel): +# name = models.CharField('名称', max_length=200) +# description = models.TextField('产品描述', null=True, blank=True) \ No newline at end of file diff --git a/server/apps/project/migrations/0033_merge_20200917_1443.py b/server/apps/project/migrations/0033_merge_20200917_1443.py new file mode 100644 index 0000000..f7d824d --- /dev/null +++ b/server/apps/project/migrations/0033_merge_20200917_1443.py @@ -0,0 +1,14 @@ +# Generated by Django 3.0.7 on 2020-09-17 06:43 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('project', '0032_merge_20200903_1142'), + ('project', '0029_auto_20200904_1553'), + ] + + operations = [ + ] diff --git a/server/apps/project/migrations/0034_auto_20200917_1444.py b/server/apps/project/migrations/0034_auto_20200917_1444.py new file mode 100644 index 0000000..c70c228 --- /dev/null +++ b/server/apps/project/migrations/0034_auto_20200917_1444.py @@ -0,0 +1,21 @@ +# Generated by Django 3.0.7 on 2020-09-17 06:44 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('project', '0033_merge_20200917_1443'), + ] + + operations = [ + migrations.RemoveField( + model_name='certapp', + name='certification', + ), + migrations.RemoveField( + model_name='certapp', + name='professional_code', + ), + ] diff --git a/server/apps/project/models.py b/server/apps/project/models.py index 9a31ffa..bd5758d 100644 --- a/server/apps/project/models.py +++ b/server/apps/project/models.py @@ -104,8 +104,6 @@ class CertApp(CommonBModel): supervise_amount = models.FloatField('监督金额',null=True, blank=True, default=0) review_amount = models.FloatField('复评金额',null=True, blank=True, default=0) system_standard = models.ForeignKey(Dict, verbose_name='依据的体系标准',null=True, blank=True, related_name='certapp_system_standard', on_delete=models.DO_NOTHING) - professional_code = models.ManyToManyField(Dict, verbose_name='专业代码', related_name='certapp_professional_code') - certification = models.CharField('认证范围', max_length = 1000, null=True, blank=True) risk = models.CharField('风险系数', choices=risk_choices, max_length=50, null=True, blank=True) class Meta: verbose_name = '认证受理'