1、修改任务管理、任务台账页面

src/views/risk/plan/index.vue

@@ -4,42 +4,26 @@
       <el-form-item label="任务名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="任务编号" prop="no">
-        <el-input v-model="queryParams.no" placeholder="请输入任务编号" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="所属区域" prop="createDeptId">
+        <treeselect
+          v-model="queryParams.createDeptId"
+          :options="deptOptions"
+          :show-count="true"
+          placeholder="请选择所属区域"
+          style="width: 250px"
+        />
       </el-form-item>
-      <el-form-item label="项目名称" prop="projectId">
-        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="楼栋名称" prop="buildingIds">
-        <el-input v-model="queryParams.buildingIds" placeholder="请输入楼栋ids" clearable
+      <el-form-item label="创建人名称" prop="createUserName">
+        <el-input v-model="queryParams.createUserName" placeholder="请输入创建人员名称" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="创建人员" prop="createUserId">
-        <el-input v-model="queryParams.createUserId" placeholder="请输入创建人员id" clearable
+      <el-form-item label="负责人名称" prop="leaderUserName">
+        <el-input v-model="queryParams.leaderUserName" placeholder="请输入负责人名称" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="创建单位" prop="createDeptId">
-        <el-input v-model="queryParams.createDeptId" placeholder="请输入创建单位" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="负责人" prop="leaderUserId">
-        <el-input v-model="queryParams.leaderUserId" placeholder="请输入负责人id" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="执行人员" prop="workUserIds">
-        <el-input v-model="queryParams.workUserIds" placeholder="请输入执行人员ids" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
-        <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择结束时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -236,6 +220,7 @@
   import {
     getUserProfile
   } from "@/api/system/user";
+  
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -281,16 +266,11 @@
           pageNum: 1,
           pageSize: 10,
           name: null,
-          no: null,
-          projectId: null,
-          buildingIds: null,
-          createUserId: null,
           createDeptId: null,
-          leaderUserId: null,
-          workUserIds: null,
-          startTime: null,
-          endTime: null,
-          status: null,
+          projectName: null,
+          createUserName: null,
+          leaderUserName: null,
+          workUserName: null,
         },
         // 表单参数
         form: {
@@ -488,21 +468,11 @@
         this.form = {
           id: null,
           name: null,
-          no: null,
-          projectId: null,
-          buildingIds: [],
-          createUserId: null,
           createDeptId: null,
-          leaderUserId: null,
-          workUserIds: [],
-          startTime: null,
-          endTime: null,
-          status: null,
-          delFlag: null,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null
+          projectName: null,
+          createUserName: null,
+          leaderUserName: null,
+          workUserName: null,
         };
         this.resetForm("form");
       },

src/views/risk/plan/ledger.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="任务名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="所属区域" prop="createDeptId">
+        <treeselect
+          v-model="queryParams.createDeptId"
+          :options="deptOptions"
+          :show-count="true"
+          placeholder="请选择所属区域"
+          style="width: 250px"
+        />
+      </el-form-item>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="创建人名称" prop="createUserName">
+        <el-input v-model="queryParams.createUserName" placeholder="请输入创建人员名称" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="负责人名称" prop="leaderUserName">
+        <el-input v-model="queryParams.leaderUserName" placeholder="请输入负责人名称" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -17,7 +37,6 @@
         </template>
       </el-table-column>
       <el-table-column label="任务名称" align="left" prop="name"  width="220px"/>
-      <!-- <el-table-column label="任务编号" align="center" prop="no" /> -->
       <el-table-column label="项目名称" align="left" prop="projectName" width="220px"/>
       <el-table-column label="楼栋名称" align="left" prop="buildingNames" width="220px">
       <template slot-scope="scope">
@@ -80,8 +99,15 @@
     updatePlan
   } from "@/api/risk/plan";
 
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+  import { deptTreeSelect } from "@/api/system/user";
   export default {
     name: "Plan",
+  components: {
+    Treeselect,
+  },
     data() {
       return {
         // 遮罩层
@@ -106,29 +132,33 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-          name: null,
-          no: null,
           isLedger:"ledger",
-          projectId: null,
-          buildingIds: null,
-          createUserId: null,
+          name: null,
+          createDeptId: null,
+          projectName: null,
+          createUserName: null,
+          leaderUserName: null,
+          workUserName: null,
           createDeptId: null,
-          leaderUserId: null,
-          workUserIds: null,
-          startTime: null,
-          endTime: null,
-          status: null,
         },
         // 表单参数
         form: {},
         // 表单校验
         rules: {},
+        deptOptions: []
       };
     },
     created() {
       this.getList();
+      this.getDeptTree();
     },
     methods: {
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
       /** 查询风险计划列表 */
       getList() {
         this.loading = true;
@@ -147,22 +177,14 @@
       reset() {
         this.form = {
           id: null,
+          isLedger:"ledger",
           name: null,
-          no: null,
-          projectId: null,
-          buildingIds: null,
-          createUserId: null,
           createDeptId: null,
-          leaderUserId: null,
-          workUserIds: null,
-          startTime: null,
-          endTime: null,
-          status: null,
-          delFlag: null,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null,
+          projectName: null,
+          createUserName: null,
+          leaderUserName: null,
+          workUserName: null,
+          createDeptId: null,
         };
         this.resetForm("form");
       },