zcdsj
/
examtest
mirror of https://e.coding.net/ctcdevteam/examtest.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加工作类别排序

This commit is contained in:
caoqianming 2021-04-14 22:07:26 +08:00
parent 61e7073f56
commit bdd68f6b61
9 changed files with 98 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test_client/src/views/examtest/workscope.vue
View File

@ -34,9 +34,9 @@
<el-tag type="warning" v-else>否</el-tag>
</template>
</el-table-column>
<el-table-column label="创建日期">
<el-table-column label="排序">
<template slot-scope="scope">
<span>{{ scope.row.create_time }}</span>
<span>{{ scope.row.sortnum }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作">

7
test_client/src/views/examtest/workscopecreate.vue
View File

@ -34,7 +34,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="试卷结构" prop="subject">
<el-form-item label="试卷结构">
<el-select v-model="Form.rule" placeholder="请选择试卷结构" style="width:400px">
<el-option
v-for="item in ruleData"
@ -44,10 +44,12 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="排序码">
<el-input-number v-model="Form.sortnum" :min="1" ></el-input-number>
</el-form-item>
<el-button type="primary" @click="submitForm('Form')" :loading="submitLoding">立即创建</el-button>
<el-button @click="resetForm('Form')">重置</el-button>
<el-button type="warning" @click="goBack()">返回</el-button>
</el-form-item>
</el-form>
</div>
</template>
@ -63,6 +65,7 @@ export default {
can_exam:false,
subject: null,
questioncat: [],
sortnum:1
},
subjectData:[],
questioncatData:[],

6
test_client/src/views/examtest/workscopeupdate.vue
View File

@ -34,7 +34,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="试卷结构" prop="subject">
<el-form-item label="试卷结构" >
<el-select v-model="Form.rule" placeholder="请选择试卷结构" style="width:400px">
<el-option
v-for="item in ruleData"
@ -44,10 +44,12 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="排序码">
<el-input-number v-model="Form.sortnum" :min="1" ></el-input-number>
</el-form-item>
<el-button type="primary" @click="submitForm('Form')" :loading="submitLoding">保存</el-button>
<el-button @click="resetForm('Form')">重置</el-button>
<el-button type="warning" @click="goBack()">返回</el-button>
</el-form-item>
</el-form>
</div>
</template>

25
test_server/crm/migrations/0029_auto_20210414_2144.py Normal file
View File

@ -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='默认工作类别'),
),
]

36
test_server/crm/migrations/0030_auto_20210414_2200.py Normal file
View File

@ -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='报告单号'),
),
]

11
test_server/crm/models.py
View File

@ -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('发证日期')
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)

18
test_server/examtest/migrations/0028_workscope_sortnum.py Normal file
View File

@ -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='排序码'),
),
]

1
test_server/examtest/models_paper.py
View File

@ -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:

2
test_server/examtest/views.py
View File

@ -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',)