recordform增加enabled,number字段
This commit is contained in:
parent
e92bc40493
commit
20b5cdde67
|
@ -0,0 +1,23 @@
|
|||
# Generated by Django 3.2.9 on 2021-12-01 02:16
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('mtm', '0038_process_type'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='recordform',
|
||||
name='enabled',
|
||||
field=models.BooleanField(default=False, verbose_name='是否启用'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='recordform',
|
||||
name='number',
|
||||
field=models.CharField(blank=True, max_length=32, null=True, verbose_name='编号'),
|
||||
),
|
||||
]
|
|
@ -115,6 +115,8 @@ class RecordForm(CommonAModel):
|
|||
type = models.IntegerField('表格类型', choices=type_choices, default=1)
|
||||
step = models.ForeignKey(Step, verbose_name='关联子工序', on_delete=models.CASCADE, null=True, blank=True)
|
||||
material = models.ForeignKey(Material, verbose_name='关联物料', on_delete=models.CASCADE, null=True, blank=True)
|
||||
enabled = models.BooleanField('是否启用', default=False)
|
||||
number = models.CharField('编号', null=True, blank=True, max_length=32)
|
||||
|
||||
class Meta:
|
||||
verbose_name = '记录表格'
|
||||
|
|
|
@ -160,7 +160,7 @@ class RecordFormSimpleSerializer(serializers.ModelSerializer):
|
|||
|
||||
class Meta:
|
||||
model = RecordForm
|
||||
fields = ['id', 'name']
|
||||
fields = ['id', 'name', 'number', 'enabled']
|
||||
class RecordFormSerializer(serializers.ModelSerializer):
|
||||
step_ = StepSimpleSerializer(source='step', read_only=True)
|
||||
material_ = MaterialSimpleSerializer(source='material', read_only=True)
|
||||
|
@ -180,12 +180,12 @@ class RecordFormSerializer(serializers.ModelSerializer):
|
|||
class RecordFormCreateSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = RecordForm
|
||||
fields = ['name', 'type', 'step', 'material']
|
||||
fields = ['name', 'type', 'step', 'material', 'number', 'enabled']
|
||||
|
||||
class RecordFormUpdateSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = RecordForm
|
||||
fields = ['name', 'type']
|
||||
fields = ['name', 'type', 'number', 'enabled']
|
||||
|
||||
class RecordFormFieldSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
|
|
|
@ -40,7 +40,7 @@ class ProcessViewSet(PageOrNot, CreateUpdateModelAMixin, ModelViewSet):
|
|||
queryset = Process.objects.select_related('instruction', 'workshop').all()
|
||||
serializer_class = ProcessSerializer
|
||||
search_fields = ['name', 'number']
|
||||
filterset_fields = ['number', 'workshop']
|
||||
filterset_fields = ['number', 'workshop', 'type']
|
||||
ordering_fields = ['number']
|
||||
ordering = ['number']
|
||||
|
||||
|
@ -151,7 +151,7 @@ class RecordFormViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelViewSet
|
|||
"""
|
||||
perms_map = {'*':'*'}
|
||||
queryset = RecordForm.objects.all()
|
||||
filterset_fields = ['step', 'type', 'material']
|
||||
filterset_fields = ['step', 'type', 'material', 'number', 'enabled']
|
||||
search_fields = ['name']
|
||||
ordering='id'
|
||||
|
||||
|
|
Loading…
Reference in New Issue