diff --git a/client/src/App.vue b/client/src/App.vue
index f7e1c74..0942ea4 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -7,7 +7,7 @@
.el-table--medium td, .el-table--medium th {
- padding: 0px 0;
+ padding: 5px 0;
}
.el-form-item {
margin-bottom: 10px;
diff --git a/client/src/api/evaluationdetail.js b/client/src/api/evaluationdetail.js
new file mode 100644
index 0000000..8c3d8fe
--- /dev/null
+++ b/client/src/api/evaluationdetail.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+
+export function getEvaluationDetailList(query) {
+ return request({
+ url: '/project/evaluationdetail/',
+ method: 'get',
+ params: query
+ })
+}
+export function getEvaluationDetail(id) {
+ return request({
+ url: `/project/evaluationdetail/${id}/`,
+ method: 'get'
+ })
+}
+export function createEvaluationDetail(data) {
+ return request({
+ url: '/project/evaluationdetail/',
+ method: 'post',
+ data
+ })
+}
+
+export function updateEvaluationDetail(id, data) {
+ return request({
+ url: `/project/evaluationdetail/${id}/`,
+ method: 'put',
+ data
+ })
+}
+
+export function deleteEvaluationDetail(id) {
+ return request({
+ url: `/project/evaluationdetail/ ${id}/`,
+ method: 'delete'
+ })
+}
+
diff --git a/client/src/api/laboratory.js b/client/src/api/laboratory.js
index f2dafa4..7662c3d 100644
--- a/client/src/api/laboratory.js
+++ b/client/src/api/laboratory.js
@@ -1,73 +1,73 @@
import request from '@/utils/request'
-export function getDetectOrgList(query) {
+export function getTestOrgList(query) {
return request({
- url: '/laboratory/detectorg/',
+ url: '/laboratory/testorg/',
method: 'get',
params: query
})
}
-export function getDetectOrg(id) {
+export function getTestOrg(id) {
return request({
- url: `/laboratory/detectorg/${id}/`,
+ url: `/laboratory/testorg/${id}/`,
method: 'get'
})
}
-export function createDetectOrg(data) {
+export function createTestOrg(data) {
return request({
- url: '/laboratory/detectorg/',
+ url: '/laboratory/testorg/',
method: 'post',
data
})
}
-export function updateDetectOrg(id, data) {
+export function updateTestOrg(id, data) {
return request({
- url: `/laboratory/detectorg/${id}/`,
+ url: `/laboratory/testorg/${id}/`,
method: 'put',
data
})
}
-export function deleteDetectOrg(id) {
+export function deleteTestOrg(id) {
return request({
- url: `/laboratory/detectorg/${id}/`,
+ url: `/laboratory/testorg/${id}/`,
method: 'delete'
})
}
-export function getDetectOrgNoticeList(query) {
+export function getTestOrgNoticeList(query) {
return request({
- url: '/laboratory/detectorgnotice/',
+ url: '/laboratory/testnotice/',
method: 'get',
params: query
})
}
-export function getDetectOrgNotice(id) {
+export function getTestOrgNotice(id) {
return request({
- url: `/laboratory/detectorgnotice/${id}/`,
+ url: `/laboratory/testnotice/${id}/`,
method: 'get'
})
}
-export function createDetectOrgNotice(data) {
+export function createTestOrgNotice(data) {
return request({
- url: '/laboratory/detectorgnotice/',
+ url: '/laboratory/testnotice/',
method: 'post',
data
})
}
-export function updateDetectOrgNotice(id, data) {
+export function updateTestOrgNotice(id, data) {
return request({
- url: `/laboratory/detectorgnotice/${id}/`,
+ url: `/laboratory/testnotice/${id}/`,
method: 'put',
data
})
}
-export function deleteDetectOrgNotice(id) {
+export function deleteTestOrgNotice(id) {
return request({
- url: `/laboratory/detectorgnotice/${id}/`,
+ url: `/laboratory/testnotice/${id}/`,
method: 'delete'
})
}
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 914c2bb..b34ed9a 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -249,24 +249,24 @@ export const asyncRoutes = [
]
},
{
- path: '/detectorg',
+ path: '/testorg',
component: Layout,
- redirect: '/detectorg/detectorg',
- name: 'detectorg',
+ redirect: '/testorg/testorg',
+ name: 'testorg',
meta: { title: '实验室管理', icon: 'example' },
children: [
{
- path: 'detectorg',
- name: 'DetectOrg',
- component: () => import('@/views/detectorg/detectorg'),
- meta: { title: '实验室信息', icon: 'example', perms: ['detectorg_manage'] }
+ path: 'testorg',
+ name: 'TestOrg',
+ component: () => import('@/views/testorg/testorg'),
+ meta: { title: '实验室信息', icon: 'example', perms: ['testorg_manage'] }
},
{
- path: 'detectorgnotice',
- name: 'DetectOrgNotice',
- component: () => import('@/views/detectorg/detectorgnotice'),
- meta: { title: '实验室通知公告', icon: 'example', perms: ['detectorg_manage'] }
+ path: 'testorgnotice',
+ name: 'TextOrgNotice',
+ component: () => import('@/views/testorg/testorgnotice'),
+ meta: { title: '实验室通知公告', icon: 'example', perms: ['testorg_manage'] }
},
]
diff --git a/client/src/views/certapp/certappform.vue b/client/src/views/certapp/certappform.vue
index c62001b..cbf4fc0 100644
--- a/client/src/views/certapp/certappform.vue
+++ b/client/src/views/certapp/certappform.vue
@@ -1,32 +1,37 @@
-
+
+
+
+
-
+
-
+
-
+
-
+
+
diff --git a/client/src/views/certapp/dtxform .vue b/client/src/views/certapp/dtxform .vue
new file mode 100644
index 0000000..f39fcb3
--- /dev/null
+++ b/client/src/views/certapp/dtxform .vue
@@ -0,0 +1,430 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.content }}
+
+
+
+
+
+
+ 符合
+ 不符合
+ 不适用
+ 需说明
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
新增
-
+
-
+
- {{ scope.row.cert_field }}
+ {{ scope.row.name }}
-
- {{ scope.row.name }}
+
+
+ {{ scope.row.cert_field.name}}
+
-
+
+
{{ scope.row.create_time }}
-
-
- 编辑
-
- 删除
-
-
+
+
+ 编辑
+
+ 删除
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- 保存
- 重置
-
-
-
-
+
+
+
+
+
+ 保存
+ 重置
+
+
+
+
@@ -79,7 +79,7 @@ export default {
id: null,
name:undefined,
cert_field: undefined,
- pv_scope: undefined,
+ pv_scope: undefined,
pv_class: undefined,
ccc_list: undefined
@@ -105,7 +105,44 @@ export default {
this.getCerttype();
},
mounted() {},
- methods: {
+ methods: {
+ typeChange(node,id){
+ this.cert_field_code = node.code
+ this.changeRules(node.code)
+ },
+ changeRules(val) {
+ if (val == "PV") {
+ this.rules.pv_scope = [
+ {
+ required: true,
+ message: "请选择",
+ trigger: "change"
+ }
+ ];
+ this.rules.pv_class = [
+ {
+ required: true,
+ message: "请选择",
+ trigger: "change"
+ }
+ ];
+ this.rules.ccc_list = [];
+ } else if (val == "CCC") {
+ this.rules.ccc_list = [
+ {
+ required: true,
+ message: "请选择",
+ trigger: "change"
+ }
+ ];
+ this.rules.pv_class = [];
+ this.rules.pv_scope = [];
+ } else {
+ this.rules.pv_class = [];
+ this.rules.pv_scope = [];
+ this.rules.ccc_list = [];
+ }
+ },
getCerttype() {
getDictList({ type__code: "cert_field" }).then(response => {
if (response.data) {
diff --git a/client/src/views/evaluation/evaluationitemupdate.vue b/client/src/views/evaluation/evaluationitemupdate.vue
index dc0c204..1b26c1a 100644
--- a/client/src/views/evaluation/evaluationitemupdate.vue
+++ b/client/src/views/evaluation/evaluationitemupdate.vue
@@ -6,18 +6,37 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
@@ -41,7 +60,9 @@