任务管理列表修改20230724

src/views/risk/inherent/index.vue

@@ -179,7 +179,7 @@
       <el-table-column label="楼层名称" align="center" prop="floorName" />
       <el-table-column label="房间名称" align="center" prop="roomName" />
       <el-table-column label="评估人" align="center" prop="userName" />
-      <el-table-column label="计划id" align="center" prop="planId" />
+      <!-- <el-table-column label="计划id" align="center" prop="planId" /> -->
       <el-table-column label="风险源名称" align="center" prop="name" />
       <el-table-column label="风险点类型" align="center" prop="pointType">
         <template slot-scope="scope">
@@ -203,8 +203,8 @@
         </template>
       </el-table-column>
       <el-table-column label="存在部位" align="center" prop="presenceLocation" />
-      <el-table-column label="工程技术措施" align="center" prop="measuresProject" />
-      <el-table-column label="应采取的管理措施" align="center" prop="measuresAdministration" />
+      <!-- <el-table-column label="工程技术措施" align="center" prop="measuresProject" /> -->
+      <!-- <el-table-column label="应采取的管理措施" align="center" prop="measuresAdministration" /> -->
       <el-table-column label="管控责任单位" align="center" prop="measuresDeptName" />
       <el-table-column label="管控责任人" align="center" prop="measuresUserName" />
       <el-table-column label="应急措施" align="center" prop="measuresEmergency" />

src/views/risk/plan/index.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="no">
         <el-input v-model="queryParams.no" placeholder="请输入任务编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="项目id" prop="projectId">
+      <el-form-item label="项目名称" prop="projectId">
         <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="楼栋ids" prop="buildingIds">
+      <el-form-item label="楼栋名称" prop="buildingIds">
         <el-input v-model="queryParams.buildingIds" placeholder="请输入楼栋ids" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="创建人员id" prop="createUserId">
+      <el-form-item label="创建人员" prop="createUserId">
         <el-input v-model="queryParams.createUserId" placeholder="请输入创建人员id" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -22,11 +22,11 @@
         <el-input v-model="queryParams.createDeptId" placeholder="请输入创建单位" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="负责人id" prop="leaderUserId">
+      <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="执行人员ids" prop="workUserIds">
+      <el-form-item label="执行人员" prop="workUserIds">
         <el-input v-model="queryParams.workUserIds" placeholder="请输入执行人员ids" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -91,13 +91,15 @@
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="状态" align="center" prop="statusName" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['system:riskPlan:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['system:riskPlan:remove']">删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>
@@ -107,43 +109,43 @@
 
     <!-- 添加或修改风险计划对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="任务名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入任务名称" />
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="创建人员" prop="createUserId">
+          <el-input v-model="user.nickName" placeholder="请输入创建人员" />
         </el-form-item>
-        <el-form-item label="任务编号" prop="no">
-          <el-input v-model="form.no" placeholder="请输入任务编号" />
+        <el-form-item label="创建单位" prop="createDeptId">
+          <el-input v-model="user.dept.deptName" placeholder="请输入创建单位" />
         </el-form-item>
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+        <el-form-item label="任务名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入任务名称" />
         </el-form-item>
-        <el-form-item label="楼栋ids" prop="buildingIds">
-          <el-input v-model="form.buildingIds" placeholder="请输入楼栋ids" />
+        <el-form-item label="关联项目" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入关联项目" />
         </el-form-item>
-        <el-form-item label="创建人员id" prop="createUserId">
-          <el-input v-model="form.createUserId" placeholder="请输入创建人员id" />
+        <el-form-item label="评估楼栋" prop="buildingIds">
+          <el-input v-model="form.buildingIds" placeholder="请输入评估楼栋" />
         </el-form-item>
-        <el-form-item label="创建单位" prop="createDeptId">
-          <el-input v-model="form.createDeptId" placeholder="请输入创建单位" />
+        <el-form-item label="评估小组选择" prop="leaderUserId">
+          <treeselect v-model="user.dept.deptName" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          <!-- <el-input v-model="user.dept.deptName" placeholder="请输评估小组选择" /> -->
         </el-form-item>
-        <el-form-item label="负责人id" prop="leaderUserId">
-          <el-input v-model="form.leaderUserId" placeholder="请输入负责人id" />
+        <el-form-item label="评估小组组长" prop="leaderUserId">
+          <el-input v-model="form.leaderUserId" placeholder="请输入评估小组组长" />
         </el-form-item>
-        <el-form-item label="执行人员ids" prop="workUserIds">
-          <el-input v-model="form.workUserIds" placeholder="请输入执行人员ids" />
+        <el-form-item label="评估小组成员" prop="workUserIds">
+          <el-input v-model="form.workUserIds" placeholder="请输入评估小组成员" />
         </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
+        <el-form-item label="任务开始时间" prop="startTime">
           <el-date-picker clearable v-model="form.startTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择开始时间">
+            placeholder="请选择任务开始时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker clearable v-model="form.endTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择结束时间">
+        <el-form-item label="任务结束时间" prop="endTime">
+          <el-date-picker clearable v-model="form.endTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择任务结束时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -154,6 +156,7 @@
 </template>
 
 <script>
+    import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
   import {
     listPlan,
     getPlan,
@@ -161,11 +164,18 @@
     addPlan,
     updatePlan
   } from "@/api/risk/plan";
+  import {
+    getUserProfile
+  } from "@/api/system/user";
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
   export default {
     name: "Plan",
+    components: { Treeselect },
     data() {
       return {
+        user: {},
         // 遮罩层
         loading: true,
         // 选中数组
@@ -180,6 +190,8 @@
         total: 0,
         // 风险计划表格数据
         planList: [],
+        // 部门树选项
+        deptOptions: undefined,
         // 弹出层标题
         title: "",
         // 是否显示弹出层
@@ -206,10 +218,23 @@
         rules: {}
       };
     },
+    watch: {
+      // 根据名称筛选部门树
+      deptName(val) {
+        this.$refs.tree.filter(val);
+      }
+      },
     created() {
+      this.getUser();
+       this.getDeptTree();
       this.getList();
     },
     methods: {
+      getUser() {
+        getUserProfile().then(response => {
+          this.user = response.data;
+        });
+      },
       /** 查询风险计划列表 */
       getList() {
         this.loading = true;
@@ -219,6 +244,22 @@
           this.loading = false;
         });
       },
+      /** 查询部门下拉树结构 */
+      getDeptTree() {
+        deptTreeSelect().then(response => {
+          this.deptOptions = response.data;
+        });
+      },
+      // 筛选节点
+      filterNode(value, data) {
+        if (!value) return true;
+        return data.label.indexOf(value) !== -1;
+      },
+      // 节点单击事件
+      handleNodeClick(data) {
+        this.queryParams.deptId = data.id;
+        this.handleQuery();
+      },
       // 取消按钮
       cancel() {
         this.open = false;
@@ -267,7 +308,7 @@
       handleAdd() {
         this.reset();
         this.open = true;
-        this.title = "添加风险计划";
+        this.title = "创建任务";
       },
       /** 修改按钮操作 */
       handleUpdate(row) {