zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

表单初始化排序

This commit is contained in:
caoqianming 2021-12-10 13:43:10 +08:00
parent ae10c93caf
commit ccbe2b280f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hb_server/apps/mtm/serializers.py
View File

@ -208,7 +208,7 @@ class RecordFormDetailSerializer(serializers.ModelSerializer):
return queryset return queryset
def get_form_fields(self, obj): def get_form_fields(self, obj):
serializer = RecordFormFieldSerializer(instance=RecordFormField.objects.filter(form=obj, is_deleted=False), many=True) serializer = RecordFormFieldSerializer(instance=RecordFormField.objects.filter(form=obj, is_deleted=False).order_by('sort'), many=True)
data = serializer.data data = serializer.data
if obj.type == RecordForm.RF_TYPE_TEST: if obj.type == RecordForm.RF_TYPE_TEST:
for i in data: for i in data:

2
hb_server/apps/wpm/views.py
View File

@ -208,7 +208,7 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
for i in origin_test['record_data_']: for i in origin_test['record_data_']:
o_dict[i['field_key']] = i['field_value'] o_dict[i['field_key']] = i['field_value']
for i in data['form_fields']: for i in data['form_fields']:
i['origin_value'] = o_dict[i['field_key']] i['origin_value'] = o_dict[i['field_key']] if i['field_key'] in o_dict else None
else: else:
raise exceptions.APIException('原工序检验记录不存在') raise exceptions.APIException('原工序检验记录不存在')
else: else: