From bd1255c47bd158d71251b59d5c40831468b42f96 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Tue, 14 Jul 2020 09:25:59 +0800
Subject: [PATCH] peixun
---
client/src/api/train.js | 18 +--
client/src/router/index.js | 20 +++
client/src/views/employee/train.vue | 146 ++++++++++++++++++++++
client/src/views/employee/traincreate.vue | 129 +++++++++++++++++++
client/src/views/employee/trainupdate.vue | 109 ++++++++++++++++
server/apps/employee/models.py | 4 +
6 files changed, 417 insertions(+), 9 deletions(-)
create mode 100644 client/src/views/employee/train.vue
create mode 100644 client/src/views/employee/traincreate.vue
create mode 100644 client/src/views/employee/trainupdate.vue
diff --git a/client/src/api/train.js b/client/src/api/train.js
index 13becc6..13d5ad6 100644
--- a/client/src/api/train.js
+++ b/client/src/api/train.js
@@ -1,32 +1,32 @@
import request from '@/utils/request'
-export function getUserDetailList(query) {
+export function getTrainList(query) {
return request({
- url: '/employee/userdetail/',
+ url: '/employee/train/',
method: 'get',
params: query
})
}
-export function createUserDetail(data) {
+export function createTrain(data) {
return request({
- url: '/employee/userdetail/',
+ url: '/employee/train/',
method: 'post',
data
})
}
-export function updateUserDetail(id, data) {
+export function updateTrain(id, data) {
return request({
- url: `/employee/userdetail/${id}/`,
+ url: `/employee/train/${id}/`,
method: 'put',
data
})
}
-export function deleteUserDetail(id) {
+export function deleteTrain(id) {
return request({
- url: `/employee/userdetail/${id}/`,
+ url: `/employee/train/${id}/`,
method: 'delete'
})
-}
\ No newline at end of file
+}
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 4f7ca98..d900bc0 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -87,6 +87,26 @@ export const asyncRoutes = [
component: () => import('@/views/employee/qualification'),
meta: { title: '注册资格', icon: 'example', perms: ['qualification_manage'] }
},
+ {
+ path: 'train',
+ name: 'Train',
+ component: () => import('@/views/employee/train'),
+ meta: { title: '人员培训', icon: 'example', perms: ['Train_manage'] }
+ },
+ {
+ path: 'train/create',
+ name: 'TrainCreate',
+ component: () => import('@/views/employee/traincreate'),
+ meta: { title: '新增人员培训', icon: 'example', perms: ['Train_create'] },
+ hidden: true
+ },
+ {
+ path: 'train/update',
+ name: 'TrainUpdate',
+ component: () => import('@/views/employee/trainupdate'),
+ meta: { title: '修改人员培训', icon: 'example', perms: ['Train_update'] },
+ hidden: true
+ },
]
},
{
diff --git a/client/src/views/employee/train.vue b/client/src/views/employee/train.vue
new file mode 100644
index 0000000..cb46a31
--- /dev/null
+++ b/client/src/views/employee/train.vue
@@ -0,0 +1,146 @@
+
+
+
+
+ 新增
+
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+ {{ scope.row.start_time }}
+
+
+
+
+ {{ scope.row.end_time }}
+
+
+
+
+ {{ scope.row.hours }}
+
+
+
+
+ {{ scope.row.train_org }}
+
+
+
+
+
+ {{ scope.row.teacher }}
+
+
+
+
+ {{ scope.row.content }}
+
+
+
+
+ {{ scope.row.remark }}
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+ 重置
+
+
+
+
+
diff --git a/client/src/views/employee/trainupdate.vue b/client/src/views/employee/trainupdate.vue
new file mode 100644
index 0000000..1bf387d
--- /dev/null
+++ b/client/src/views/employee/trainupdate.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+ 重置
+
+
+
+
+
\ No newline at end of file
diff --git a/server/apps/employee/models.py b/server/apps/employee/models.py
index e5b64a7..2ea6752 100644
--- a/server/apps/employee/models.py
+++ b/server/apps/employee/models.py
@@ -144,6 +144,10 @@ class Train(CommonAModel):
train_org = models.CharField('培训机构', max_length=200)
teacher = models.CharField('主讲人', max_length=200)
content = models.TextField('培训内容')
+ rain_address = models.CharField('地点机构', max_length=500)
+ examine_Type = models.CharField('考核方式', max_length=200)
+ train_type =models.ForeignKey(
+ Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='培训类型', related_name='train_level')
remark = models.TextField('备注')
employees = models.ManyToManyField(Employee, verbose_name='参加人员', related_name='train_employees')