diff --git a/client/src/router/index.js b/client/src/router/index.js
index d900bc0..a674373 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -107,6 +107,13 @@ export const asyncRoutes = [
meta: { title: '修改人员培训', icon: 'example', perms: ['Train_update'] },
hidden: true
},
+ {
+ path: 'user/select',
+ name: 'UserSelect',
+ component: () => import('@/views/employee/userselet'),
+ meta: { title: '选择人员', icon: 'example', perms: ['User_select'] },
+ hidden: true
+ },
]
},
{
diff --git a/client/src/views/employee/traincreate.vue b/client/src/views/employee/traincreate.vue
index 42f89e0..950cac4 100644
--- a/client/src/views/employee/traincreate.vue
+++ b/client/src/views/employee/traincreate.vue
@@ -46,6 +46,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ link跳转
+
+
+
+
+
+
+
@@ -53,66 +73,91 @@
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 提交
- 重置
-
+
+ 提交
+ 重置
+
diff --git a/server/apps/employee/migrations/0005_auto_20200714_0943.py b/server/apps/employee/migrations/0005_auto_20200714_0943.py
new file mode 100644
index 0000000..88d13fa
--- /dev/null
+++ b/server/apps/employee/migrations/0005_auto_20200714_0943.py
@@ -0,0 +1,50 @@
+# Generated by Django 3.0.5 on 2020-07-14 01:43
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('system', '0022_auto_20200710_1535'),
+ ('employee', '0004_auto_20200710_1535'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='train',
+ name='kaohe_type',
+ field=models.CharField(blank=True, max_length=200, null=True, verbose_name='考核方式'),
+ ),
+ migrations.AddField(
+ model_name='train',
+ name='rain_address',
+ field=models.CharField(blank=True, max_length=500, null=True, verbose_name='地点机构'),
+ ),
+ migrations.AddField(
+ model_name='train',
+ name='train_type',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='train_train_type', to='system.Dict', verbose_name='培训类型'),
+ ),
+ migrations.AlterField(
+ model_name='train',
+ name='hours',
+ field=models.IntegerField(blank=True, default=1, null=True, verbose_name='学时'),
+ ),
+ migrations.AlterField(
+ model_name='train',
+ name='remark',
+ field=models.TextField(blank=True, null=True, verbose_name='备注'),
+ ),
+ migrations.AlterField(
+ model_name='train',
+ name='teacher',
+ field=models.CharField(blank=True, max_length=200, null=True, verbose_name='主讲人'),
+ ),
+ migrations.AlterField(
+ model_name='train',
+ name='train_org',
+ field=models.CharField(blank=True, max_length=200, null=True, verbose_name='培训机构'),
+ ),
+ ]
diff --git a/server/apps/employee/models.py b/server/apps/employee/models.py
index 2ea6752..224f43b 100644
--- a/server/apps/employee/models.py
+++ b/server/apps/employee/models.py
@@ -140,15 +140,14 @@ class Train(CommonAModel):
name = models.CharField('培训主题', max_length=200)
start_time = models.DateTimeField('开始时间')
end_time = models.DateTimeField('结束时间')
- hours = models.IntegerField('学时', default=1)
- train_org = models.CharField('培训机构', max_length=200)
- teacher = models.CharField('主讲人', max_length=200)
+ hours = models.IntegerField('学时', null=True, blank=True, default=1)
+ train_org = models.CharField('培训机构', null=True, blank=True, max_length=200)
+ teacher = models.CharField('主讲人', null=True, blank=True, 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('备注')
+ rain_address = models.CharField('地点机构', null=True, blank=True, max_length=500)
+ kaohe_type = models.CharField('考核方式', null=True, blank=True, max_length=200)
+ train_type =models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='培训类型', related_name='train_train_type')
+ remark = models.TextField('备注', null=True, blank=True, )
employees = models.ManyToManyField(Employee, verbose_name='参加人员', related_name='train_employees')
class Meta: