按清单/按单位

client/src/api/record.js

@@ -5,7 +5,7 @@ import request from '@/utils/request'
 
 export function getRecordList(query) {
   return request({
-    url: '/supervision/content/',
+    url: '/supervision/record/',
     method: 'get',
     params: query
   })

client/src/api/task.js

@@ -48,3 +48,17 @@ export function inittask(id, data) {
   })
 }
 
+
+export function gettaskcontents(id) {
+  return request({
+    url: `/supervision/task/${id}/contents/`,
+    method: 'get'
+  })
+}
+
+export function gettaskdepts(id) {
+  return request({
+    url: `/supervision/task/${id}/depts/`,
+    method: 'get'
+  })
+}

client/src/views/supervision/task.vue

@@ -69,7 +69,6 @@
           align="center"
           label="操作"
           width="220px"
-          fixed="right"
         >
           <template slot-scope="scope">
             <el-button

client/src/views/supervision/taskdo.vue

@@ -1,122 +1,251 @@
 <template>
-<div class="app-container">
+  <div class="app-container">
-  <el-card>
+    <el-card>
-    <div slot="header" class="clearfix">
+      <div slot="header" class="clearfix">
-      <span>任务详情</span>
+        <span>任务详情</span>
-    </div>
+      </div>
-    <div style="margin-left:10px;margin-right:10px">
+      <div style="margin-left: 10px; margin-right: 10px">
-    <el-row :gutter="20">
+        <el-row :gutter="20">
-        <el-col :span="8">
+          <el-col :span="8">
-            <div style="margin-bottom:6px">
+            <div style="margin-bottom: 6px">
-            <span class="term">任务名称</span>
+              <span class="term">任务名称</span>
-            <span class="desc"> {{ task.name}}</span>
+              <span class="desc"> {{ task.name }}</span>
             </div>
-        </el-col>
+          </el-col>
-        <el-col :span="8">
+          <el-col :span="8">
-            <div style="margin-bottom:6px">
+            <div style="margin-bottom: 6px">
-            <span class="term">截止日期</span>
+              <span class="term">截止日期</span>
-            <span class="desc"> {{ task.end_date}}</span>
+              <span class="desc"> {{ task.end_date }}</span>
             </div>
-        </el-col>
+          </el-col>
-        <el-col :span="8">
+          <el-col :span="8">
-            <div style="margin-bottom:6px">
+            <div style="margin-bottom: 6px">
-            <span class="term">创建人</span>
+              <span class="term">创建人</span>
-            <span class="desc" v-if="task.create_by_"> {{ task.create_by_.name}}/</span>
+              <span class="desc" v-if="task.create_by_">
-            <span v-if="task.belong_dept_">{{ task.belong_dept_.name }}</span>
+                {{ task.create_by_.name }}/</span
+              >
+              <span class="desc" v-if="task.belong_dept_">{{
+                task.belong_dept_.name
+              }}</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div style="margin-bottom: 6px">
+              <span class="term">任务状态</span>
+              <span class="desc"> {{ task.state }}</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div style="margin-bottom: 6px">
+              <span class="term">完成度</span>
+              <span class="desc"> {{ task.complete_rate }}%</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div style="margin-bottom: 6px">
+              <span class="term">备注</span>
+              <span class="desc"> {{ task.note }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <div style="margin-top: 4px">
+          <el-button
+            type="primary"
+            @click="init()"
+            v-if="task.state == '创建中'"
+            size="small"
+            >初始化任务</el-button
+          >
+        </div>
+      </div>
+    </el-card>
 
-            </div>
+    <el-card style="margin-top: 2px">
-        </el-col>
+      <div slot="header" class="clearfix">
-        <el-col :span="8">
+        <span>执行详情</span>
-            <div style="margin-bottom:6px">
+      </div>
-            <span class="term">任务状态</span>
+      <el-tabs v-model="activeName">
-            <span class="desc"> {{ task.state}}</span>
+        <el-tab-pane label="按清单" name="tab1" lazy>
-            </div>
+          <el-row :gutter="10">
-        </el-col>
+            <el-col :span="4">
-        <el-col :span="8">
+              <el-card
-            <div style="margin-bottom:6px">
+                shadow="never"
-            <span class="term">完成度</span>
+                style="height: 600px; overflow-y: auto; overflow-x: auto"
-            <span class="desc"> {{ task.complete_rate}}%</span>
+              >
-            </div>
+                <div
-        </el-col>
+                  v-for="item in contents"
-        <el-col :span="8">
+                  v-bind:key="item.id"
-            <div style="margin-bottom:6px">
+                  class="litem"
-            <span class="term">备注</span>
+                  @click="chose1(item)"
-            <span class="desc"> {{ task.note}}</span>
+                >
-            </div>
+                  {{ item.name }}
-        </el-col>
+                </div>
-    </el-row>
+              </el-card>
-    <div style="margin-top:4px">
+            </el-col>
-        <el-button type="primary" @click="init()" v-if="task.state=='创建中'" size="small">初始化任务</el-button>
+            <el-col :span="20">
-    </div>
+              <el-card shadow="never" style="height: 600px; overflow-y: auto; overflow-x: auto">
-    </div>
+                  <el-table
-  </el-card>
+                  v-loading="listLoading"
+                  :data="recordList"
+                  border
+                  fit
+                  stripe
+                  highlight-current-row
+                  max-height="600px"
+                >
+                  <el-table-column label="状态">
+                    <template slot-scope="scope">{{ scope.row.state }}</template>
+                  </el-table-column>
+                </el-table>
 
 
-  <el-card style="margin-top:2px">
+              </el-card>
-    <div slot="header" class="clearfix">
+            </el-col>
-      <span>执行详情</span>
+          </el-row>
-    </div>
+        </el-tab-pane>
-  </el-card>
+        <el-tab-pane label="按单位" name="tab2" lazy>
+          <el-row :gutter="10">
+            <el-col :span="4">
+              <el-card
+                shadow="never"
+                style="height: 600px; overflow-y: auto; overflow-x: auto"
+              >
+                <div
+                  v-for="item in depts"
+                  v-bind:key="item.id"
+                  class="litem"
+                  @click="chose2(item)"
+                >
+                  {{ item.name }}
+                </div>
+              </el-card>
+            </el-col>
+            <el-col :span="20">
+              <el-card
+                shadow="never"
+                style="height: 600px; overflow-y: auto; overflow-x: auto"
+              >
+              <div>
+                  当前选择的是
+                  <span style="color:red">{{now.name}}</span>
+              </div>
+                <el-table
+                  v-loading="listLoading"
+                  :data="recordList"
+                  border
+                  fit
+                  stripe
+                  highlight-current-row
+                  max-height="600px"
+                >
+                  <el-table-column label="名称">
+                    <template slot-scope="scope">{{ scope.row.state }}</template>
+                  </el-table-column>
+                </el-table>
+              </el-card>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
 
-  <el-dialog
+    <el-dialog
       :visible.sync="dialogVisible"
       title="初始化任务"
       :close-on-click-modal="false"
     >
-    <taskinit ref="taskinit" @handleChose="chooseComplete"></taskinit>
+      <taskinit ref="taskinit" @handleChose="chooseComplete"></taskinit>
     </el-dialog>
-</div>
+  </div>
 </template>
 <style >
-.term{
+.term {
-    color: rgba(0,0,0,.85);
+  color: rgba(0, 0, 0, 0.85);
-    font-weight: bold;
+  font-weight: bold;
-    font-size: 16px;
+  font-size: 16px;
 }
-.desc{
+.desc {
-    color: rgba(0, 0, 0, 0.65);
+  color: rgba(0, 0, 0, 0.65);
-    font-weight: bold;
+  font-weight: bold;
-    font-size: 16px;
+  font-size: 16px;
+}
+.litem {
+  margin-bottom: 4px;
+  margin-left: 2px;
+  cursor: pointer;
+  color: #409EFF;
 }
 </style>
 <script>
-import {gettask, inittask} from "@/api/task"
+import { gettask, inittask, gettaskcontents, gettaskdepts } from "@/api/task";
+import { getRecordList } from "@/api/record";
 import Pagination from "@/components/Pagination";
 import taskinit from "@/views/supervision/taskinit";
 export default {
-    components: {Pagination, taskinit},
+  components: { Pagination, taskinit },
-    data(){
+  data() {
-        return {
+    return {
-            task:{id:0},
+      task: { id: 0 },
-            dialogVisible:false
+      dialogVisible: false,
+      activeName: "tab1",
+      contents: [],
+      depts: [],
+      listLoading: false,
+      recordList: [],
+      now:{}
+    };
+  },
+  created() {
+    this.task.id = this.$route.params.id;
+    this.gettask();
+    this.gettaskcontents();
+    this.gettaskdepts();
+  },
+  methods: {
+    gettask() {
+      gettask(this.task.id).then((res) => {
+        this.task = res.data;
+        if (this.task.state == "创建中") {
+          this.dialogVisible = true;
         }
+      });
     },
-    created() {
+    init() {
-        this.task.id = this.$route.params.id
+      this.dialogVisible = true;
-        this.gettask()
     },
-    methods:{
+    chooseComplete(data) {
-        gettask(){
+      this.dialogVisible = false;
-            gettask(this.task.id).then(res=>{
+      const rLoading = this.openLoading("正在初始化任务,请稍等...");
-                this.task = res.data
+      inittask(this.task.id, data).then((res) => {
-                if(this.task.state=='创建中'){
+        rLoading.close();
-                    this.dialogVisible = true
+        this.$message.success("成功");
-                }
+        this.$router.go(0);
-            })
+      });
-        },
-        init(){
-            this.dialogVisible = true
-        },
-        chooseComplete(data){
-            this.dialogVisible = false;
-            const rLoading = this.openLoading('正在初始化任务,请稍等...');
-            inittask(this.task.id, data).then(res=>{
-                rLoading.close()
-                this.$message.success('成功')
-                this.$router.go(0);
-            })
-        }
     },
-    
+    gettaskcontents() {
+      gettaskcontents(this.task.id).then((res) => {
+        this.contents = res.data;
+      });
+    },
+    gettaskdepts() {
+      gettaskdepts(this.task.id).then((res) => {
+        this.depts = res.data;
+      });
+    },
+    chose1(item){
+        this.listLoading = true
+        getRecordList({pageoff:true, content:item.id}).then(res=>{
+            this.listLoading = false
+            this.recordList = res.data
+        })
+    },
+    chose2(item){
+        this.listLoading = true
+        getRecordList({pageoff:true, belong_dept:item.id}).then(res=>{
+            this.listLoading = false
+            this.recordList = res.data
+        })
+    }
+  },
 };
 </script>

server/apps/supervision/models.py

@@ -49,10 +49,10 @@ class Record(CommonBModel):
         ('已确认', '已确认'),
         ('待整改', '待整改')
     )
-    content = models.ForeignKey(Content, verbose_name='材料内容', on_delete=models.DO_NOTHING)
+    content = models.ForeignKey(Content, verbose_name='材料内容', on_delete=models.DO_NOTHING, related_name='record_content')
-    task = models.ForeignKey(Task, verbose_name='关联任务', null=True, blank=True, on_delete=models.SET_NULL)
+    task = models.ForeignKey(Task, verbose_name='关联任务', null=True, blank=True, on_delete=models.SET_NULL, related_name='record_task')
     up_date = models.DateField('上报时间', null=True, blank=True)
-    up_user = models.ForeignKey(User, verbose_name='上报人', null=True, blank=True,on_delete=models.SET_NULL)
+    up_user = models.ForeignKey(User, verbose_name='上报人', null=True, blank=True,on_delete=models.SET_NULL, related_name='record_up_user')
     end_date = models.DateField('截止时间', null=True, blank=True)
     state = models.CharField('记录状态', max_length=50, choices=state_choices, default='待上报')
     is_yes = models.BooleanField('是否适用', default=True)

server/apps/supervision/serializers.py

@@ -24,7 +24,7 @@ class ContentSerializer(serializers.ModelSerializer):
 class ContentListSerializer(serializers.ModelSerializer):
     class Meta:
         model = Content
-        fields = ['name', 'desc']
+        fields = ['name', 'desc', 'id']
 
 class TaskCreateUpdateSerializer(serializers.ModelSerializer):
     class Meta:

server/apps/supervision/views.py

@@ -33,12 +33,14 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
     queryset = Task.objects.all()
     search_fields = ['name']
     ordering = ['-create_time']
+
     def get_serializer_class(self):
         if self.action in ['create', 'update']:
             return TaskCreateUpdateSerializer
         elif self.action == 'retrieve':
             return TaksDetailSerializer
         return TaskListSerializer
+
     @action(methods=['post'], detail=False, perms_map = {'post':'task_createself'})    
     def createself(self, request):
         """
@@ -49,7 +51,6 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
         serializer.save(is_self=True, create_by=request.user, belong_dept=request.user.dept)
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
-    
     @action(methods=['post'], detail=True, perms_map = {'post':'task_init'})
     def init(self, request, *args, **kwargs):
         """
@@ -74,12 +75,32 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
             obj.save()
             return Response(status=status.HTTP_200_OK)
         return Response('单位或清单不能为空', status=status.HTTP_400_BAD_REQUEST)
-class RecordViewSet(CreateUpdateCustomMixin,ModelViewSet):
+    
+    @action(methods=['get'], detail=True, perms_map = {'get':'*'})
+    def contents(self, request, *args, **kwargs):
+        """
+        聚合
+        """
+        obj = self.get_object()
+        serializer = ContentListSerializer(obj.contents.distinct(), many=True)
+        return Response(serializer.data)
+
+    @action(methods=['get'], detail=True, perms_map = {'get':'*'})
+    def depts(self, request, *args, **kwargs):
+        """
+        聚合
+        """
+        obj = self.get_object()
+        serializer = OrganizationSimpleSerializer(obj.depts.distinct(), many=True)
+        return Response(serializer.data)
+
+class RecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet):
     perms_map = {'get': '*', 'post': 'record_create',
                  'put': 'record_update', 'delete': 'record_delete'}
     queryset = Record.objects.all()
     serializer_class = RecordSerializer
     search_fields = ['name']
     ordering = ['-create_time']
+    filterset_fields = ['content', 'belong_dept']