From 24d64a9e1706dca68d06d4babb78499982f9e4a0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 2 Sep 2021 13:39:02 +0800 Subject: [PATCH] =?UTF-8?q?formfield=20=E8=AF=BB=E5=8F=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mtm/migrations/0008_auto_20210901_1620.py | 60 +++++++++++++++++++ hb_server/apps/mtm/serializers.py | 2 +- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 hb_server/apps/mtm/migrations/0008_auto_20210901_1620.py diff --git a/hb_server/apps/mtm/migrations/0008_auto_20210901_1620.py b/hb_server/apps/mtm/migrations/0008_auto_20210901_1620.py new file mode 100644 index 0000000..3ef93c9 --- /dev/null +++ b/hb_server/apps/mtm/migrations/0008_auto_20210901_1620.py @@ -0,0 +1,60 @@ +# Generated by Django 3.2.6 on 2021-09-01 08:20 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('mtm', '0007_auto_20210831_1441'), + ] + + operations = [ + migrations.CreateModel( + name='RecordForm', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('name', models.CharField(max_length=100, unique=True, verbose_name='表格名称')), + ('type', models.IntegerField(choices=[(1, '生产记录')], default=1, verbose_name='表格类型')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='recordform_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('step', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.step', verbose_name='关联子工序')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='recordform_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'verbose_name': '记录表格', + 'verbose_name_plural': '记录表格', + }, + ), + migrations.CreateModel( + name='RecordFormField', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('field_type', models.CharField(choices=[('string', '字符串'), ('int', '整型'), ('float', '浮点'), ('boolean', '布尔'), ('date', '日期'), ('datetime', '日期时间'), ('radio', '单选'), ('checkbox', '多选'), ('select', '单选下拉'), ('selects', '多选下拉'), ('textarea', '文本域')], max_length=50, verbose_name='类型')), + ('field_key', models.CharField(help_text='字段类型请尽量特殊，避免与系统中关键字冲突', max_length=50, verbose_name='字段标识')), + ('field_name', models.CharField(max_length=50, verbose_name='字段名称')), + ('boolean_field_display', models.JSONField(blank=True, default=dict, help_text='当为布尔类型时候，可以支持自定义显示形式。{"1":"是","0":"否"}或{"1":"需要","0":"不需要"}，注意数字也需要引号', verbose_name='布尔类型显示名')), + ('field_choice', models.JSONField(blank=True, default=dict, help_text='radio,checkbox,select,multiselect类型可供选择的选项，格式为json如:{"1":"中国", "2":"美国"},注意数字也需要引号', verbose_name='radio、checkbox、select的选项')), + ('sort', models.IntegerField(default=1, verbose_name='排序号')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='recordformfield_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('form', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.recordform', verbose_name='关联表格')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='recordformfield_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'verbose_name': '记录表格字段', + 'verbose_name_plural': '记录表格字段', + }, + ), + migrations.DeleteModel( + name='StepOperationItem', + ), + ] diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py index 8103340..1440aaa 100644 --- a/hb_server/apps/mtm/serializers.py +++ b/hb_server/apps/mtm/serializers.py @@ -165,7 +165,7 @@ class RecordFormUpdateSerializer(serializers.ModelSerializer): class RecordFormFieldSerializer(serializers.ModelSerializer): class Meta: - model = RecordForm + model = RecordFormField fields = '__all__' class RecordFormFieldCreateSerializer(serializers.ModelSerializer):