diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py index 942ae3b..e0afabb 100644 --- a/hb_server/apps/mtm/serializers.py +++ b/hb_server/apps/mtm/serializers.py @@ -212,7 +212,7 @@ class RecordFormCreateSerializer(serializers.ModelSerializer): queryset=RecordForm.objects.all(), label="复制表ID", required=False) class Meta: model = RecordForm - fields = ['name', 'type', 'step', 'material', 'number', 'enabled', 'form'] + fields = ['name', 'type', 'step', 'material', 'number', 'enabled', 'form', 'export_template'] # def validate(self, attrs): @@ -225,7 +225,7 @@ class RecordFormCreateSerializer(serializers.ModelSerializer): class RecordFormUpdateSerializer(serializers.ModelSerializer): class Meta: model = RecordForm - fields = ['name', 'type', 'number', 'enabled'] + fields = ['name', 'type', 'number', 'enabled', 'export_template'] # def validate(self, attrs): # if attrs['enabled']: diff --git a/hb_server/apps/qm/export.py b/hb_server/apps/qm/export.py index 4b33030..127a2ba 100644 --- a/hb_server/apps/qm/export.py +++ b/hb_server/apps/qm/export.py @@ -8,9 +8,9 @@ from apps.mtm.models import RecordFormField -def exprot_test_record(tr:TestRecord): +def exprot_test_record(tr:TestRecord, tm:str): data = TestRecordDetailSerializer(instance=tr).data - doc = DocxTemplate(BASE_DIR + tr.form.export_template) + doc = DocxTemplate(BASE_DIR + tm) edata = {} edata['formName'] = data['form_']['name'] edata['glassSpec'] = data['wproduct_']['material_']['specification'] if data['wproduct_'] else '' diff --git a/hb_server/apps/qm/views.py b/hb_server/apps/qm/views.py index 8a76a25..374c2e0 100644 --- a/hb_server/apps/qm/views.py +++ b/hb_server/apps/qm/views.py @@ -107,8 +107,9 @@ class TestRecordViewSet(ListModelMixin, UpdateModelMixin, RetrieveModelMixin, De 按模板导出 """ instance = self.get_object() - if '/media/default/temp.docx': - path = exprot_test_record(tr=instance) + tm = instance.form.export_template + if tm: + path = exprot_test_record(tr=instance, tm=tm) return Response({'path':path}) raise ParseError('未配置导出模板') diff --git a/hb_server/media/default/temp.docx b/hb_server/media/default/temp.docx index f71f9af..4127f63 100644 Binary files a/hb_server/media/default/temp.docx and b/hb_server/media/default/temp.docx differ diff --git a/hb_server/media/default/~$temp.docx b/hb_server/media/default/~$temp.docx deleted file mode 100644 index 5941081..0000000 Binary files a/hb_server/media/default/~$temp.docx and /dev/null differ