|
|
@@ -2,51 +2,20 @@
|
|
|
<div class="app-container">
|
|
|
<div ref="sousuH">
|
|
|
<!-- 搜索工作栏 -->
|
|
|
- <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="68px">
|
|
|
<el-form-item label="任务名称" prop="taskName">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.taskName"
|
|
|
- placeholder="请输入任务名称"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="任务类型" prop="taskType">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.taskType"
|
|
|
- placeholder="请选择任务类型"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in this.filteredDataType"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
+ <el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable size="small" @change="typeChange">
|
|
|
+ <el-option v-for="dict in this.filteredDataType" :key="dict.value" :label="dict.label" :value="dict.value" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="任务状态" prop="taskStatus">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.taskStatus"
|
|
|
- placeholder="请选择任务状态"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @change="taskStatusChange"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in this.getDictDatas(DICT_TYPE.TASK_STATUS)"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
+ <el-select v-model="queryParams.taskStatus" placeholder="请选择任务状态" clearable size="small"
|
|
|
+ @change="taskStatusChange">
|
|
|
+ <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TASK_STATUS)" :key="dict.value" :label="dict.label"
|
|
|
+ :value="dict.value" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="任务积分" prop="taskScore">
|
|
|
@@ -67,76 +36,48 @@
|
|
|
</el-select>
|
|
|
</el-form-item> -->
|
|
|
<el-form-item>
|
|
|
- <el-button type="primary" icon="el-icon-search" @click="handleQuery"
|
|
|
- >搜索</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<!-- 操作工具栏 -->
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- plain
|
|
|
- icon="el-icon-plus"
|
|
|
- size="mini"
|
|
|
- @click="handleAdd"
|
|
|
- v-hasPermi="['backend:task-info:create']"
|
|
|
- >新增</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
|
|
+ v-hasPermi="['backend:task-info:create']">新增</el-button>
|
|
|
</el-col>
|
|
|
<!-- <el-col :span="1.5">
|
|
|
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
|
|
:loading="exportLoading" v-hasPermi="['backend:task-info:export']">导出</el-button>
|
|
|
</el-col> -->
|
|
|
- <right-toolbar
|
|
|
- :showSearch.sync="showSearch"
|
|
|
- @queryTable="getList"
|
|
|
- ></right-toolbar>
|
|
|
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
- <el-tabs
|
|
|
- type="border-card"
|
|
|
- v-model.trim="selectedTab"
|
|
|
- @tab-click="clickTab"
|
|
|
- >
|
|
|
+ <el-tabs type="border-card" v-model.trim="selectedTab" @tab-click="clickTab">
|
|
|
<el-tab-pane label="草稿箱" name="type0">
|
|
|
<!-- 列表 -->
|
|
|
- <el-table
|
|
|
- v-loading="loading"
|
|
|
- :data="list"
|
|
|
- :height="list.length ? tableHeight : 'auto'"
|
|
|
- >
|
|
|
+ <el-table v-loading="loading" :data="list" :height="list.length ? tableHeight : 'auto'">
|
|
|
<el-table-column label="ID" align="center" prop="id" />
|
|
|
<el-table-column label="任务名称" align="center">
|
|
|
<template v-slot="scope">
|
|
|
{{
|
|
|
- scope.row != null
|
|
|
- ? scope.row.taskName
|
|
|
- : ""
|
|
|
- }}</template
|
|
|
- >
|
|
|
+ scope.row.taskInfoDO != null
|
|
|
+ ? scope.row.taskInfoDO.taskName
|
|
|
+ : ""
|
|
|
+ }}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="任务类型" align="center">
|
|
|
<template v-slot="scope">
|
|
|
- <dict-tag
|
|
|
- :type="DICT_TYPE.TASK_TYPE"
|
|
|
- :value="
|
|
|
- scope.row == null
|
|
|
- ? 0
|
|
|
- : scope.row.taskType
|
|
|
- "
|
|
|
- />
|
|
|
+ <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row.taskInfoDO == null
|
|
|
+ ? 0
|
|
|
+ : scope.row.taskInfoDO.taskType
|
|
|
+ " />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="任务内容" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <div
|
|
|
- v-html="
|
|
|
- scope.row ? scope.row.taskContent : ''
|
|
|
- "
|
|
|
- ></div>
|
|
|
+ <div v-html="scope.row.taskInfoDO ? scope.row.taskInfoDO.taskContent : ''
|
|
|
+ "></div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="接收者" align="center" prop="receiverName" />
|
|
|
@@ -158,21 +99,9 @@
|
|
|
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
|
|
|
</template>
|
|
|
</el-table-column> -->
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- fixed="right"
|
|
|
- width="180"
|
|
|
- >
|
|
|
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
|
|
|
<template v-slot="scope">
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-view"
|
|
|
- @click="handleSee(scope.row)"
|
|
|
- >查看</el-button
|
|
|
- >
|
|
|
+ <el-button size="mini" type="text" icon="el-icon-view" @click="handleSee(scope.row)">查看</el-button>
|
|
|
</template>
|
|
|
<!-- <template v-slot="scope">
|
|
|
<el-button
|
|
|
@@ -243,38 +172,27 @@
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="已发布/待完成 " name="type1">
|
|
|
<!-- 列表 -->
|
|
|
- <el-table
|
|
|
- v-loading="loading"
|
|
|
- :data="list"
|
|
|
- :height="list.length ? tableHeight : 'auto'"
|
|
|
- >
|
|
|
+ <el-table v-loading="loading" :data="list" :height="list.length ? tableHeight : 'auto'">
|
|
|
<el-table-column label="ID" align="center" prop="id" />
|
|
|
<el-table-column label="任务名称" align="center">
|
|
|
<template v-slot="scope">
|
|
|
{{
|
|
|
- scope.row != null
|
|
|
- ? scope.row.taskName
|
|
|
- : ""
|
|
|
+ scope.row.taskInfoDO != null
|
|
|
+ ? scope.row.taskInfoDO.taskName
|
|
|
+ : ""
|
|
|
}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="任务类型" align="center">
|
|
|
<template v-slot="scope">
|
|
|
- <dict-tag
|
|
|
- :type="DICT_TYPE.TASK_TYPE"
|
|
|
- :value="
|
|
|
- scope.row ? scope.row.taskType : ''
|
|
|
- "
|
|
|
- />
|
|
|
+ <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row.taskInfoDO ? scope.row.taskInfoDO.taskType : ''
|
|
|
+ " />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="任务内容" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <div
|
|
|
- v-html="
|
|
|
- scope.row ? scope.row.taskContent : ''
|
|
|
- "
|
|
|
- ></div>
|
|
|
+ <div v-html="scope.row.taskInfoDO ? scope.row.taskInfoDO.taskContent : ''
|
|
|
+ "></div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="接收者" align="center" prop="receiverName" />
|
|
|
@@ -296,21 +214,9 @@
|
|
|
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
|
|
|
</template>
|
|
|
</el-table-column> -->
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- fixed="right"
|
|
|
- width="180"
|
|
|
- >
|
|
|
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
|
|
|
<template v-slot="scope">
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-view"
|
|
|
- @click="handleSee(scope.row)"
|
|
|
- >查看</el-button
|
|
|
- >
|
|
|
+ <el-button size="mini" type="text" icon="el-icon-view" @click="handleSee(scope.row)">查看</el-button>
|
|
|
<!-- <el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
@@ -354,12 +260,12 @@
|
|
|
>已分配检查项列表</el-dropdown-item
|
|
|
>
|
|
|
</el-dropdown-menu> -->
|
|
|
- <!-- 写在el-dropdown-menu 第一阶段不需要了 -->
|
|
|
- <!-- <el-dropdown-item command="handleOrg" size="mini" type="text"
|
|
|
+ <!-- 写在el-dropdown-menu 第一阶段不需要了 -->
|
|
|
+ <!-- <el-dropdown-item command="handleOrg" size="mini" type="text"
|
|
|
icon="el-icon-circle-check">分配单位</el-dropdown-item> -->
|
|
|
- <!-- <el-dropdown-item command="handleInsp" size="mini" type="text"
|
|
|
+ <!-- <el-dropdown-item command="handleInsp" size="mini" type="text"
|
|
|
icon="el-icon-circle-check">分配检查项</el-dropdown-item> -->
|
|
|
- <!-- <el-dropdown-item command="handPublish" size="mini" type="text"
|
|
|
+ <!-- <el-dropdown-item command="handPublish" size="mini" type="text"
|
|
|
icon="el-icon-circle-check">发布</el-dropdown-item> -->
|
|
|
<!-- </el-dropdown> -->
|
|
|
</template>
|
|
|
@@ -368,40 +274,29 @@
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="已完成/待审核" name="type2">
|
|
|
<!-- 列表 -->
|
|
|
- <el-table
|
|
|
- v-loading="loading"
|
|
|
- :data="list"
|
|
|
- :height="list.length ? tableHeight : 'auto'"
|
|
|
- >
|
|
|
+ <el-table v-loading="loading" :data="list" :height="list.length ? tableHeight : 'auto'">
|
|
|
<el-table-column label="ID" align="center" prop="id" />
|
|
|
<el-table-column label="任务名称" align="center">
|
|
|
<template v-slot="scope">
|
|
|
{{
|
|
|
- scope.row != null
|
|
|
- ? scope.row.taskName
|
|
|
- : ""
|
|
|
+ scope.row.taskInfoDO != null
|
|
|
+ ? scope.row.taskInfoDO.taskName
|
|
|
+ : ""
|
|
|
}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="任务类型" align="center">
|
|
|
<template v-slot="scope">
|
|
|
- <dict-tag
|
|
|
- :type="DICT_TYPE.TASK_TYPE"
|
|
|
- :value="
|
|
|
- scope.row == null
|
|
|
- ? 0
|
|
|
- : scope.row.taskType
|
|
|
- "
|
|
|
- />
|
|
|
+ <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row.taskInfoDO == null
|
|
|
+ ? 0
|
|
|
+ : scope.row.taskInfoDO.taskType
|
|
|
+ " />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="任务内容" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <div
|
|
|
- v-html="
|
|
|
- scope.row ? scope.row.taskContent : ''
|
|
|
- "
|
|
|
- ></div>
|
|
|
+ <div v-html="scope.row.taskInfoDO ? scope.row.taskInfoDO.taskContent : ''
|
|
|
+ "></div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="接收者" align="center" prop="receiverName" />
|
|
|
@@ -423,21 +318,9 @@
|
|
|
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
|
|
|
</template>
|
|
|
</el-table-column> -->
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- fixed="right"
|
|
|
- width="180"
|
|
|
- >
|
|
|
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
|
|
|
<template v-slot="scope">
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-view"
|
|
|
- @click="handleSee(scope.row)"
|
|
|
- >查看</el-button
|
|
|
- >
|
|
|
+ <el-button size="mini" type="text" icon="el-icon-view" @click="handleSee(scope.row)">查看</el-button>
|
|
|
<!-- <el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
@@ -489,40 +372,29 @@
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="已归档" name="type3">
|
|
|
<!-- 列表 -->
|
|
|
- <el-table
|
|
|
- v-loading="loading"
|
|
|
- :data="list"
|
|
|
- :height="list.length ? tableHeight : 'auto'"
|
|
|
- >
|
|
|
+ <el-table v-loading="loading" :data="list" :height="list.length ? tableHeight : 'auto'">
|
|
|
<el-table-column label="ID" align="center" prop="id" />
|
|
|
<el-table-column label="任务名称" align="center">
|
|
|
<template v-slot="scope">
|
|
|
{{
|
|
|
- scope.row != null
|
|
|
- ? scope.row.taskName
|
|
|
- : ""
|
|
|
+ scope.row.taskInfoDO != null
|
|
|
+ ? scope.row.taskInfoDO.taskName
|
|
|
+ : ""
|
|
|
}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="任务类型" align="center">
|
|
|
<template v-slot="scope">
|
|
|
- <dict-tag
|
|
|
- :type="DICT_TYPE.TASK_TYPE"
|
|
|
- :value="
|
|
|
- scope.row == null
|
|
|
- ? 0
|
|
|
- : scope.row.taskType
|
|
|
- "
|
|
|
- />
|
|
|
+ <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row.taskInfoDO == null
|
|
|
+ ? 0
|
|
|
+ : scope.row.taskInfoDO.taskType
|
|
|
+ " />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="任务内容" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <div
|
|
|
- v-html="
|
|
|
- scope.row ? scope.row.taskContent : ''
|
|
|
- "
|
|
|
- ></div>
|
|
|
+ <div v-html="scope.row.taskInfoDO ? scope.row.taskInfoDO.taskContent : ''
|
|
|
+ "></div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="接收者" align="center" prop="receiverName" />
|
|
|
@@ -544,25 +416,13 @@
|
|
|
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
|
|
|
</template>
|
|
|
</el-table-column> -->
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- fixed="right"
|
|
|
- width="180"
|
|
|
- >
|
|
|
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
|
|
|
<template v-slot="scope">
|
|
|
<!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['backend:task-info:update']">修改</el-button> -->
|
|
|
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['backend:task-info:delete']">删除</el-button> -->
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-view"
|
|
|
- @click="handleSee(scope.row)"
|
|
|
- >查看</el-button
|
|
|
- >
|
|
|
+ <el-button size="mini" type="text" icon="el-icon-view" @click="handleSee(scope.row)">查看</el-button>
|
|
|
<!-- <el-dropdown
|
|
|
@command="
|
|
|
(command) => handleCommand(command, scope.$index, scope.row)
|
|
|
@@ -600,19 +460,12 @@
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="周期性任务" name="type4">
|
|
|
<!-- 列表 -->
|
|
|
- <el-table
|
|
|
- v-loading="loading"
|
|
|
- :data="list"
|
|
|
- :height="list.length ? tableHeight : 'auto'"
|
|
|
- >
|
|
|
+ <el-table v-loading="loading" :data="list" :height="list.length ? tableHeight : 'auto'">
|
|
|
<el-table-column label="ID" align="center" prop="id" />
|
|
|
<el-table-column label="任务名称" align="center" prop="taskName" />
|
|
|
<el-table-column label="任务类型" align="center" prop="taskType">
|
|
|
<template v-slot="scope">
|
|
|
- <dict-tag
|
|
|
- :type="DICT_TYPE.TASK_TYPE"
|
|
|
- :value="scope.row.taskType"
|
|
|
- />
|
|
|
+ <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row.taskType" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="任务内容" align="center">
|
|
|
@@ -622,10 +475,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="执行状态" align="center" prop="cycleStatus">
|
|
|
<template v-slot="scope">
|
|
|
- <dict-tag
|
|
|
- :type="DICT_TYPE.INFRA_JOB_STATUS"
|
|
|
- :value="scope.row.cycleStatus"
|
|
|
- />
|
|
|
+ <dict-tag :type="DICT_TYPE.INFRA_JOB_STATUS" :value="scope.row.cycleStatus" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<!-- <el-table-column label="任务积分" align="center" prop="taskScore" /> -->
|
|
|
@@ -639,91 +489,38 @@
|
|
|
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
|
|
|
</template>
|
|
|
</el-table-column> -->
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- fixed="right"
|
|
|
- width="180"
|
|
|
- >
|
|
|
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
|
|
|
<template v-slot="scope">
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-edit"
|
|
|
- @click="handleUpdate(scope.row)"
|
|
|
- v-hasPermi="['backend:task-info:update']"
|
|
|
- >修改</el-button
|
|
|
- >
|
|
|
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
|
|
+ v-hasPermi="['backend:task-info:update']">修改</el-button>
|
|
|
<!--暂停 -->
|
|
|
- <svg-icon
|
|
|
- v-if="
|
|
|
- (scope.row.iscycle && scope.row.cycleStatus == 1) ||
|
|
|
- (scope.row.iscycle && scope.row.cycleStatus == 2)
|
|
|
- "
|
|
|
- icon-class="restore"
|
|
|
- style="font-size: 24px; cursor: pointer"
|
|
|
- @click="handleStopOrRest(scope.row, 0)"
|
|
|
- />
|
|
|
- <el-button
|
|
|
- v-if="scope.row.iscycle && scope.row.cycleStatus == 1"
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="restore"
|
|
|
- @click="handleStopOrRest(scope.row, 2)"
|
|
|
- >暂停
|
|
|
+ <svg-icon v-if="(scope.row.iscycle && scope.row.cycleStatus == 1) ||
|
|
|
+ (scope.row.iscycle && scope.row.cycleStatus == 2)
|
|
|
+ " icon-class="restore" style="font-size: 24px; cursor: pointer"
|
|
|
+ @click="handleStopOrRest(scope.row, 0)" />
|
|
|
+ <el-button v-if="scope.row.iscycle && scope.row.cycleStatus == 1" size="mini" type="text" icon="restore"
|
|
|
+ @click="handleStopOrRest(scope.row, 2)">暂停
|
|
|
</el-button>
|
|
|
<!-- 继续 -->
|
|
|
- <svg-icon
|
|
|
- v-if="scope.row.iscycle && scope.row.cycleStatus == 0"
|
|
|
- icon-class="stop"
|
|
|
- style="font-size: 24px; cursor: pointer"
|
|
|
- @click="handleStopOrRest(scope.row, 1)"
|
|
|
- />
|
|
|
- <el-button
|
|
|
- v-if="scope.row.iscycle && scope.row.cycleStatus == 2"
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- style="margin-left: 0px"
|
|
|
- @click="handleStopOrRest(scope.row, 1)"
|
|
|
- >
|
|
|
- 开始</el-button
|
|
|
- >
|
|
|
- <el-dropdown
|
|
|
- @command="
|
|
|
- (command) => handleCommand(command, scope.$index, scope.row)
|
|
|
- "
|
|
|
- >
|
|
|
- <el-button size="mini" type="text" icon="el-icon-d-arrow-right"
|
|
|
- >更多</el-button
|
|
|
- >
|
|
|
+ <svg-icon v-if="scope.row.iscycle && scope.row.cycleStatus == 0" icon-class="stop"
|
|
|
+ style="font-size: 24px; cursor: pointer" @click="handleStopOrRest(scope.row, 1)" />
|
|
|
+ <el-button v-if="scope.row.iscycle && scope.row.cycleStatus == 2" size="mini" type="text"
|
|
|
+ style="margin-left: 0px" @click="handleStopOrRest(scope.row, 1)">
|
|
|
+ 开始</el-button>
|
|
|
+ <el-dropdown @command="(command) => handleCommand(command, scope.$index, scope.row)
|
|
|
+ ">
|
|
|
+ <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
- <el-dropdown-item
|
|
|
- command="handleDelete"
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-delete"
|
|
|
- v-hasPermi="['backend:task-info:delete']"
|
|
|
- >删除</el-dropdown-item
|
|
|
- >
|
|
|
+ <el-dropdown-item command="handleDelete" size="mini" type="text" icon="el-icon-delete"
|
|
|
+ v-hasPermi="['backend:task-info:delete']">删除</el-dropdown-item>
|
|
|
<!-- <el-dropdown-item command="handleSelectedOrg" size="mini" type="text"
|
|
|
icon="el-icon-circle-check">已分配单位列表</el-dropdown-item>
|
|
|
<el-dropdown-item command="handleOrg" size="mini" type="text"
|
|
|
icon="el-icon-circle-check">分配单位</el-dropdown-item> -->
|
|
|
- <el-dropdown-item
|
|
|
- command="handleSelectedInsp"
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-circle-check"
|
|
|
- >已分配检查项列表</el-dropdown-item
|
|
|
- >
|
|
|
- <el-dropdown-item
|
|
|
- command="handleInsp"
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-circle-check"
|
|
|
- >分配检查项</el-dropdown-item
|
|
|
- >
|
|
|
+ <el-dropdown-item command="handleSelectedInsp" size="mini" type="text"
|
|
|
+ icon="el-icon-circle-check">已分配检查项列表</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="handleInsp" size="mini" type="text"
|
|
|
+ icon="el-icon-circle-check">分配检查项</el-dropdown-item>
|
|
|
<!-- <el-dropdown-item command="handPublishCycleTask" size="mini" type="text"
|
|
|
icon="el-icon-circle-check">发布</el-dropdown-item> -->
|
|
|
</el-dropdown-menu>
|
|
|
@@ -734,56 +531,23 @@
|
|
|
</el-tab-pane>
|
|
|
</el-tabs>
|
|
|
<!-- 分页组件 -->
|
|
|
- <pagination
|
|
|
- v-show="total > 0"
|
|
|
- :total="total"
|
|
|
- :page.sync="queryParams.pageNo"
|
|
|
- :limit.sync="queryParams.pageSize"
|
|
|
- @pagination="getList"
|
|
|
- />
|
|
|
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
|
|
|
+ @pagination="getList" />
|
|
|
<!-- 对话框(添加 / 修改) -->
|
|
|
- <el-dialog
|
|
|
- :title="title"
|
|
|
- :visible.sync="open"
|
|
|
- width="800px"
|
|
|
- v-dialogDrag
|
|
|
- append-to-body
|
|
|
- >
|
|
|
+ <el-dialog :title="title" :visible.sync="open" width="800px" v-dialogDrag append-to-body>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
|
|
<el-form-item label="任务名称" prop="taskName">
|
|
|
<el-input v-model="form.taskName" placeholder="请输入任务名称" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="任务类型" prop="taskType">
|
|
|
- <el-select
|
|
|
- v-model="form.taskType"
|
|
|
- placeholder="请选择任务类型"
|
|
|
- style="width: 100%"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in this.filteredData"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
+ <el-select v-model="form.taskType" placeholder="请选择任务类型" style="width: 100%">
|
|
|
+ <el-option v-for="dict in this.filteredData" :key="dict.value" :label="dict.label" :value="dict.value" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="单位类别"
|
|
|
- prop="orgTypes"
|
|
|
- v-if="form.taskType == 3 || form.taskType == 8"
|
|
|
- >
|
|
|
- <el-select
|
|
|
- v-model="form.orgTypes"
|
|
|
- multiple
|
|
|
- placeholder="请选择单位类别"
|
|
|
- style="width: 100%"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in this.getDictDatas(DICT_TYPE.BACKEND_ORG_TYPE)"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
+ <el-form-item label="单位类别" prop="orgTypes" v-if="form.taskType == 3 || form.taskType == 8">
|
|
|
+ <el-select v-model="form.orgTypes" multiple placeholder="请选择单位类别" style="width: 100%">
|
|
|
+ <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BACKEND_ORG_TYPE)" :key="dict.value" :label="dict.label"
|
|
|
+ :value="dict.value" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="任务内容">
|
|
|
@@ -806,37 +570,17 @@
|
|
|
<!-- <el-form-item label="任务积分" prop="taskScore">
|
|
|
<el-input v-model="form.taskScore" placeholder="请输入任务积分" />
|
|
|
</el-form-item> -->
|
|
|
- <el-form-item
|
|
|
- label="任务周期"
|
|
|
- prop="inspectFrequency"
|
|
|
- v-if="form.taskType == 3 || form.taskType == 8"
|
|
|
- >
|
|
|
- <el-select
|
|
|
- v-model="form.inspectFrequency"
|
|
|
- placeholder="请选择任务周期"
|
|
|
- style="width: 100%"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in this.getDictDatas(DICT_TYPE.CHECK_FRE)"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
+ <el-form-item label="任务周期" prop="inspectFrequency" v-if="form.taskType == 3 || form.taskType == 8">
|
|
|
+ <el-select v-model="form.inspectFrequency" placeholder="请选择任务周期" style="width: 100%">
|
|
|
+ <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CHECK_FRE)" :key="dict.value" :label="dict.label"
|
|
|
+ :value="dict.value" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="持续时间" prop="time" v-if="form.time">
|
|
|
- <el-date-picker
|
|
|
- clearable
|
|
|
- v-model="form.time"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- type="daterange"
|
|
|
- range-separator="-"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
- :default-time="['00:00:00', '23:59:59']"
|
|
|
- placeholder="请选择任务持续时间"
|
|
|
- />
|
|
|
+ <el-date-picker clearable v-model="form.time" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
|
|
|
+ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"
|
|
|
+ placeholder="请选择任务持续时间" />
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="状态" prop="status">
|
|
|
<el-radio-group v-model="form.status" style="width: 100%">
|
|
|
@@ -878,90 +622,37 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 分配分管单位 -->
|
|
|
- <el-dialog
|
|
|
- title="分配分管单位"
|
|
|
- :visible.sync="openOrg"
|
|
|
- width="85vw"
|
|
|
- append-to-body
|
|
|
- v-if="openOrg"
|
|
|
- >
|
|
|
- <choiceSelect
|
|
|
- ref="choiceSelect"
|
|
|
- :userId="form.id"
|
|
|
- :type="'tackinfo'"
|
|
|
- ></choiceSelect>
|
|
|
+ <el-dialog title="分配分管单位" :visible.sync="openOrg" width="85vw" append-to-body v-if="openOrg">
|
|
|
+ <choiceSelect ref="choiceSelect" :userId="form.id" :type="'tackinfo'"></choiceSelect>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="submitOrg">确 定</el-button>
|
|
|
<el-button @click="cancelOrg">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 分配检查项 -->
|
|
|
- <el-dialog
|
|
|
- title="分配检查项"
|
|
|
- :visible.sync="openinsp"
|
|
|
- width="85vw"
|
|
|
- append-to-body
|
|
|
- v-if="openinsp"
|
|
|
- >
|
|
|
- <choiceTreeSelect
|
|
|
- ref="choiceTreeSelect"
|
|
|
- :userId="form.id"
|
|
|
- ></choiceTreeSelect>
|
|
|
+ <el-dialog title="分配检查项" :visible.sync="openinsp" width="85vw" append-to-body v-if="openinsp">
|
|
|
+ <choiceTreeSelect ref="choiceTreeSelect" :userId="form.id"></choiceTreeSelect>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="submitinsp">确 定</el-button>
|
|
|
<el-button @click="cancelinsp">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 已选择分管单位 -->
|
|
|
- <el-dialog
|
|
|
- title="已选择分管单位"
|
|
|
- :visible.sync="openSelectedOrg"
|
|
|
- width="85vw"
|
|
|
- append-to-body
|
|
|
- v-if="openSelectedOrg"
|
|
|
- >
|
|
|
- <handleSelectedOrg
|
|
|
- ref="handleSelectedOrg"
|
|
|
- :userId="form.id"
|
|
|
- :type="'tackinfo'"
|
|
|
- ></handleSelectedOrg>
|
|
|
+ <el-dialog title="已选择分管单位" :visible.sync="openSelectedOrg" width="85vw" append-to-body v-if="openSelectedOrg">
|
|
|
+ <handleSelectedOrg ref="handleSelectedOrg" :userId="form.id" :type="'tackinfo'"></handleSelectedOrg>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="openSelectedOrg = false"
|
|
|
- >关 闭</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" @click="openSelectedOrg = false">关 闭</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 已选择检查项 -->
|
|
|
- <el-dialog
|
|
|
- title="已选择检查项"
|
|
|
- :visible.sync="openSelectedInsp"
|
|
|
- width="85vw"
|
|
|
- append-to-body
|
|
|
- v-if="openSelectedInsp"
|
|
|
- >
|
|
|
- <handleSelectedInsp
|
|
|
- ref="handleSelectedInsp"
|
|
|
- :userId="form.id"
|
|
|
- :type="'tackinfo'"
|
|
|
- ></handleSelectedInsp>
|
|
|
+ <el-dialog title="已选择检查项" :visible.sync="openSelectedInsp" width="85vw" append-to-body v-if="openSelectedInsp">
|
|
|
+ <handleSelectedInsp ref="handleSelectedInsp" :userId="form.id" :type="'tackinfo'"></handleSelectedInsp>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="openSelectedInsp = false"
|
|
|
- >关 闭</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" @click="openSelectedInsp = false">关 闭</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
- <el-dialog
|
|
|
- title="详细信息查看"
|
|
|
- :visible.sync="openSeedialog"
|
|
|
- width="85vw"
|
|
|
- class="detail"
|
|
|
- >
|
|
|
- <el-form
|
|
|
- ref="form"
|
|
|
- :model="deatilData"
|
|
|
- label-width="auto"
|
|
|
- label-position="left"
|
|
|
- >
|
|
|
+ <el-dialog title="详细信息查看" :visible.sync="openSeedialog" width="85vw" class="detail">
|
|
|
+ <el-form ref="form" :model="deatilData" label-width="auto" label-position="left">
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="任务名称:">
|
|
|
@@ -970,16 +661,11 @@
|
|
|
deatilData ? deatilData.taskName : ""
|
|
|
}}
|
|
|
</div>
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ </el-form-item></el-col>
|
|
|
<el-col :span="14">
|
|
|
<el-form-item label="任务类型:">
|
|
|
- <dict-tag
|
|
|
- :type="DICT_TYPE.TASK_STATUS"
|
|
|
- :value="
|
|
|
- deatilData ? deatilData.taskType : ''
|
|
|
- "
|
|
|
- />
|
|
|
+ <dict-tag :type="DICT_TYPE.TASK_STATUS" :value="deatilData.taskInfoDO ? deatilData.taskInfoDO.taskType : ''
|
|
|
+ " />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -991,8 +677,7 @@
|
|
|
deatilData ? deatilData.taskContent : ""
|
|
|
}}
|
|
|
</div>
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ </el-form-item></el-col>
|
|
|
<el-col :span="14">
|
|
|
<el-form-item label="接收者:">
|
|
|
<div>{{ deatilData.receiverName }}</div>
|
|
|
@@ -1003,8 +688,7 @@
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="发布者:">
|
|
|
<div>{{ deatilData.senderName }}</div>
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ </el-form-item></el-col>
|
|
|
<el-col :span="14">
|
|
|
<el-form-item label="单位:">
|
|
|
<div>{{ deatilData.orgName }}</div>
|
|
|
@@ -1015,20 +699,17 @@
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="接收时间:">
|
|
|
<div>{{ parseTime(deatilData.receiveTime) }}</div>
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ </el-form-item></el-col>
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="完成时间:">
|
|
|
<div>{{ parseTime(deatilData.finishTime) }}</div>
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ </el-form-item></el-col>
|
|
|
</el-row>
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="10" v-if="this.deatilData">
|
|
|
<el-form-item label="附件:" v-if="this.deatilData.attId">
|
|
|
<div @click="fujian" style="color: #204f7f">点击下载</div>
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ </el-form-item></el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
@@ -1161,7 +842,7 @@ export default {
|
|
|
deatilData: {},
|
|
|
};
|
|
|
},
|
|
|
- created() {},
|
|
|
+ created() { },
|
|
|
mounted() {
|
|
|
this.filteredData = this.getDictDatas(DICT_TYPE.TASK_TYPE).filter(
|
|
|
({ label }) => label === "周期性检查" || label === "临时性任务"
|
|
|
@@ -1378,6 +1059,14 @@ export default {
|
|
|
handleQuery() {
|
|
|
this.queryParams.pageNo = 1;
|
|
|
this.getList();
|
|
|
+ getNoPeriodicityPage({taskName:this.queryParams.taskName,taskStatus:this.queryParams.taskStatus,taskType:this.queryParams.taskType,pageNo:1,pageSize:10}).then(res=>{
|
|
|
+ console.log(res,'sss');
|
|
|
+ this.list = res.data.list
|
|
|
+ })
|
|
|
+ // getTaskInfoPage({ taskType: this.queryParams.taskType, taskStatus: this.queryParams?this.queryParams.taskStatus:0, taskName: this.queryParams?this.queryParams.taskName, pageNo: 1, pageSize: 10 }).then(res => {
|
|
|
+ // this.list = res.data.list;
|
|
|
+ // this.total = res.data.total;
|
|
|
+ // })
|
|
|
},
|
|
|
/** 重置按钮操作 */
|
|
|
resetQuery() {
|
|
|
@@ -1449,7 +1138,7 @@ export default {
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
})
|
|
|
- .catch((err) => {});
|
|
|
+ .catch((err) => { });
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
@@ -1463,8 +1152,8 @@ export default {
|
|
|
row != null
|
|
|
? row.taskName
|
|
|
: row.taskName
|
|
|
- ? row.taskName
|
|
|
- : "";
|
|
|
+ ? row.taskName
|
|
|
+ : "";
|
|
|
this.$modal
|
|
|
.confirm('是否确认删除名称为"' + name + '"的数据项?')
|
|
|
.then(function () {
|
|
|
@@ -1478,7 +1167,7 @@ export default {
|
|
|
this.$modal.msgSuccess("删除成功");
|
|
|
this.getList();
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => { });
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
@@ -1497,7 +1186,7 @@ export default {
|
|
|
this.$download.excel(response.data, "任务分配列表.xls");
|
|
|
this.exportLoading = false;
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => { });
|
|
|
},
|
|
|
|
|
|
// ========单位信息==============================================================
|
|
|
@@ -1540,7 +1229,7 @@ export default {
|
|
|
* 选单位
|
|
|
*/
|
|
|
// ==========表单添加时选单位================================================
|
|
|
- handleClear() {},
|
|
|
+ handleClear() { },
|
|
|
handleFocus() {
|
|
|
this.handleChoice();
|
|
|
},
|
|
|
@@ -1695,6 +1384,12 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
+ typeChange(e){
|
|
|
+ getTaskInfoPage({pageNo:1,pageSize:10,taskType:e,taskStatus:this.queryParams.taskStatus}).then(res=>{
|
|
|
+ console.log(res,'...');
|
|
|
+ })
|
|
|
+ // console.log(e,'s');
|
|
|
+ }
|
|
|
},
|
|
|
};
|
|
|
</script>
|
“yueshang”