diff --git a/test_client/src/views/examtest/workscope.vue b/test_client/src/views/examtest/workscope.vue index 9854b30..949d459 100644 --- a/test_client/src/views/examtest/workscope.vue +++ b/test_client/src/views/examtest/workscope.vue @@ -34,9 +34,9 @@ 否 - + diff --git a/test_client/src/views/examtest/workscopecreate.vue b/test_client/src/views/examtest/workscopecreate.vue index f80fe71..b02e55c 100644 --- a/test_client/src/views/examtest/workscopecreate.vue +++ b/test_client/src/views/examtest/workscopecreate.vue @@ -34,7 +34,7 @@ > - + + + + 立即创建 重置 返回 - @@ -63,6 +65,7 @@ export default { can_exam:false, subject: null, questioncat: [], + sortnum:1 }, subjectData:[], questioncatData:[], diff --git a/test_client/src/views/examtest/workscopeupdate.vue b/test_client/src/views/examtest/workscopeupdate.vue index 9464ccb..98f4349 100644 --- a/test_client/src/views/examtest/workscopeupdate.vue +++ b/test_client/src/views/examtest/workscopeupdate.vue @@ -34,7 +34,7 @@ > - + + + + 保存 重置 返回 - diff --git a/test_server/crm/migrations/0029_auto_20210414_2144.py b/test_server/crm/migrations/0029_auto_20210414_2144.py new file mode 100644 index 0000000..86fdc29 --- /dev/null +++ b/test_server/crm/migrations/0029_auto_20210414_2144.py @@ -0,0 +1,25 @@ +# Generated by Django 3.0.4 on 2021-04-14 13:44 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('examtest', '0028_workscope_sortnum'), + ('crm', '0028_auto_20210413_2207'), + ] + + operations = [ + migrations.AlterField( + model_name='consumer', + name='name', + field=models.CharField(max_length=200, verbose_name='真实姓名'), + ), + migrations.AlterField( + model_name='consumer', + name='workscope', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='consumer_w', to='examtest.WorkScope', verbose_name='默认工作类别'), + ), + ] diff --git a/test_server/crm/migrations/0030_auto_20210414_2200.py b/test_server/crm/migrations/0030_auto_20210414_2200.py new file mode 100644 index 0000000..20fe134 --- /dev/null +++ b/test_server/crm/migrations/0030_auto_20210414_2200.py @@ -0,0 +1,36 @@ +# Generated by Django 3.0.4 on 2021-04-14 14:00 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('examtest', '0028_workscope_sortnum'), + ('crm', '0029_auto_20210414_2144'), + ] + + operations = [ + migrations.AddField( + model_name='candidate', + name='workscope', + field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, related_name='candidate_workscope', to='examtest.WorkScope'), + preserve_default=False, + ), + migrations.AddField( + model_name='consumer', + name='workscopes', + field=models.ManyToManyField(through='crm.Candidate', to='examtest.WorkScope', verbose_name='可选工作类别'), + ), + migrations.AlterField( + model_name='candidate', + name='issue_date', + field=models.DateField(blank=True, null=True, verbose_name='发证日期'), + ), + migrations.AlterField( + model_name='candidate', + name='report_number', + field=models.TextField(blank=True, null=True, verbose_name='报告单号'), + ), + ] diff --git a/test_server/crm/models.py b/test_server/crm/models.py index 37f8623..234dde2 100644 --- a/test_server/crm/models.py +++ b/test_server/crm/models.py @@ -55,14 +55,14 @@ class Consumer(CommonModel): ''' 学员 ''' - name = models.CharField(max_length=200, verbose_name='姓名') + name = models.CharField(max_length=200, verbose_name='真实姓名') username = models.CharField(max_length=11, verbose_name='手机号码', unique=True, null=True, blank=True) company = models.ForeignKey('Company', null=True, blank=True, on_delete=models.SET_NULL, verbose_name='所属单位') openid = models.CharField(max_length=200, verbose_name='openid', null=True, blank=True, unique=True) avatar = models.CharField(default='/media/default/avatar.png',max_length=1000, null=True, blank=True, verbose_name='头像') nickname = models.CharField(max_length=200, verbose_name='昵称', null=True, blank=True) subjects = models.ManyToManyField(Questioncat, verbose_name='付费学科', through='PaySubject') - workscope = models.ForeignKey(WorkScope, verbose_name='工作类别', on_delete=models.SET_NULL, null=True, blank=True) + workscope = models.ForeignKey(WorkScope, verbose_name='默认工作类别', on_delete=models.SET_NULL, null=True, blank=True, related_name='consumer_w') remain_count = models.IntegerField('体验次数', default=3) role = models.ForeignKey(ConsumerRole, verbose_name='用户角色', default=1, on_delete=models.SET_NULL, null=True, blank=True) @@ -77,7 +77,7 @@ class Consumer(CommonModel): deptname = models.CharField('所在部门', max_length=100, null=True, blank=True) exceed_date = models.DateField('账号过期', null=True, blank=True) - + workscopes = models.ManyToManyField(WorkScope, verbose_name='可选工作类别', through='crm.candidate') class Meta: verbose_name = '客户' verbose_name_plural = verbose_name @@ -106,5 +106,6 @@ class SendCode(CommonModel): class Candidate(CommonModel): consumer = models.ForeignKey(Consumer, on_delete=models.CASCADE, related_name='candidate_consumer') - report_number = models.TextField('报告单号') - issue_date = models.DateField('发证日期') \ No newline at end of file + workscope = models.ForeignKey(WorkScope, on_delete=models.CASCADE, related_name='candidate_workscope') + report_number = models.TextField('报告单号', null=True, blank=True) + issue_date = models.DateField('发证日期', null=True, blank=True) \ No newline at end of file diff --git a/test_server/examtest/migrations/0028_workscope_sortnum.py b/test_server/examtest/migrations/0028_workscope_sortnum.py new file mode 100644 index 0000000..0430db0 --- /dev/null +++ b/test_server/examtest/migrations/0028_workscope_sortnum.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.4 on 2021-04-14 13:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('examtest', '0027_exam_chance'), + ] + + operations = [ + migrations.AddField( + model_name='workscope', + name='sortnum', + field=models.IntegerField(default=1, verbose_name='排序码'), + ), + ] diff --git a/test_server/examtest/models_paper.py b/test_server/examtest/models_paper.py index 81b927a..f5a9f7f 100644 --- a/test_server/examtest/models_paper.py +++ b/test_server/examtest/models_paper.py @@ -33,6 +33,7 @@ class WorkScope(CommonModel): questioncat = models.ManyToManyField(Questioncat, verbose_name='所选科目') rule = models.ForeignKey(TestRule, on_delete=models.CASCADE, verbose_name='试卷结构') can_exam = models.BooleanField('是否可组织考试', default=False) + sortnum = models.IntegerField('排序码', default=1) # can_choose = models.BooleanField('客户是否可选择', default=False) class Meta: diff --git a/test_server/examtest/views.py b/test_server/examtest/views.py index 5581b52..5531d2e 100644 --- a/test_server/examtest/views.py +++ b/test_server/examtest/views.py @@ -178,7 +178,7 @@ class WorkScopeViewSet(ModelViewSet): queryset = WorkScope.objects.filter(is_delete=0).all().order_by("id") serializer_class = WorkScopeSerializer ordering_fields = ('id',) - ordering = ['id'] + ordering = ['sortnum'] filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter] filterset_fields = ['subject', 'can_exam'] search_fields = ('name',)