diff --git a/hb_server/apps/mtm/migrations/0036_auto_20211123_1052.py b/hb_server/apps/mtm/migrations/0036_auto_20211123_1052.py new file mode 100644 index 0000000..c0e36de --- /dev/null +++ b/hb_server/apps/mtm/migrations/0036_auto_20211123_1052.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.9 on 2021-11-23 02:52 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0035_auto_20211117_1637'), + ] + + operations = [ + migrations.AddField( + model_name='recordformfield', + name='draw_template', + field=models.CharField(blank=True, max_length=200, null=True, verbose_name='绘图模板'), + ), + migrations.AlterField( + model_name='recordformfield', + name='field_type', + field=models.CharField(choices=[('string', '字符串'), ('int', '整型'), ('float', '浮点'), ('boolean', '布尔'), ('date', '日期'), ('time', '时间'), ('datetime', '日期时间'), ('radio', '单选'), ('checkbox', '多选'), ('select', '单选下拉'), ('selects', '多选下拉'), ('textarea', '文本域'), ('draw', '绘图')], max_length=50, verbose_name='类型'), + ), + ] diff --git a/hb_server/apps/mtm/models.py b/hb_server/apps/mtm/models.py index 46e82b4..c6ebc6e 100644 --- a/hb_server/apps/mtm/models.py +++ b/hb_server/apps/mtm/models.py @@ -131,6 +131,7 @@ class RecordFormField(CommonAModel): ('select', '单选下拉'), ('selects', '多选下拉'), ('textarea', '文本域'), + ('draw', '绘图') ) high_rule_choices = ( (1, '小于'), @@ -161,6 +162,8 @@ class RecordFormField(CommonAModel): is_hidden = models.BooleanField('是否隐藏', default=False) parent = models.ForeignKey('self', verbose_name='父', on_delete=models.CASCADE, null=True, blank=True) + draw_template = models.CharField('绘图模板', max_length=200, null=True, blank=True) + class Meta: verbose_name = '记录表格字段' diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index 84b0dbd..2b2a75f 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -514,7 +514,8 @@ class OperationRecordViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet): opr = self.get_object() wrds = [] for m in vdata['record_data']: # 保存记录详情 - form_field = RecordFormField.objects.get(pk=m['form_field']) + form_field = RecordFormField.objects.get(pk=m['form_field']) + m['form_field'] = form_field m['field_name'] = form_field.field_name m['field_key'] = form_field.field_key m['field_type'] = form_field.field_type