Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_server/apps/mtm/views.py

@@ -179,8 +179,8 @@ class RecordFormViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelViewSet
     """
     记录表格增删改查
     """
-    perms_map = {'get':'*', 'post':'recordform_create',
+    perms_map = {'get':'*', 'post':'*',
-                'put':'recordform_update', 'delete':'recordform_delete'}
+                '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',
+    perms_map = {'get':'*', 'post':'*',
-                'put':'recordform_update', 'delete':'recordform_update'}
+                'put':'*', 'delete':'*'}
     queryset = RecordFormField.objects.all()
     filterset_fields = ['field_type', 'form']
     search_fields = ['field_name', 'field_key']

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)

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})

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']