diff --git a/client/src/router/index.js b/client/src/router/index.js index 39f48dc..1c422a5 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -216,17 +216,24 @@ export const asyncRoutes = [ ] }, { - path: '/judge', + path: '/accessment', component: Layout, - redirect: '/judge/judge', - name: 'JudgeM', + redirect: '/accessment/index', + name: 'AccessmentManage', meta: { title: '认证评定', icon: 'example'}, children: [ { - path: 'judge', - name: 'Judge', - component: () => import('@/views/plan/plan'), - meta: { title: '认证评定', icon: 'example', perms: ['plan_view'] } + path: 'index', + name: 'Accessment', + component: () => import('@/views/accessment/index'), + meta: { title: '认证评定', icon: 'example', perms: ['accessment_view'] } + }, + { + path: 'certapp/:id/:action/', + name: 'Certappaccess', + component: () => import('@/views/certapp/certapphandle'), + meta: { title: '业务评定', icon: 'example', perms: ['certapp_access'] }, + hidden: true }, ] }, diff --git a/client/src/styles/index.scss b/client/src/styles/index.scss index f6533a1..c896027 100644 --- a/client/src/styles/index.scss +++ b/client/src/styles/index.scss @@ -91,4 +91,7 @@ div:focus { // } .el-form--label-top .el-form-item__label { line-height: 16px; +} +.el-button+.el-button { + margin-left: 1px; } \ No newline at end of file diff --git a/client/src/views/accessment/access.vue b/client/src/views/accessment/access.vue new file mode 100644 index 0000000..15637f1 --- /dev/null +++ b/client/src/views/accessment/access.vue @@ -0,0 +1,15 @@ + + + + + 评定结论 + + + + + \ No newline at end of file diff --git a/client/src/views/accessment/index.vue b/client/src/views/accessment/index.vue new file mode 100644 index 0000000..2e6a03e --- /dev/null +++ b/client/src/views/accessment/index.vue @@ -0,0 +1,180 @@ + + + + + + + 搜索 + 刷新重置 + + + + + {{ scope.row.number }} + + + + {{scope.row.cert_field_.name}} + {{scope.row.cccpv_class_.name}} + + + + + 申请方:{{ scope.row.applicant_v.name }} + 制造商:{{ scope.row.manufacture_v.name }} + 生产厂:{{ scope.row.factory_v.name }} + + + + + {{ scope.row.status}} + + + + {{ scope.row.create_by_.name}} + + + + {{ scope.row.create_time }} + + + + + 评定 + 详情 + + + + + + + + diff --git a/client/src/views/certapp/certapphandle.vue b/client/src/views/certapp/certapphandle.vue index 2318858..120d14c 100644 --- a/client/src/views/certapp/certapphandle.vue +++ b/client/src/views/certapp/certapphandle.vue @@ -1,6 +1,20 @@ - + + + + + + + + + + + + + + + @@ -28,7 +42,29 @@ + + + + + + + + 业务时间线 + + + + {{activity.content}} + + + + + + +