diff --git a/client/src/views/supervision/record.vue b/client/src/views/supervision/record.vue index 8cc3efe..ef8ef86 100644 --- a/client/src/views/supervision/record.vue +++ b/client/src/views/supervision/record.vue @@ -5,8 +5,7 @@ 搜索 重置 - - - + 主动上报 @@ -107,8 +100,8 @@ 确认 - - + + - {{ + {{ scope.row.task_.name - }} + }} 主动报送 @@ -398,7 +391,6 @@ export default { }, getContentsList() { getContentList({ can_doself: this.can_doself }).then((res) => { - console.log(res.data) this.contentOptions = res.data; }); @@ -407,6 +399,12 @@ export default { if (this.contents.length > 0) { createself({ contents: this.contents }).then((res) => { this.centerDialogVisible = false; + this.listQuery = { + page:1, + page_size:20, + state:'待上报', + is_self:true + } this. getList(); }); } else { diff --git a/client/src/views/supervision/taskdo.vue b/client/src/views/supervision/taskdo.vue index 3d51686..ceb262c 100644 --- a/client/src/views/supervision/taskdo.vue +++ b/client/src/views/supervision/taskdo.vue @@ -24,8 +24,8 @@ {{ task.create_by_.name }}/ - {{ - task.belong_belong_dept_.name + {{ + task.belong_dept_.name }} @@ -33,13 +33,13 @@ 任务状态 - {{ + {{ task.state }} - {{ + {{ task.state }} - {{ task.state }} + {{ task.state }} @@ -86,6 +86,7 @@ v-for="(item, index) in contents" v-bind:key="item.id" @click="chosecontent(item)" + style="margin-top:2px" > {{ index + 1 }}-{{ item.name }} {{ index + 1 }}-{{ item.name }} {{ scope.row.up_user }}/{{ scope.row.up_date }}{{ scope.row.up_user_.name }}/{{ scope.row.up_date }} diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index ad01b68..b232236 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -116,7 +116,7 @@ class RecordViewSet(RbacFilterSet, PageOrNot, CreateUpdateCustomMixin, ModelView queryset = Record.objects.all() serializer_class = RecordSerializer search_fields = ['content__name','task__name'] - ordering = ['create_time'] + ordering = ['-create_time'] filter_class = RecordFilter # 过滤类 @action(methods=['get'], detail=False, perms_map = {'get':'*'})