diff --git a/client/src/views/supervision/content.vue b/client/src/views/supervision/content.vue index 6932a48..95fb8be 100644 --- a/client/src/views/supervision/content.vue +++ b/client/src/views/supervision/content.vue @@ -63,6 +63,7 @@ @@ -94,6 +95,21 @@ placeholder="详情" /> + + + 上传文件 + + { this.$refs["Form"].clearValidate(); }); @@ -201,6 +237,14 @@ export default { this.Content = Object.assign({}, scope.row); // copy obj this.dialogType = "edit"; this.dialogVisible = true; + if (this.Content.template) { + this.fileList = [ + { + name:'清单模板', + url: this.Content.template, + }, + ]; + } this.$nextTick(() => { this.$refs["Form"].clearValidate(); }); diff --git a/client/src/views/supervision/recorddo.vue b/client/src/views/supervision/recorddo.vue index cde7971..13786fc 100644 --- a/client/src/views/supervision/recorddo.vue +++ b/client/src/views/supervision/recorddo.vue @@ -15,6 +15,9 @@ {{ record.task_.name }}/{{ record.task_.end_date }} + + 模板下载 + {{ record.note diff --git a/server/apps/supervision/serializers.py b/server/apps/supervision/serializers.py index 0bf159f..82d3cf7 100644 --- a/server/apps/supervision/serializers.py +++ b/server/apps/supervision/serializers.py @@ -25,7 +25,7 @@ class ContentSerializer(serializers.ModelSerializer): class ContentListSerializer(serializers.ModelSerializer): class Meta: model = Content - fields = ['name', 'desc', 'id'] + fields = ['name', 'desc', 'id', 'template'] class TaskCreateUpdateSerializer(serializers.ModelSerializer): class Meta: @@ -38,6 +38,7 @@ class TaskListSerializer(serializers.ModelSerializer): fields = ['name', 'end_date', 'note', 'state', 'id'] class RecordSerializer(serializers.ModelSerializer): + content_ = ContentListSerializer(source='content', read_only=True) task_ = TaskListSerializer(source='task', read_only=True) belong_dept_ = OrganizationSimpleSerializer(source='belong_dept', read_only=True) files_ = FileSimpleSerializer(source='files', many=True, read_only=True) diff --git a/server/apps/system/views.py b/server/apps/system/views.py index 720a606..c2c3de8 100644 --- a/server/apps/system/views.py +++ b/server/apps/system/views.py @@ -307,7 +307,7 @@ class UserViewSet(PageOrNot, ModelViewSet): 'id': user.id, 'username': user.username, 'name': user.name, - 'dept': user.dept.pk, + 'dept': user.dept.pk if user.dept else '', 'dept_name':user.dept.name if user.dept else '', 'roles': user.roles.all().values_list('name', flat=True), # 'avatar': request._request._current_scheme_host + '/media/' + str(user.image),