record

client/src/api/task.js

@@ -1,9 +1,7 @@
 import request from '@/utils/request'
 
 
-
+export function gettasklist(query) {
-
-export function getTaskList(query) {
   return request({
     url: '/supervision/task/',
     method: 'get',
@@ -11,14 +9,14 @@ export function getTaskList(query) {
   })
 }
 
-export function getTask(id) {
+export function gettask(id) {
   return request({
     url: `/supervision/task/${id}/`,
     method: 'get'
   })
 }
 
-export function createTask(data) {
+export function createtask(data) {
   return request({
     url: '/supervision/task/',
     method: 'post',
@@ -26,7 +24,7 @@ export function createTask(data) {
   })
 }
 
-export function updateTask(id, data) {
+export function updatetask(id, data) {
   return request({
     url: `/supervision/task/${id}/`,
     method: 'put',
@@ -34,7 +32,7 @@ export function updateTask(id, data) {
   })
 }
 
-export function deleteTask(id, data) {
+export function deletetask(id, data) {
   return request({
     url: `/supervision/task/${id}/`,
     method: 'delete',
@@ -42,3 +40,11 @@ export function deleteTask(id, data) {
   })
 }
 
+export function inittask(id, data) {
+  return request({
+    url: `/supervision/task/${id}/init/`,
+    method: 'post',
+    data
+  })
+}
+

client/src/main.js

@@ -33,10 +33,10 @@ if (process.env.NODE_ENV === 'production') {
 Vue.use(ElementUI, { size: 'medium' })
 
 Vue.config.productionTip = false
-Vue.prototype.openLoading = function() {
+Vue.prototype.openLoading = function(msg) {
   const loading = this.$loading({           // 声明一个loading对象
     lock: true,                             // 是否锁屏
-    text: '正在加载...',                     // 加载动画的文字
+    text: msg,                     // 加载动画的文字
     body: true,                              
   })
   setTimeout(function () {                  // 设定定时器，超时5S后自动关闭遮罩层，避免请求失败时，遮罩层一直存在的问题

client/src/router/index.js

@@ -110,7 +110,7 @@ export const asyncRoutes = [
 {
   path: '/supervision',
   component: Layout,
-  redirect: '/supervision/content',
+  redirect: '/supervision/task',
   name:'Supervision',
   meta: { title: '日常监督', icon: 'table', perms: ['supervision_manage'] },
   children: [
@@ -118,13 +118,13 @@ export const asyncRoutes = [
       path: 'content',
       name: 'Content',
       component: () => import('@/views/supervision/content.vue'),
-      meta: { title: '资料清单', icon: 'documentation', perms: ['content_manage'] }
+      meta: { title: '材料清单', icon: 'documentation', perms: ['content_manage'] }
     },
     {
       path: 'task',
-      name: 'STask',
+      name: 'Task',
       component: () => import('@/views/supervision/task.vue'),
-      meta: { title: '报送任务', icon: 'guide', perms: ['task_manage'] }
+      meta: { title: '报送任务', icon: 'guide', perms: ['task_view'] }
     },
     {
       path: 'record',
@@ -139,6 +139,14 @@ export const asyncRoutes = [
       component: () => import('@/views/supervision/report.vue'),
       meta: { title: '材料报送', icon: 'guide', perms: ['report_manage'] }
     }
+      ,
+    {
+      path: 'taskdo/:id',
+      name: 'Taskdo',
+      component: () => import('@/views/supervision/taskdo.vue'),
+      meta: { title: '报送任务执行', perms: ['task_view'] },
+      hidden: true
+    },
   ]
 },
  

client/src/styles/index.scss

@@ -75,6 +75,7 @@ div:focus {
   border-radius: 0px;
   overflow: hidden;
 }
+
 .el-card__body {
   padding: 6px;
 }
@@ -90,18 +91,14 @@ div:focus {
 .el-dialog__body {
   padding: 8px 12px;
 }
-// .el-form-item--medium .el-form-item__label {
+
-//   line-height: 16px;
-// }
 .el-form--label-top .el-form-item__label {
   line-height: 16px;
 }
 .el-button+.el-button {
   margin-left: 1px;
 }
-.el-button {
+
-  border-radius: 0px;
-}
 
 
 .el-table--medium td,   .el-table--medium th {
@@ -111,9 +108,4 @@ div:focus {
   margin-bottom: 16px;
 }
 
-.el-card__body {
+
-  padding: 10px;
-}
-.el-card__header {
-  padding: 10px;
-}

client/src/views/supervision/content.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
-    <div style="margin-top: 10px">
+    <el-card>
       <el-button type="primary" icon="el-icon-plus" @click="handleAddContent"
         >新增</el-button
       >
-    </div>
+    </el-card>
     <el-card
     style="margin-top: 10px"
     >
@@ -31,8 +31,7 @@
       <el-table-column align="center" label="是否可主动报送">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.can_doself">是</el-tag>
-          <el-tag type="danger" v-else>否</el-tag></template
+          </template>
-        >
       </el-table-column>
 
       <el-table-column align="center" label="操作" width="200px" fixed="right">
@@ -99,31 +98,6 @@
     </el-dialog>
   </div>
 </template>
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-.avatar-uploader .el-upload:hover {
-  border-color: #409eff;
-}
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 100px;
-  height: 100px;
-  line-height: 100px;
-  text-align: center;
-}
-.avatar {
-  width: 100px;
-  height: 100px;
-  display: block;
-}
-</style>
 <script>
 import {
   getContentList,

client/src/views/supervision/task.vue

@@ -1,17 +1,42 @@
 <template>
   <div class="app-container">
+    <el-card>
+      <div>
+      <el-input
+              v-model="listQuery.search"
+              placeholder="任务名"
+              style="width: 300px"
+              class="filter-item"
+              @keyup.enter.native="handleFilter"
+            />
+            <el-button
+              class="filter-item"
+              type="primary"
+              icon="el-icon-search"
+              @click="handleFilter"
+              >搜索</el-button
+            >
+            <el-button
+              class="filter-item"
+              type="primary"
+              icon="el-icon-refresh-left"
+              @click="resetFilter"
+              >刷新重置</el-button
+            >
+    </div>
     <div style="margin-top: 10px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >创建报送任务</el-button>
+        >创建报送任务</el-button
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate2"
-        >创建主动报送任务</el-button>
-    </div>
-    <el-card
-    style="margin-top: 10px"
       >
+      <el-button type="primary" icon="el-icon-plus" @click="handleCreate2"
+        >创建主动报送任务</el-button
+      >
+    </div>
+    </el-card>
+    <el-card style="margin-top: 10px">
       <el-table
         v-loading="listLoading"
-      :data="contentList"
+        :data="taskList.results"
         border
         fit
         stripe
@@ -19,79 +44,95 @@
         max-height="600"
       >
         <el-table-column type="index" width="50" />
-      <el-table-column label="名称">
+        <el-table-column label="任务名">
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
-      <el-table-column label="详情">
+        <el-table-column label="是否主动报送">
-        <template slot-scope="scope">{{ scope.row.desc }}</template>
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.is_self" type="success">是</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态">
+          <template slot-scope="scope">
+            <el-tag>{{scope.row.state}}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="截止日期">
+          <template slot-scope="scope">{{ scope.row.end_date }}</template>
         </el-table-column>
 
-      <el-table-column label="材料类型">
+        <el-table-column label="任务备注">
-        <template slot-scope="scope">{{ scope.row.type_ }}</template>
+          <template slot-scope="scope">{{ scope.row.note }}</template>
         </el-table-column>
-      <el-table-column align="center" label="是否可主动报送">
+
-        <template slot-scope="scope">
+        <el-table-column
-          <el-tag type="success" v-if="scope.row.can_doself">是</el-tag>
+          align="center"
-          <el-tag type="danger" v-else>否</el-tag></template
+          label="操作"
+          width="220px"
+          fixed="right"
         >
-      </el-table-column>
-
-      <el-table-column align="center" label="操作" width="200px" fixed="right">
           <template slot-scope="scope">
             <el-button
-            :disabled="!checkPermission(['content_update'])"
               type="primary"
+              :disabled="!checkPermission(['task_view'])"
               size="small"
-            icon="el-icon-edit"
+              @click="handleDo(scope)"
-            @click="handleEdit(scope)"
+            >执行</el-button>
-          />
             <el-button
-            :disabled="!checkPermission(['content_delete'])"
+              :disabled="!checkPermission(['task_update'])"
+              size="small"
+              @click="handleEdit(scope)"
+            >编辑</el-button>
+            <el-button
+              :disabled="!checkPermission(['task_delete'])"
               type="danger"
               size="small"
-            icon="el-icon-delete"
               @click="handleDelete(scope)"
-          />
+            >删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-</el-card>
+      <pagination
+        v-show="taskList.count > 0"
+        :total="taskList.count"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.page_size"
+        @pagination="getList"
+      />
+    </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
-      :title="dialogType === 'edit' ? '编辑资料' : '新增资料'"
+      :title="dialogType === 'edit' ? '编辑任务' : '新增任务'"
     >
       <el-form
         ref="Form"
-        :model="Content"
+        :model="task"
         label-width="80px"
         label-position="right"
         :rules="rule1"
       >
-        <el-form-item label="名称" prop="name">
+        <el-form-item label="任务名" prop="name">
-          <el-input v-model="Content.name" placeholder="名称" />
+          <el-input v-model="task.name" placeholder="名称" />
         </el-form-item>
-        <el-form-item label="材料类型" prop="type" >
+        <el-form-item label="截止日期" prop="end_date">
-          <el-cascader
+          <el-date-picker
-            v-model = "Content.type"
+            v-model="task.end_date"
-            :options="typeOptions"
+            type="date"
-            :props="{ emitPath : false , }"
+            placeholder="选择日期"
-            clearable
+            value-format="yyyy-MM-dd"
             style="width:100%"
-          ></el-cascader>
+          >
+          </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="详情" prop="desc">
+        <el-form-item label="任务备注" prop="note">
           <el-input
             type="textarea"
             :rows="4"
-            v-model="Content.desc"
+            v-model="task.note"
-            placeholder="详情"
+            placeholder="任务备注"
           />
         </el-form-item>
-
-        <el-form-item label="是否可主动报送" prop="can_doself" label-width="120px">
-          <el-switch v-model="Content.can_doself" ></el-switch>
-        </el-form-item>
       </el-form>
       <div style="text-align: right">
         <el-button type="danger" @click="dialogVisible = false">取消</el-button>
@@ -100,114 +141,80 @@
     </el-dialog>
   </div>
 </template>
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-.avatar-uploader .el-upload:hover {
-  border-color: #409eff;
-}
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 100px;
-  height: 100px;
-  line-height: 100px;
-  text-align: center;
-}
-.avatar {
-  width: 100px;
-  height: 100px;
-  display: block;
-}
-</style>
 <script>
-import {
+import { gettasklist, createtask, deletetask, updatetask } from "@/api/task";
-  getContentList,
-  createContent,
-  deleteContent,
-  updateContent,
-} from "@/api/content";
-import { genTree } from "@/utils";
 import checkPermission from "@/utils/permission";
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import Treeselect from "@riophae/vue-treeselect";
+const defaulttask = {
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { getDictList, getDictTypeList } from "@/api/dict";
-const defaultContent = {
   name: "",
-  desc: "",
+  note: "",
-  type: null,
+  end_date: null,
-  can_doself: false,
 };
 export default {
-  components: { Pagination, Treeselect },
+  components: { Pagination },
   data() {
     return {
-      Content: defaultContent,
+      task: defaulttask,
-      contentList: [],
+      taskList: {
-      typeOptions: [],
+        count: 0,
+      },
+      listQuery: {
+        page: 1,
+        page_size: 20,
+      },
       listLoading: true,
       dialogVisible: false,
       dialogType: "new",
       rule1: {
-        name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+        name: [{ required: true, message: "请输入", trigger: "blur" }],
+        end_date: [{ required: true, message: "请选择", trigger: "blur" }],
       },
-      filterOrgText: "",
-      treeLoding: false,
     };
   },
   computed: {},
-  watch: {
+  watch: {},
-    filterOrgText(val) {
-      this.$refs.tree.filter(val);
-    },
-  },
   created() {
     this.getList();
-    this.getTypeAll();
   },
   methods: {
     checkPermission,
-
-    filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
-    },
-
     getList() {
       this.listLoading = true;
-      getContentList().then((response) => {
+      gettasklist(this.listQuery).then((response) => {
         if (response.data) {
-          this.contentList = response.data;
+          this.taskList = response.data;
         }
         this.listLoading = false;
       });
     },
-    getTypeAll() {
-      getDictList({ type__code: "data_type" }).then((res) => {
-        this.typeOptions = genTree(res.data);
-      });
-    },
 
     handleFilter() {
       this.listQuery.page = 1;
       this.getList();
     },
+    resetFilter() {
+      this.listQuery = {
+        page: 1,
+        page_size: 20,
+      }
+      this.getList();
+    },
     handleCreate() {
-      this.Content = Object.assign({}, defaultContent);
+      this.task = Object.assign({}, defaulttask);
       this.dialogType = "new";
       this.dialogVisible = true;
       this.$nextTick(() => {
         this.$refs["Form"].clearValidate();
       });
     },
+    handleCreate2() {
+
+    },
+    handleDo(scope) {
+      this.$router.push({name: "Taskdo", params: { id: scope.row.id }, })
+    },
     handleEdit(scope) {
-      this.Content = Object.assign({}, scope.row); // copy obj
+      this.task = Object.assign({}, scope.row); // copy obj
       this.dialogType = "edit";
       this.dialogVisible = true;
       this.$nextTick(() => {
@@ -221,7 +228,7 @@ export default {
         type: "error",
       })
         .then(async () => {
-          await deleteContent(scope.row.id);
+          await deletetask(scope.row.id);
           this.getList();
           this.$message.success("成功");
         })
@@ -234,7 +241,7 @@ export default {
         if (valid) {
           const isEdit = this.dialogType === "edit";
           if (isEdit) {
-            updateContent(this.Content.id, this.Content).then((res) => {
+            updatetask(this.task.id, this.task).then((res) => {
               if (res.code >= 200) {
                 this.getList();
                 this.dialogVisible = false;
@@ -242,10 +249,11 @@ export default {
               }
             });
           } else {
-            createContent(this.Content).then((res) => {
+            createtask(this.task).then((res) => {
               if (res.code >= 200) {
                 this.getList();
                 this.dialogVisible = false;
+                this.$router.push({name: "Taskdo", params: { id: res.data.id }, })
                 this.$message.success("成功");
               }
             });

client/src/views/supervision/taskdo.vue

@@ -0,0 +1,122 @@
+<template>
+<div class="app-container">
+  <el-card>
+    <div slot="header" class="clearfix">
+      <span>任务详情</span>
+    </div>
+    <div style="margin-left:10px;margin-right:10px">
+    <el-row :gutter="20">
+        <el-col :span="8">
+            <div style="margin-bottom:6px">
+            <span class="term">任务名称</span>
+            <span class="desc"> {{ task.name}}</span>
+            </div>
+        </el-col>
+        <el-col :span="8">
+            <div style="margin-bottom:6px">
+            <span class="term">截止日期</span>
+            <span class="desc"> {{ task.end_date}}</span>
+            </div>
+        </el-col>
+        <el-col :span="8">
+            <div style="margin-bottom:6px">
+            <span class="term">创建人</span>
+            <span class="desc" v-if="task.create_by_"> {{ task.create_by_.name}}/</span>
+            <span 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>
+
+
+  <el-card style="margin-top:2px">
+    <div slot="header" class="clearfix">
+      <span>执行详情</span>
+    </div>
+  </el-card>
+
+  <el-dialog
+      :visible.sync="dialogVisible"
+      title="初始化任务"
+      :close-on-click-modal="false"
+    >
+    <taskinit ref="taskinit" @handleChose="chooseComplete"></taskinit>
+    </el-dialog>
+</div>
+</template>
+<style >
+.term{
+    color: rgba(0,0,0,.85);
+    font-weight: bold;
+    font-size: 16px;
+}
+.desc{
+    color: rgba(0, 0, 0, 0.65);
+    font-weight: bold;
+    font-size: 16px;
+}
+</style>
+<script>
+import {gettask, inittask} from "@/api/task"
+import Pagination from "@/components/Pagination";
+import taskinit from "@/views/supervision/taskinit";
+export default {
+    components: {Pagination, taskinit},
+    data(){
+        return {
+            task:{id:0},
+            dialogVisible:false
+        }
+    },
+    created() {
+        this.task.id = this.$route.params.id
+        this.gettask()
+    },
+    methods:{
+        gettask(){
+            gettask(this.task.id).then(res=>{
+                this.task = res.data
+                if(this.task.state=='创建中'){
+                    this.dialogVisible = true
+                }
+            })
+        },
+        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);
+            })
+        }
+    },
+    
+};
+</script>

client/src/views/supervision/taskinit.vue

@@ -0,0 +1,65 @@
+<template>
+  <div>
+    <el-transfer
+      v-model="contents"
+      :data="contentOptions"
+      :titles="['材料清单', '选择的清单']"
+      :props="{ key : 'id' , label: 'name' }"
+    />
+    <el-transfer
+      v-model="depts"
+      :data="deptOptions"
+      :titles="['单位列表', '选择的单位']"
+      :props="{ key : 'id' , label: 'name' }"
+    />
+
+    <div style="text-align: right">
+      <el-button type="primary" @click="confirm()">确认</el-button>
+    </div>
+  </div>
+</template>
+<style >
+</style>
+<script>
+import { getOrgList } from "@/api/org";
+import { getContentList } from "@/api/content";
+export default {
+  name: "taskinit",
+  data() {
+    return {
+      depts: [],
+      deptOptions: [],
+      contents: [],
+      contentOptions: [],
+    };
+  },
+  created() {
+    this.getOrgList();
+    this.getContentList();
+  },
+  methods: {
+    getOrgList() {
+      getOrgList({ pid: 1 }).then((res) => {
+        this.deptOptions = res.data;
+      });
+    },
+    getContentList() {
+        getContentList().then(res=>{
+            this.contentOptions = res.data
+        })
+    },
+    confirm(){
+        if(this.contents.length>0 && this.depts.length>0){
+            var data = {
+            depts:this.depts,
+            contents: this.contents
+        }
+        this.$emit('handleChose', data)
+        }else{
+            this.$message.error('请选择清单和单位!')
+        }
+        
+    }
+  },
+};
+</script>

server/apps/supervision/migrations/0007_auto_20210315_1412.py

@@ -0,0 +1,43 @@
+# Generated by Django 3.0.5 on 2021-03-15 06:12
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0008_auto_20210311_0919'),
+        ('supervision', '0006_auto_20210312_1440'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='record',
+            name='belong_to',
+        ),
+        migrations.RemoveField(
+            model_name='task',
+            name='belong_to',
+        ),
+        migrations.AddField(
+            model_name='record',
+            name='belong_dept',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='record_belong_dept', to='system.Organization', verbose_name='所属部门'),
+        ),
+        migrations.AddField(
+            model_name='record',
+            name='up_date',
+            field=models.DateField(blank=True, null=True, verbose_name='上报时间'),
+        ),
+        migrations.AddField(
+            model_name='task',
+            name='belong_dept',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='task_belong_dept', to='system.Organization', verbose_name='所属部门'),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='is_self',
+            field=models.BooleanField(default=False, verbose_name='是否主动报送'),
+        ),
+    ]

server/apps/supervision/serializers.py

@@ -1,6 +1,8 @@
+from django.db.models.base import Model
 from rest_framework import serializers
 from .models import *
-from apps.system.serializers import OrganizationSerializer,FileListSerializer
+from apps.system.serializers import OrganizationSerializer,FileListSerializer,UserSimpleSerializer,OrganizationSimpleSerializer
+
 
 class ContentSerializer(serializers.ModelSerializer):
     type_ = serializers.SerializerMethodField()
@@ -27,12 +29,12 @@ class ContentListSerializer(serializers.ModelSerializer):
 class TaskCreateUpdateSerializer(serializers.ModelSerializer):
     class Meta:
         model = Task
-        fields = ['name', 'end_date', 'note']
+        fields = ['name', 'end_date', 'note', 'id']
 
 class TaskListSerializer(serializers.ModelSerializer):
     class Meta:
         model = Task
-        fields = ['name', 'is_self', 'end_date', 'note', 'complete_rate']
+        fields = ['name', 'is_self', 'end_date', 'note', 'complete_rate', 'state', 'id']
 class RecordSerializer(serializers.ModelSerializer):
     files_ = FileListSerializer(source='files', many=True, read_only=True)
     task_ = TaskListSerializer(source='task')
@@ -42,5 +44,9 @@ class RecordSerializer(serializers.ModelSerializer):
         fields = ('id', 'up_date', 'up_user', 'end_date', 'state',
                   'is_yes', 'note', 'noteb','content','content_','task_','task',  'files', 'files_')
 
-   
+class TaksDetailSerializer(serializers.ModelSerializer):
-    
+    create_by_ = UserSimpleSerializer(source='create_by', read_only = True)
+    belong_dept_ = OrganizationSimpleSerializer(source='belong_dept', read_only=True)
+    class Meta:
+        model = Task
+        fields = '__all__'

server/apps/supervision/views.py

@@ -36,6 +36,8 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
     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):
@@ -46,6 +48,32 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
         serializer.is_valid(raise_exception=True)
         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):
+        """
+        初始化任务,生成记录
+        """
+        obj = self.get_object()
+        depts = request.data['depts']
+        contents = request.data['contents']
+        if depts and contents:
+            record_list = []
+            for m in depts:
+                for n in contents:
+                    data={}
+                    data['content'] = Content.objects.get(pk=n)
+                    data['belong_dept'] = Organization.objects.get(pk=m)
+                    data['task'] = obj
+                    data['end_date'] = obj.end_date
+                    data['create_by'] = request.user
+                    record_list.append(Record(**data))
+            Record.objects.bulk_create(record_list)
+            obj.state = '执行中'
+            obj.save()
+            return Response(status=status.HTTP_200_OK)
+        return Response('单位或清单不能为空', status=status.HTTP_400_BAD_REQUEST)
 class RecordViewSet(CreateUpdateCustomMixin,ModelViewSet):
     perms_map = {'get': '*', 'post': 'record_create',
                  'put': 'record_update', 'delete': 'record_delete'}
@@ -53,3 +81,5 @@ class RecordViewSet(CreateUpdateCustomMixin,ModelViewSet):
     serializer_class = RecordSerializer
     search_fields = ['name']
     ordering = ['-create_time']
+
+        

server/apps/system/serializers.py

@@ -138,3 +138,13 @@ class UserCreateSerializer(serializers.ModelSerializer):
         if User.objects.filter(phone=phone):
             raise serializers.ValidationError('手机号已经被注册')
         return phone
+
+class UserSimpleSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = User
+        fields = ['id', 'name', 'username']
+
+class OrganizationSimpleSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Organization
+        fields = ['id', 'name']

server/apps/system/views.py

@@ -198,6 +198,7 @@ class OrganizationViewSet(PageOrNot,ModelViewSet):
     serializer_class = OrganizationSerializer
     pagination_class = None
     search_fields = ['name']
+    filterset_fields = ['pid','name']
     ordering_fields = ['sort']
     ordering = ['sort', 'pk']