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/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/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..159e402 --- /dev/null +++ b/server/apps/accessment/models.py @@ -0,0 +1,10 @@ +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 \ 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.