diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py index d6b9d8c..f3614f9 100644 --- a/hb_server/apps/mtm/views.py +++ b/hb_server/apps/mtm/views.py @@ -179,8 +179,8 @@ class RecordFormViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelViewSet """ 记录表格增删改查 """ - perms_map = {'get':'*', 'post':'recordform_create', - 'put':'recordform_update', 'delete':'recordform_delete'} + perms_map = {'get':'*', 'post':'*', + 'put':'*', 'delete':'*'} queryset = RecordForm.objects.all() filterset_fields = ['step', 'type', 'material', 'number', 'enabled'] search_fields = ['name'] @@ -229,8 +229,8 @@ class RecordFormFieldViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelVi """ 表格字段表 增删改查 """ - perms_map = {'get':'*', 'post':'recordform_update', - 'put':'recordform_update', 'delete':'recordform_update'} + perms_map = {'get':'*', 'post':'*', + 'put':'*', 'delete':'*'} queryset = RecordFormField.objects.all() filterset_fields = ['field_type', 'form'] search_fields = ['field_name', 'field_key'] diff --git a/hb_server/apps/qm/export.py b/hb_server/apps/qm/export.py index c107e7c..e34ce99 100644 --- a/hb_server/apps/qm/export.py +++ b/hb_server/apps/qm/export.py @@ -28,11 +28,9 @@ def exprot_test_record(tr:TestRecord, tm:str): 'l': InlineImage(doc, BASE_DIR + i['field_value'], width=Mm(80)), } else: - if i['field_value']: + edata[i['field_key']] = i['origin_value'] if 'origin_value' in i else '' + if i['field_value'] not in ['', None]: edata[i['field_key']] = i['field_value'] - elif i.get('origin_value', ''): - edata[i['field_key']] = i['origin_value'] - # 开始生成word doc.render(edata) filename = edata['formName'] + '_' + ranstr(6) diff --git a/hb_server/apps/qm/views.py b/hb_server/apps/qm/views.py index 374c2e0..c63f9f7 100644 --- a/hb_server/apps/qm/views.py +++ b/hb_server/apps/qm/views.py @@ -107,7 +107,8 @@ class TestRecordViewSet(ListModelMixin, UpdateModelMixin, RetrieveModelMixin, De 按模板导出 """ instance = self.get_object() - tm = instance.form.export_template + # tm = instance.form.export_template + tm = '/media/default/tmp.docx' if tm: path = exprot_test_record(tr=instance, tm=tm) return Response({'path':path}) diff --git a/hb_server/apps/system/permission.py b/hb_server/apps/system/permission.py index ef60799..4a7810d 100644 --- a/hb_server/apps/system/permission.py +++ b/hb_server/apps/system/permission.py @@ -12,7 +12,7 @@ def get_permission_list(user): if user.is_superuser: perms_list = ['admin'] else: - perms = Permission.objects.filter() + perms = Permission.objects.none() roles = user.roles.all() if roles: for i in roles: @@ -39,6 +39,7 @@ class RbacPermission(BasePermission): :param view: :return: """ + perms = ['visitor'] if not request.user: if request.META.get('HTTP_AUTHORIZATION', None) == 'big_screen': perms = ['visitor'] diff --git a/hb_server/media/default/tmp.docx b/hb_server/media/default/tmp.docx new file mode 100644 index 0000000..c3e21ad Binary files /dev/null and b/hb_server/media/default/tmp.docx differ