From a8d964037517341150e03598bff784bdc773fb50 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Mon, 12 Apr 2021 11:30:10 +0800
Subject: [PATCH 1/4] xiala

---
 client/src/api/inspectTask.js                 |  99 +++++++
 client/src/router/index.js                    |   4 +-
 .../src/views/qualityinspect/inspeatTask.vue  | 274 ++++++++++++++++++
 3 files changed, 375 insertions(+), 2 deletions(-)
 create mode 100644 client/src/api/inspectTask.js
 create mode 100644 client/src/views/qualityinspect/inspeatTask.vue

diff --git a/client/src/api/inspectTask.js b/client/src/api/inspectTask.js
new file mode 100644
index 0000000..356fc4a
--- /dev/null
+++ b/client/src/api/inspectTask.js
@@ -0,0 +1,99 @@
+import request from '@/utils/request'
+
+
+export function getinspecttasklist(query) {
+  return request({
+    url: '/quality/inspecttask/',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getinspecttask(id) {
+  return request({
+    url: `/quality/inspecttask/${id}/`,
+    method: 'get'
+  })
+}
+
+export function createinspecttask(data) {
+  return request({
+    url: '/quality/inspecttask/',
+    method: 'post',
+    data
+  })
+}
+
+export function updateinspecttask(id, data) {
+  return request({
+    url: `/quality/inspecttask/${id}/`,
+    method: 'put',
+    data
+  })
+}
+
+export function deleteinspecttask(id, data) {
+  return request({
+    url: `/quality/inspecttask/${id}/`,
+    method: 'delete',
+    data
+  })
+}
+
+export function initinspecttask(id, data) {
+  return request({
+    url: `/quality/inspecttask/${id}/init/`,
+    method: 'post',
+    data
+  })
+}
+
+export function appendinspecttask(id, data) {
+  return request({
+    url: `/quality/inspecttask/${id}/append/`,
+    method: 'post',
+    data
+  })
+}
+
+export function getinspecttaskcontents(id) {
+  return request({
+    url: `/quality/inspecttask/${id}/contents/`,
+    method: 'get'
+  })
+}
+
+export function getinspecttaskdepts(id) {
+  return request({
+    url: `/quality/inspecttask/${id}/depts/`,
+    method: 'get'
+  })
+}
+
+export function startinspecttask(id) {
+  return request({
+    url: `/quality/inspecttask/${id}/start/`,
+    method: 'put'
+  })
+}
+
+export function closeinspecttask(id) {
+  return request({
+    url: `/quality/inspecttask/${id}/close/`,
+    method: 'put'
+  })
+}
+
+export function getinspecttaskdeptall(id) {
+  return request({
+    url: `/quality/inspecttask/${id}/deptall/`,
+    method: 'get'
+  })
+}
+export function getmyinspecttasklist(query) {
+  return request({
+    url: '/quality/inspecttask/self/',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 49cb6e7..e8814f1 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -167,8 +167,8 @@ export const asyncRoutes = [
       },
       {
         path: 'task',
-        name: 'inspectTask',
-        component: () => import('@/views/qualityinspect/inspectTable.vue'),
+        name: 'inspeatTask',
+        component: () => import('@/views/qualityinspect/inspeatTask.vue'),
         meta: { title: '巡查任务', perms: ['qualityinspect_view'] }
       },
     ]
diff --git a/client/src/views/qualityinspect/inspeatTask.vue b/client/src/views/qualityinspect/inspeatTask.vue
new file mode 100644
index 0000000..021703d
--- /dev/null
+++ b/client/src/views/qualityinspect/inspeatTask.vue
@@ -0,0 +1,274 @@
+<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
+      >
+    </div>
+    </el-card>
+    <el-card style="margin-top: 10px">
+      <el-table
+        v-loading="listLoading"
+        :data="taskList.results"
+        border
+        fit
+        stripe
+        highlight-current-row
+        max-height="600"
+      >
+        <el-table-column type="index" width="50" />
+        <el-table-column  label="任务名">
+          <template slot-scope="scope">{{ scope.row.name }}</template>
+        </el-table-column>
+          <el-table-column label="巡查开始日期">
+          <template slot-scope="scope">{{ scope.row.start_date }}</template>
+        </el-table-column>
+       
+        <el-table-column label="巡查结束日期">
+          <template slot-scope="scope">{{ scope.row.end_date }}</template>
+        </el-table-column>
+       
+        <el-table-column
+          align="center"
+          label="操作"
+          width="220px"
+        >
+          <template slot-scope="scope">
+            <el-link
+              type="primary"
+              v-if="checkPermission(['task_view'])"
+              @click="handleDo(scope)"
+            >执行</el-link>
+            <el-link
+              v-if="checkPermission(['task_update'])"
+              @click="handleEdit(scope)"
+            >编辑</el-link>
+            <el-link
+              v-if="checkPermission(['task_close']) && scope.row.state!='已关闭'"
+              @click="handleClose(scope)"
+            >关闭</el-link>
+            <el-link
+              v-if="checkPermission(['task_delete'])"
+              type="danger"
+              @click="handleDelete(scope)"
+            >删除</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+      <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' ? '编辑任务' : '新增任务'"
+    >
+      <el-form
+        ref="Form"
+        :model="task"
+        label-width="80px"
+        label-position="right"
+        :rules="rule1"
+      >
+        <el-form-item label="任务名" prop="name">
+          <el-input v-model="task.name" placeholder="名称" />
+        </el-form-item>
+         <el-form-item label="开始日期" prop="start_date">
+          <el-date-picker
+            v-model="task.start_date"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            style="width:100%"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束日期" prop="end_date">
+          <el-date-picker
+            v-model="task.end_date"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            style="width:100%"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+       
+      </el-form>
+      <div style="text-align: right">
+        <el-button type="danger" @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirm('Form')">确认</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getinspecttasklist, createinspecttask, deleteinspecttask, updateinspecttask, closeinspecttask } from "@/api/inspectTask";
+import checkPermission from "@/utils/permission";
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+const defaulttask = {
+  name: "",
+  start_date: null,
+  end_date: null,
+};
+export default {
+  components: { Pagination },
+  data() {
+    return {
+      task: defaulttask,
+      taskList: {
+        count: 0,
+      },
+      listQuery: {
+        page: 1,
+        page_size: 20,
+      },
+      listLoading: true,
+      dialogVisible: false,
+      dialogType: "new",
+      rule1: {
+        name: [{ required: true, message: "请输入", trigger: "blur" }],
+        start_date: [{ required: true, message: "请选择", trigger: "blur" }],
+        end_date: [{ required: true, message: "请选择", trigger: "blur" }],
+      },
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {
+    this.getList();
+  },
+  methods: {
+    checkPermission,
+    getList() {
+      this.listLoading = true;
+      getinspecttasklist(this.listQuery).then((response) => {
+        if (response.data) {
+          this.taskList = response.data;
+        }
+        this.listLoading = false;
+      });
+    },
+
+    handleFilter() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    resetFilter() {
+      this.listQuery = {
+        page: 1,
+        page_size: 20,
+      }
+      this.getList();
+    },
+    handleCreate() {
+      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.task = Object.assign({}, scope.row); // copy obj
+      this.dialogType = "edit";
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs["Form"].clearValidate();
+      });
+    },
+    handleDelete(scope) {
+      this.$confirm("确认删除?该操作将删除该任务所有报送记录!", "警告", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "error",
+      })
+        .then(async () => {
+          await deleteinspecttask(scope.row.id);
+          this.getList();
+          this.$message.success("成功");
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+    handleClose(scope) {
+      this.$confirm("确认关闭该任务吗?", "警告", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          await closeinspecttask(scope.row.id);
+          this.getList();
+          this.$message.success("成功");
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+    async confirm(form) {
+      this.$refs[form].validate((valid) => {
+        if (valid) {
+          const isEdit = this.dialogType === "edit";
+          if (isEdit) {
+            updateinspecttask(this.task.id, this.task).then((res) => {
+              if (res.code >= 200) {
+                this.getList();
+                this.dialogVisible = false;
+                this.$message.success("成功");
+              }
+            });
+          } else {
+            createinspecttask(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("成功");
+              }
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>

From 0a487594162070462d492df435f4bfb92d876cf6 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Mon, 12 Apr 2021 14:02:37 +0800
Subject: [PATCH 2/4] xialarenwu

---
 client/src/router/index.js                    |   7 +
 .../src/views/qualityinspect/inspeatTask.vue  |   2 +-
 .../src/views/qualityinspect/inspectTable.vue |  10 +-
 .../views/qualityinspect/inspecttaskdo.vue    | 354 ++++++++++++++++++
 4 files changed, 367 insertions(+), 6 deletions(-)
 create mode 100644 client/src/views/qualityinspect/inspecttaskdo.vue

diff --git a/client/src/router/index.js b/client/src/router/index.js
index e8814f1..5852d8c 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -171,6 +171,13 @@ export const asyncRoutes = [
         component: () => import('@/views/qualityinspect/inspeatTask.vue'),
         meta: { title: '巡查任务', perms: ['qualityinspect_view'] }
       },
+      {
+        path: 'inpecttaskdo/:id',
+        name: 'InpectTaskdo',
+        component: () => import('@/views/qualityinspect/inspecttaskdo.vue'),
+        meta: { title: '报送任务执行', perms: ['task_view'] },
+        hidden: true
+      },
     ]
   },
   {
diff --git a/client/src/views/qualityinspect/inspeatTask.vue b/client/src/views/qualityinspect/inspeatTask.vue
index 021703d..7c8e01a 100644
--- a/client/src/views/qualityinspect/inspeatTask.vue
+++ b/client/src/views/qualityinspect/inspeatTask.vue
@@ -202,7 +202,7 @@ export default {
 
     },
     handleDo(scope) {
-      this.$router.push({name: "Taskdo", params: { id: scope.row.id }, })
+      this.$router.push({name: "InpectTaskdo", params: { id: scope.row.id }, })
     },
     handleEdit(scope) {
       this.task = Object.assign({}, scope.row); // copy obj
diff --git a/client/src/views/qualityinspect/inspectTable.vue b/client/src/views/qualityinspect/inspectTable.vue
index 65c573c..cb60640 100644
--- a/client/src/views/qualityinspect/inspectTable.vue
+++ b/client/src/views/qualityinspect/inspectTable.vue
@@ -16,21 +16,21 @@
         max-height="600"
       >
         <el-table-column type="index" width="50" />
-         <el-table-column label="检查类别">
+         <el-table-column align="center" label="检查类别">
           <template slot-scope="scope">{{ scope.row.cate_name }}</template>
         </el-table-column>
-         <el-table-column label="序号">
+         <el-table-column align="center" label="序号">
           <template slot-scope="scope">{{ scope.row.sortnum }}</template>
         </el-table-column>
 
-        <el-table-column label="检查要点">
+        <el-table-column align="center" label="检查要点">
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
-        <el-table-column label="检查类型">
+        <el-table-column align="center" label="检查类型">
           <template slot-scope="scope">{{ scope.row.type }}</template>
         </el-table-column>
 
-        <el-table-column label="取证要求">
+        <el-table-column align="center" label="取证要求">
           <template slot-scope="scope">{{ scope.row.require }}</template>
         </el-table-column>
 
diff --git a/client/src/views/qualityinspect/inspecttaskdo.vue b/client/src/views/qualityinspect/inspecttaskdo.vue
new file mode 100644
index 0000000..5f6d0b6
--- /dev/null
+++ b/client/src/views/qualityinspect/inspecttaskdo.vue
@@ -0,0 +1,354 @@
+<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="6">
+            <div style="margin-bottom: 6px">
+              <span class="term">任务名称:</span>
+              <span class="desc"> {{ task.name }}</span>
+            </div>
+          </el-col>
+           <el-col :span="6">
+            <div style="margin-bottom: 6px">
+              <span class="term">巡检开始日期:</span>
+              <span class="desc"> {{ task.start_date }}</span>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div style="margin-bottom: 6px">
+              <span class="term">巡检结束日期:</span>
+              <span class="desc"> {{ task.end_date }}</span>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div style="margin-bottom: 6px">
+              <span class="term">创建人:</span>
+              <span class="desc" v-if="task.create_by_">
+                {{ task.create_by_.name }}/</span
+              >
+              <span class="desc" v-if="task.belong_dept_">{{
+                task.belong_dept_.name
+              }}</span>
+            </div>
+          </el-col>
+          
+         
+        </el-row>
+       
+      </div>
+    </el-card>
+
+   
+    <el-card style="margin-top: 2px">
+      <div slot="header" class="clearfix">
+        <span>子任务列表</span>
+      </div>
+    
+      <el-table
+        v-loading="listLoading2"
+        :data="recordList"
+        border
+        fit
+        stripe
+        highlight-current-row
+        max-height="400px"
+        style="margin-top:2px"
+        @selection-change="handleSelectRecords"
+      >
+        <el-table-column type="selection" align="center" width="55" />
+        <el-table-column label="序号" type="index" align="center" width="55" />
+        <el-table-column label="材料">
+          <template slot-scope="scope">{{ scope.row.content_name }}</template>
+        </el-table-column>
+        <el-table-column label="状态">
+          <template slot-scope="scope">
+            <el-tag type="danger" v-if="scope.row.state == '待报送'">{{
+              scope.row.state
+            }}</el-tag>
+            <el-tag
+              type="warning"
+              v-else-if="
+                scope.row.state == '待整改' || scope.row.state == '待发布'
+              "
+              >{{ scope.row.state }}</el-tag
+            >
+            <el-tag type="success" v-else-if="scope.row.state == '已确认'">{{
+              scope.row.state
+            }}</el-tag>
+            <el-tag v-else-if="scope.row.state == '已报送'">{{
+              scope.row.state
+            }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="报送要求/备注">
+          <template slot-scope="scope">{{ scope.row.note }}</template>
+        </el-table-column>
+        <el-table-column label="是否适用">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.is_yes" effect="plain">是</el-tag>
+            <el-tag type="danger" effect="plain" v-else>否</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="报送情况">
+          <template slot-scope="scope" v-if="scope.row.up_user_"
+            >{{ scope.row.up_user_.name }}/{{ scope.row.up_date }}</template
+          >
+        </el-table-column>
+        <el-table-column label="报送说明">
+          <template slot-scope="scope" >{{ scope.row.noteb}}</template
+          >
+        </el-table-column>
+        <el-table-column label="文件">
+          <template slot-scope="scope" v-if="scope.row.files">
+            <el-link
+              v-if="scope.row.files.length > 1"
+              @click="handleRecord({ action: 'view', record: scope.row })"
+              >有
+              <span style="color: red">{{ scope.row.files.length }}</span>
+              个文件</el-link
+            >
+            <div v-else v-for="item in scope.row.files_" v-bind:key="item.id">
+              <el-link :href="item.path" target="_blank" type="primary">{{
+                item.name
+              }}</el-link>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="操作"
+          width="240px"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-link
+              v-if="
+                (scope.row.state == '待报送' || scope.row.state == '待发布') &&
+                checkPermission(['record_update'])
+              "
+              type="warning"
+              size="small"
+              @click="handleRecord({ action: 'update', record: scope.row })"
+              >编辑</el-link
+            >
+            <el-link
+              v-if="
+                (scope.row.state == '待报送' || scope.row.state == '待整改') &&
+                checkPermission(['record_up'])
+              "
+              type="primary"
+              size="small"
+              @click="handleRecord({ action: 'up', record: scope.row })"
+              >报送</el-link
+            >
+            <el-link
+              v-if="
+                scope.row.state != '已确认' &&
+                checkPermission(['record_confirm'])
+              "
+              type="success"
+              size="small"
+              @click="handleRecord({ action: 'confirm', record: scope.row })"
+              >确认</el-link
+            >
+            <el-link
+              v-if="
+                scope.row.state == '已报送' &&
+                checkPermission(['record_reject'])
+              "
+              type="danger"
+              size="small"
+              @click="handleRecord({ action: 'reject', record: scope.row })"
+              >驳回</el-link
+            >
+            <el-link
+              v-if="checkPermission(['record_view'])"
+              size="small"
+              @click="handleRecord({ action: 'view', record: scope.row })"
+              >查看</el-link
+            >
+            <el-link
+              v-if="checkPermission(['record_delete'])"
+              type="danger"
+              size="small"
+              @click="handleRecord({ action: 'delete', record: scope.row })"
+              >删除</el-link
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :title="dgaction.name"
+      :close-on-click-modal="false"
+      width="70%"
+    >
+      <taskinit ref="taskinit" @handleChose="chooseComplete" ></taskinit>
+    </el-dialog>
+    <el-drawer
+      title="记录"
+      :visible.sync="drawer"
+      :with-header="false"
+      size="40%"
+    >
+      <recorddo
+        ref="recorddo"
+        :data="data"
+        @handleDo="handleDo"
+        v-if="drawer"
+      ></recorddo>
+    </el-drawer>
+  </div>
+</template>
+<style >
+.term {
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: bold;
+  font-size: 16px;
+}
+.desc {
+  color: rgba(0, 0, 0, 0.65);
+  font-weight: bold;
+  font-size: 16px;
+}
+.litem {
+  margin-bottom: 4px;
+  margin-left: 2px;
+  cursor: pointer;
+  color: #409eff;
+}
+</style>
+<script>
+import { getinspecttask, initinspecttask, appendinspecttask } from "@/api/inspectTask";
+import { getRecordList, updateRecords } from "@/api/record";
+import Pagination from "@/components/Pagination";
+import taskinit from "@/views/supervision/taskinit";
+import checkPermission from "@/utils/permission";
+import recorddo from "@/views/supervision/recorddo";
+export default {
+  components: { Pagination, taskinit, recorddo },
+  data() {
+    return {
+      task: { id: 0 },
+      dialogVisible: false,
+      activeName: "contenttab",
+      contents: [],
+      depts: [],
+      listLoading: false,
+      listLoading2: false,
+      recordList: [],
+      nowcontent: {},
+      nowdept: {},
+      drawer: false,
+      data: {},
+      taskdeptall: [],
+      listQuery:{},
+      selectRecords:[],
+      dgaction:{
+        action:'init',
+        name:'初始化任务'
+      }
+    };
+  },
+  created() {
+    this.task.id = this.$route.params.id;
+    this.getinspecttask();
+  },
+  methods: {
+    checkPermission,
+    getinspecttask() {
+      getinspecttask(this.task.id).then((res) => {
+        this.task = res.data;
+        if (this.task.state == "创建中") {
+          this.dialogVisible = true;
+        }
+      });
+    },
+   
+   
+    chooseComplete(data) {
+      this.dialogVisible = false;
+      if(this.dgaction.action == 'init'){
+      const rLoading = this.openLoading("正在初始化任务,请稍等...");
+      initinspecttask(this.task.id, data).then((res) => {
+        rLoading.close();
+        this.$message.success("成功");
+        this.$router.go(0);
+      }).catch(e=>{rLoading.close();});
+      }else if(this.dgaction.action == 'append'){
+        const rLoading = this.openLoading("正在追加任务,请稍等...");
+      appendinspecttask(this.task.id, data).then((res) => {
+        rLoading.close();
+        this.$message.success("成功");
+        this.$router.go(0);
+      }).catch(e=>{rLoading.close();});
+      }
+      
+    },
+    starttask() {
+      this.$confirm("确认发布任务吗?", "提示")
+        .then(async () => {
+          await starttask(this.task.id);
+          location.reload();
+          this.$message.success("成功");
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+    handleRecord(data) {
+      this.data = data;
+      this.drawer = true;
+    },
+    handleDo(data) {
+      this.drawer = false;
+      this.gettask();
+      this.gettaskdeptall();
+      this.getRecordList();
+    },
+    getRecordList() {
+      getRecordList(this.listQuery)
+        .then((res) => {
+          this.listLoading2 = false;
+          this.recordList = res.data;
+        })
+        .catch((e) => {
+          this.listLoading2 = false;
+        });
+    },
+    clickRow(row, col, e) {
+      this.listLoading2 = true;
+      this.listQuery = { pageoff: true, task: row.task, belong_dept: row.dept }
+      this.getRecordList();
+    },
+    handleSelectRecords(val){
+      let selects = [];
+      for (var i = 0; i < val.length; i++) {
+        selects.push(val[i].id);
+      }
+      this.selectRecords = selects;
+    },
+    handleUp2(){
+      if (this.selectRecords.length) {
+        this.$prompt('请输入备注内容', '提示').then(({ value }) => {
+          updateRecords({note:value, ids:this.selectRecords}).then(res=>{
+            this.$message.success('成功')
+            this.getRecordList();
+          })
+        }).catch(() => {      
+        });
+      } else {
+        this.$message({
+          message: "请先选择",
+          type: "warning",
+        });
+      }
+    }
+  },
+};
+</script>
\ No newline at end of file

From cb9ff64b0eabe96d0b591a11831eede95150af03 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Tue, 13 Apr 2021 10:52:33 +0800
Subject: [PATCH 3/4] yonghu

---
 .../src/views/qualityinspect/inspeatTask.vue  |   7 +
 .../views/qualityinspect/inspecttaskdo.vue    | 288 ++++++++----------
 .../src/views/qualityinspect/leaderinit.vue   |  63 ++++
 client/src/views/qualityinspect/orginit.vue   |  63 ++++
 4 files changed, 258 insertions(+), 163 deletions(-)
 create mode 100644 client/src/views/qualityinspect/leaderinit.vue
 create mode 100644 client/src/views/qualityinspect/orginit.vue

diff --git a/client/src/views/qualityinspect/inspeatTask.vue b/client/src/views/qualityinspect/inspeatTask.vue
index 7c8e01a..288f2a9 100644
--- a/client/src/views/qualityinspect/inspeatTask.vue
+++ b/client/src/views/qualityinspect/inspeatTask.vue
@@ -44,6 +44,13 @@
         <el-table-column  label="任务名">
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
+         <el-table-column  label="执行单位">
+          <template slot-scope="scope">{{ scope.row.dept_count }}</template>
+        </el-table-column>
+         <el-table-column  label="子任务数">
+          <template slot-scope="scope">{{ scope.row.subtask_count }}</template>
+        </el-table-column>
+
           <el-table-column label="巡查开始日期">
           <template slot-scope="scope">{{ scope.row.start_date }}</template>
         </el-table-column>
diff --git a/client/src/views/qualityinspect/inspecttaskdo.vue b/client/src/views/qualityinspect/inspecttaskdo.vue
index 5f6d0b6..fb527e2 100644
--- a/client/src/views/qualityinspect/inspecttaskdo.vue
+++ b/client/src/views/qualityinspect/inspecttaskdo.vue
@@ -45,19 +45,18 @@
    
     <el-card style="margin-top: 2px">
       <div slot="header" class="clearfix">
-        <span>子任务列表</span>
+        <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
+        >创建子任务</el-button
+      >
       </div>
     
       <el-table
-        v-loading="listLoading2"
-        :data="recordList"
         border
         fit
         stripe
         highlight-current-row
         max-height="400px"
         style="margin-top:2px"
-        @selection-change="handleSelectRecords"
       >
         <el-table-column type="selection" align="center" width="55" />
         <el-table-column label="序号" type="index" align="center" width="55" />
@@ -125,52 +124,7 @@
           fixed="right"
         >
           <template slot-scope="scope">
-            <el-link
-              v-if="
-                (scope.row.state == '待报送' || scope.row.state == '待发布') &&
-                checkPermission(['record_update'])
-              "
-              type="warning"
-              size="small"
-              @click="handleRecord({ action: 'update', record: scope.row })"
-              >编辑</el-link
-            >
-            <el-link
-              v-if="
-                (scope.row.state == '待报送' || scope.row.state == '待整改') &&
-                checkPermission(['record_up'])
-              "
-              type="primary"
-              size="small"
-              @click="handleRecord({ action: 'up', record: scope.row })"
-              >报送</el-link
-            >
-            <el-link
-              v-if="
-                scope.row.state != '已确认' &&
-                checkPermission(['record_confirm'])
-              "
-              type="success"
-              size="small"
-              @click="handleRecord({ action: 'confirm', record: scope.row })"
-              >确认</el-link
-            >
-            <el-link
-              v-if="
-                scope.row.state == '已报送' &&
-                checkPermission(['record_reject'])
-              "
-              type="danger"
-              size="small"
-              @click="handleRecord({ action: 'reject', record: scope.row })"
-              >驳回</el-link
-            >
-            <el-link
-              v-if="checkPermission(['record_view'])"
-              size="small"
-              @click="handleRecord({ action: 'view', record: scope.row })"
-              >查看</el-link
-            >
+          
             <el-link
               v-if="checkPermission(['record_delete'])"
               type="danger"
@@ -182,27 +136,64 @@
         </el-table-column>
       </el-table>
     </el-card>
-    <el-dialog
+   <el-dialog
       :visible.sync="dialogVisible"
-      :title="dgaction.name"
+      :title="dialogType === 'edit' ? '编辑任务' : '新增任务'"
+    >
+      <el-form
+        ref="Form"
+        :model="inspecttask"
+        label-width="80px"
+        label-position="right"
+      >
+        <el-form-item label="子任务名" prop="name">
+          <el-input v-model="inspecttask.name" placeholder="子任务名" />
+        </el-form-item>
+         <el-form-item label="选择组长" prop="leader">
+             <el-cascader
+            v-model="inspecttask.leader"
+            :options="typeOptions"
+            :props="{ emitPath: false }"
+            clearable
+            style="width: 100%"
+          ></el-cascader>
+        
+        </el-form-item>
+          <el-form-item label="选择组员" prop="member">
+          <el-input v-model="inspecttask.member" placeholder="选择组员" >
+            <el-button  icon="el-icon-search" slot="append" @click="Createmember"></el-button>
+            </el-input>
+        </el-form-item>
+          <el-form-item label="选择组织" prop="leader">
+          <el-input v-model="inspecttask.leader" placeholder="选择组织" >
+            <el-button  icon="el-icon-search" slot="append" @click="CreatOrg"></el-button>
+            </el-input>
+        </el-form-item>
+       
+      </el-form>
+      <div style="text-align: right">
+        <el-button type="danger" @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirm('Form')">确认</el-button>
+      </div>
+    </el-dialog>
+    <!--组织弹框-->
+     <el-dialog
+      :visible.sync="dialogVisibles"
+      :title="选择组织"
       :close-on-click-modal="false"
       width="70%"
     >
-      <taskinit ref="taskinit" @handleChose="chooseComplete" ></taskinit>
+      <orginit ref="leaderinit" @handleChose="chooseComplete" ></orginit>
     </el-dialog>
-    <el-drawer
-      title="记录"
-      :visible.sync="drawer"
-      :with-header="false"
-      size="40%"
+    <!--人员弹框-->
+     <el-dialog
+      :visible.sync="dialogVisibless"
+      :title="选择组织"
+      :close-on-click-modal="false"
+      width="70%"
     >
-      <recorddo
-        ref="recorddo"
-        :data="data"
-        @handleDo="handleDo"
-        v-if="drawer"
-      ></recorddo>
-    </el-drawer>
+      <leaderinit ref="leaderinit" @handleChose="chooseComplete" ></leaderinit>
+    </el-dialog>
   </div>
 </template>
 <style >
@@ -225,130 +216,101 @@
 </style>
 <script>
 import { getinspecttask, initinspecttask, appendinspecttask } from "@/api/inspectTask";
-import { getRecordList, updateRecords } from "@/api/record";
+import orginit from "@/views/qualityinspect/orginit";
+import leaderinit from "@/views/qualityinspect/leaderinit";
+import {
+  getUserList
+} from "@/api/user";
+
+import { genTree } from "@/utils";
 import Pagination from "@/components/Pagination";
-import taskinit from "@/views/supervision/taskinit";
 import checkPermission from "@/utils/permission";
-import recorddo from "@/views/supervision/recorddo";
+
+const defaulttask = {
+  name: "",
+};
 export default {
-  components: { Pagination, taskinit, recorddo },
+  components: { Pagination,orginit,leaderinit},
+  
   data() {
     return {
       task: { id: 0 },
+      
+      dialogVisibles: false,
+      dialogVisibless: false,
+      inspecttask: defaulttask,
       dialogVisible: false,
-      activeName: "contenttab",
-      contents: [],
-      depts: [],
-      listLoading: false,
-      listLoading2: false,
-      recordList: [],
-      nowcontent: {},
-      nowdept: {},
-      drawer: false,
+      listLoading: true,
+      typeOptions:[],
+      dialogVisible: false,
+      dialogType: "new",
       data: {},
-      taskdeptall: [],
       listQuery:{},
-      selectRecords:[],
-      dgaction:{
-        action:'init',
-        name:'初始化任务'
-      }
     };
   },
   created() {
     this.task.id = this.$route.params.id;
     this.getinspecttask();
+    this.getTypeAll();
   },
   methods: {
     checkPermission,
     getinspecttask() {
       getinspecttask(this.task.id).then((res) => {
         this.task = res.data;
-        if (this.task.state == "创建中") {
-          this.dialogVisible = true;
-        }
+       
+      });
+    },
+    getTypeAll() {
+      getUserList().then((res) => {
+        this.typeOptions = genTree(res.data.results);
       });
     },
    
-   
-    chooseComplete(data) {
-      this.dialogVisible = false;
-      if(this.dgaction.action == 'init'){
-      const rLoading = this.openLoading("正在初始化任务,请稍等...");
-      initinspecttask(this.task.id, data).then((res) => {
-        rLoading.close();
-        this.$message.success("成功");
-        this.$router.go(0);
-      }).catch(e=>{rLoading.close();});
-      }else if(this.dgaction.action == 'append'){
-        const rLoading = this.openLoading("正在追加任务,请稍等...");
-      appendinspecttask(this.task.id, data).then((res) => {
-        rLoading.close();
-        this.$message.success("成功");
-        this.$router.go(0);
-      }).catch(e=>{rLoading.close();});
-      }
-      
+   Createmember()
+   {
+       
+      this.dialogVisibless = true;
+   },
+    CreatOrg()
+    {
+          this.dialogVisibles = true;
     },
-    starttask() {
-      this.$confirm("确认发布任务吗?", "提示")
-        .then(async () => {
-          await starttask(this.task.id);
-          location.reload();
-          this.$message.success("成功");
-        })
-        .catch((err) => {
-          console.error(err);
-        });
+    handleCreate() {
+      this.inspecttask = Object.assign({}, defaulttask);
+      this.dialogType = "new";
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs["Form"].clearValidate();
+      });
     },
-    handleRecord(data) {
-      this.data = data;
-      this.drawer = true;
+    async confirm(form) {
+      this.$refs[form].validate((valid) => {
+        if (valid) {
+          const isEdit = this.dialogType === "edit";
+          if (isEdit) {
+            updateinspecttask(this.inspecttask.id, this.inspecttask).then((res) => {
+              if (res.code >= 200) {
+                this.getList();
+                this.dialogVisible = false;
+                this.$message.success("成功");
+              }
+            });
+          } else {
+            createinspecttask(this.inspecttask).then((res) => {
+              if (res.code >= 200) {
+                this.getList();
+                this.dialogVisible = false;
+               // this.$router.push({name: "Taskdo", params: { id: res.data.id }, })
+                this.$message.success("成功");
+              }
+            });
+          }
+        } else {
+          return false;
+        }
+      });
     },
-    handleDo(data) {
-      this.drawer = false;
-      this.gettask();
-      this.gettaskdeptall();
-      this.getRecordList();
-    },
-    getRecordList() {
-      getRecordList(this.listQuery)
-        .then((res) => {
-          this.listLoading2 = false;
-          this.recordList = res.data;
-        })
-        .catch((e) => {
-          this.listLoading2 = false;
-        });
-    },
-    clickRow(row, col, e) {
-      this.listLoading2 = true;
-      this.listQuery = { pageoff: true, task: row.task, belong_dept: row.dept }
-      this.getRecordList();
-    },
-    handleSelectRecords(val){
-      let selects = [];
-      for (var i = 0; i < val.length; i++) {
-        selects.push(val[i].id);
-      }
-      this.selectRecords = selects;
-    },
-    handleUp2(){
-      if (this.selectRecords.length) {
-        this.$prompt('请输入备注内容', '提示').then(({ value }) => {
-          updateRecords({note:value, ids:this.selectRecords}).then(res=>{
-            this.$message.success('成功')
-            this.getRecordList();
-          })
-        }).catch(() => {      
-        });
-      } else {
-        this.$message({
-          message: "请先选择",
-          type: "warning",
-        });
-      }
-    }
   },
 };
 </script>
\ No newline at end of file
diff --git a/client/src/views/qualityinspect/leaderinit.vue b/client/src/views/qualityinspect/leaderinit.vue
new file mode 100644
index 0000000..4ad5082
--- /dev/null
+++ b/client/src/views/qualityinspect/leaderinit.vue
@@ -0,0 +1,63 @@
+<template>
+  <div>
+    
+    <div style="margin-top:6px">
+    <el-transfer
+      v-model="depts"
+      :data="userOptions"
+      :titles="['组员列表', '选择的组员']"
+      :props="{ key : 'id' , label: 'name' }"
+    >
+    <span slot-scope="{ option }">{{ option.sort }} - {{ option.name }}</span>
+    </el-transfer>
+    </div>
+    <div style="text-align: right">
+      <el-button type="primary" @click="confirm()">确认</el-button>
+    </div>
+  </div>
+</template>
+<style lang="scss">
+.el-transfer-panel {
+  width: 470px;
+}
+.el-transfer__buttons {
+  padding: 0 2px;
+  .el-button {
+    display: block;
+  }
+}
+
+</style>
+<script>
+import { getUserList } from "@/api/user";
+export default {
+  name: "leaderinit",
+  data() {
+    return {
+      depts: [],
+      userOptions: [],
+    };
+  },
+  created() {
+    this.getUserList();
+  },
+  methods: {
+    getUserList() {
+      getUserList().then((res) => {
+        this.userOptions = res.data.results;
+      });
+    },
+    confirm(){
+        if( this.depts.length>0){
+            var data = {
+            depts:this.depts
+        }
+        this.$emit('handleChose', data)
+        }else{
+            this.$message.error('请选择单位!')
+        }
+        
+    }
+  },
+};
+</script>
\ No newline at end of file
diff --git a/client/src/views/qualityinspect/orginit.vue b/client/src/views/qualityinspect/orginit.vue
new file mode 100644
index 0000000..cae8099
--- /dev/null
+++ b/client/src/views/qualityinspect/orginit.vue
@@ -0,0 +1,63 @@
+<template>
+  <div>
+    
+    <div style="margin-top:6px">
+    <el-transfer
+      v-model="depts"
+      :data="deptOptions"
+      :titles="['单位列表', '选择的单位']"
+      :props="{ key : 'id' , label: 'name' }"
+    >
+    <span slot-scope="{ option }">{{ option.sort }} - {{ option.name }}</span>
+    </el-transfer>
+    </div>
+    <div style="text-align: right">
+      <el-button type="primary" @click="confirm()">确认</el-button>
+    </div>
+  </div>
+</template>
+<style lang="scss">
+.el-transfer-panel {
+  width: 470px;
+}
+.el-transfer__buttons {
+  padding: 0 2px;
+  .el-button {
+    display: block;
+  }
+}
+
+</style>
+<script>
+import { getOrgList } from "@/api/org";
+export default {
+  name: "leaderinit",
+  data() {
+    return {
+      depts: [],
+      deptOptions: [],
+    };
+  },
+  created() {
+    this.getOrgList();
+  },
+  methods: {
+    getOrgList() {
+      getOrgList({can_supervision:true}).then((res) => {
+        this.deptOptions = res.data;
+      });
+    },
+    confirm(){
+        if( this.depts.length>0){
+            var data = {
+            depts:this.depts
+        }
+        this.$emit('handleChose', data)
+        }else{
+            this.$message.error('请选择单位!')
+        }
+        
+    }
+  },
+};
+</script>
\ No newline at end of file

From 5df8ebc4f009230daf5ad264655531a90f6d902f Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Tue, 13 Apr 2021 17:03:28 +0800
Subject: [PATCH 4/4] chuangjianzirenwu

---
 client/.env.development                       |   2 +-
 .../views/qualityinspect/inspecttaskdo.vue    | 158 +++++++++---------
 .../src/views/qualityinspect/leaderinit.vue   |   4 +-
 3 files changed, 85 insertions(+), 79 deletions(-)

diff --git a/client/.env.development b/client/.env.development
index f0aff47..8c9070b 100644
--- a/client/.env.development
+++ b/client/.env.development
@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://localhost:8000/api'
+VUE_APP_BASE_API = 'http://10.0.11.127:8000/api'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
diff --git a/client/src/views/qualityinspect/inspecttaskdo.vue b/client/src/views/qualityinspect/inspecttaskdo.vue
index fb527e2..4e666dc 100644
--- a/client/src/views/qualityinspect/inspecttaskdo.vue
+++ b/client/src/views/qualityinspect/inspecttaskdo.vue
@@ -150,24 +150,60 @@
           <el-input v-model="inspecttask.name" placeholder="子任务名" />
         </el-form-item>
          <el-form-item label="选择组长" prop="leader">
-             <el-cascader
-            v-model="inspecttask.leader"
-            :options="typeOptions"
-            :props="{ emitPath: false }"
-            clearable
-            style="width: 100%"
-          ></el-cascader>
+            <el-select
+              v-model="inspecttask.leader"
+              multiple
+              filterable
+              style="width: 100%"
+              allow-create
+              default-first-option
+              placeholder="请选择组长">
+              <el-option
+                 v-for="item in leaderOptions"
+                  :key="item.value"
+                  :label="item.label"
+                 :value="item.value">
+               </el-option>
+           </el-select>
+            
         
         </el-form-item>
           <el-form-item label="选择组员" prop="member">
-          <el-input v-model="inspecttask.member" placeholder="选择组员" >
-            <el-button  icon="el-icon-search" slot="append" @click="Createmember"></el-button>
-            </el-input>
+               <el-select
+              v-model="inspecttask.member"
+              multiple
+              filterable
+              style="width: 100%"
+              allow-create
+              default-first-option
+              placeholder="请选择组员">
+              <el-option
+                 v-for="item in memberOptions"
+                  :key="item.value"
+                  :label="item.label"
+                 :value="item.value">
+               </el-option>
+           </el-select>
+            
+         
         </el-form-item>
           <el-form-item label="选择组织" prop="leader">
-          <el-input v-model="inspecttask.leader" placeholder="选择组织" >
-            <el-button  icon="el-icon-search" slot="append" @click="CreatOrg"></el-button>
-            </el-input>
+             
+          <el-select
+              v-model="inspecttask.dept"
+              multiple
+              filterable
+              style="width: 100%"
+              allow-create
+              default-first-option
+              placeholder="请选择组织">
+              <el-option
+                 v-for="item in deptOptions"
+                  :key="item.value"
+                  :label="item.label"
+                 :value="item.value">
+               </el-option>
+           </el-select>
         </el-form-item>
        
       </el-form>
@@ -176,24 +212,7 @@
         <el-button type="primary" @click="confirm('Form')">确认</el-button>
       </div>
     </el-dialog>
-    <!--组织弹框-->
-     <el-dialog
-      :visible.sync="dialogVisibles"
-      :title="选择组织"
-      :close-on-click-modal="false"
-      width="70%"
-    >
-      <orginit ref="leaderinit" @handleChose="chooseComplete" ></orginit>
-    </el-dialog>
-    <!--人员弹框-->
-     <el-dialog
-      :visible.sync="dialogVisibless"
-      :title="选择组织"
-      :close-on-click-modal="false"
-      width="70%"
-    >
-      <leaderinit ref="leaderinit" @handleChose="chooseComplete" ></leaderinit>
-    </el-dialog>
+     
   </div>
 </template>
 <style >
@@ -215,33 +234,31 @@
 }
 </style>
 <script>
-import { getinspecttask, initinspecttask, appendinspecttask } from "@/api/inspectTask";
-import orginit from "@/views/qualityinspect/orginit";
-import leaderinit from "@/views/qualityinspect/leaderinit";
-import {
-  getUserList
-} from "@/api/user";
-
+import { getinspecttask, createinspecttask } from "@/api/inspectTask";
+import { getUserList } from "@/api/user";
+import { getOrgList } from "@/api/org";
 import { genTree } from "@/utils";
 import Pagination from "@/components/Pagination";
 import checkPermission from "@/utils/permission";
 
 const defaulttask = {
   name: "",
+  leader:"",
+  member:"",
+  dept:"",
 };
 export default {
-  components: { Pagination,orginit,leaderinit},
+  components: { Pagination},
   
   data() {
     return {
       task: { id: 0 },
-      
-      dialogVisibles: false,
-      dialogVisibless: false,
       inspecttask: defaulttask,
       dialogVisible: false,
       listLoading: true,
-      typeOptions:[],
+      leaderOptions:[],
+      memberOptions:[],
+      deptOptions:[],
       dialogVisible: false,
       dialogType: "new",
       data: {},
@@ -250,32 +267,39 @@ export default {
   },
   created() {
     this.task.id = this.$route.params.id;
-    this.getinspecttask();
-    this.getTypeAll();
+    this.getinspecttask();//主任务信息
+    this.getTypeAll();//组长
+    this.getUserList();//组员
+     this.getOrgList();//组织
   },
   methods: {
     checkPermission,
+    //主任务信息展示
     getinspecttask() {
       getinspecttask(this.task.id).then((res) => {
         this.task = res.data;
        
       });
     },
+    //组长列表
     getTypeAll() {
-      getUserList().then((res) => {
-        this.typeOptions = genTree(res.data.results);
+      getUserList({pageoff:true}).then((res) => {
+        this.leaderOptions = genTree(res.data);
       });
     },
-   
-   Createmember()
-   {
-       
-      this.dialogVisibless = true;
-   },
-    CreatOrg()
-    {
-          this.dialogVisibles = true;
+    //组员列表
+    getUserList() {
+      getUserList({pageoff:true}).then((res) => {
+        this.memberOptions =  genTree(res.data);
+      });
     },
+    //组织列表
+      getOrgList() {
+      getOrgList({can_supervision:true}).then((res) => {
+        this.deptOptions =  genTree(res.data);
+      });
+    },
+
     handleCreate() {
       this.inspecttask = Object.assign({}, defaulttask);
       this.dialogType = "new";
@@ -285,31 +309,13 @@ export default {
       });
     },
     async confirm(form) {
-      this.$refs[form].validate((valid) => {
-        if (valid) {
-          const isEdit = this.dialogType === "edit";
-          if (isEdit) {
-            updateinspecttask(this.inspecttask.id, this.inspecttask).then((res) => {
+       //创建子任务
+         createinspecttask(this.deptOptions).then((res) => {
               if (res.code >= 200) {
-                this.getList();
                 this.dialogVisible = false;
                 this.$message.success("成功");
               }
             });
-          } else {
-            createinspecttask(this.inspecttask).then((res) => {
-              if (res.code >= 200) {
-                this.getList();
-                this.dialogVisible = false;
-               // this.$router.push({name: "Taskdo", params: { id: res.data.id }, })
-                this.$message.success("成功");
-              }
-            });
-          }
-        } else {
-          return false;
-        }
-      });
     },
   },
 };
diff --git a/client/src/views/qualityinspect/leaderinit.vue b/client/src/views/qualityinspect/leaderinit.vue
index 4ad5082..520edab 100644
--- a/client/src/views/qualityinspect/leaderinit.vue
+++ b/client/src/views/qualityinspect/leaderinit.vue
@@ -43,8 +43,8 @@ export default {
   },
   methods: {
     getUserList() {
-      getUserList().then((res) => {
-        this.userOptions = res.data.results;
+      getUserList({pageoff:true}).then((res) => {
+        this.userOptions = res.data;
       });
     },
     confirm(){