|
|
|
|
@ -6,8 +6,22 @@ |
|
|
|
|
<a-row :gutter="24"> |
|
|
|
|
|
|
|
|
|
<a-col :md="6" :sm="12"> |
|
|
|
|
<a-form-item label="任务名称"> |
|
|
|
|
<j-input placeholder="" v-model="queryParam.functionTemplateName"></j-input> |
|
|
|
|
<a-form-item label="项目"> |
|
|
|
|
<!-- <j-input placeholder="" v-model="queryParam.projectId"></j-input>--> |
|
|
|
|
<j-dict-select-tag v-model="queryParam.projectId" placeholder="请选择项目" dict-code="projectx,project_name,id" |
|
|
|
|
style="width: 100%"></j-dict-select-tag> |
|
|
|
|
</a-form-item> |
|
|
|
|
</a-col> |
|
|
|
|
<a-col :md="6" :sm="12"> |
|
|
|
|
<a-form-item label="模块"> |
|
|
|
|
<!-- <j-input placeholder="" v-model="queryParam.moduleId"></j-input>--> |
|
|
|
|
<j-dict-select-tag v-model="queryParam.moduleId" placeholder="请选择模块" dict-code="modulex,module_name,id" |
|
|
|
|
style="width: 100%"></j-dict-select-tag> |
|
|
|
|
</a-form-item> |
|
|
|
|
</a-col> |
|
|
|
|
<a-col :md="6" :sm="12"> |
|
|
|
|
<a-form-item label="类型名称"> |
|
|
|
|
<j-input placeholder="" v-model="queryParam.typeName"></j-input> |
|
|
|
|
</a-form-item> |
|
|
|
|
</a-col> |
|
|
|
|
|
|
|
|
|
@ -27,31 +41,23 @@ |
|
|
|
|
<div class="table-operator"> |
|
|
|
|
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> |
|
|
|
|
<a-button type="primary" icon="download" @click="handleExportXls('任务管理')">导出</a-button> |
|
|
|
|
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" |
|
|
|
|
@change="handleImportExcel"> |
|
|
|
|
<a-button type="primary" icon="import">导入</a-button> |
|
|
|
|
</a-upload> |
|
|
|
|
<!-- 高级查询区域 --> |
|
|
|
|
<j-super-query :fieldList="superFieldList" ref="superQueryModal" |
|
|
|
|
@handleSuperQuery="handleSuperQuery"></j-super-query> |
|
|
|
|
<a-dropdown v-if="selectedRowKeys.length > 0"> |
|
|
|
|
<a-menu slot="overlay"> |
|
|
|
|
<a-menu-item key="1" @click="batchDel"> |
|
|
|
|
<a-icon type="delete"/> |
|
|
|
|
删除 |
|
|
|
|
</a-menu-item> |
|
|
|
|
</a-menu> |
|
|
|
|
<a-button style="margin-left: 8px"> 批量操作 |
|
|
|
|
<a-icon type="down"/> |
|
|
|
|
</a-button> |
|
|
|
|
</a-dropdown> |
|
|
|
|
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> |
|
|
|
|
<!-- <a-button type="primary" icon="import">导入</a-button>--> |
|
|
|
|
<!-- </a-upload>--> |
|
|
|
|
<!-- <!– 高级查询区域 –>--> |
|
|
|
|
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> |
|
|
|
|
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">--> |
|
|
|
|
<!-- <a-menu slot="overlay">--> |
|
|
|
|
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>--> |
|
|
|
|
<!-- </a-menu>--> |
|
|
|
|
<!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>--> |
|
|
|
|
<!-- </a-dropdown>--> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<!-- table区域-begin --> |
|
|
|
|
<div> |
|
|
|
|
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> |
|
|
|
|
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a |
|
|
|
|
style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 |
|
|
|
|
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 |
|
|
|
|
<a style="margin-left: 24px" @click="onClearSelected">清空</a> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
@ -69,97 +75,68 @@ |
|
|
|
|
class="j-table-force-nowrap" |
|
|
|
|
@change="handleTableChange"> |
|
|
|
|
|
|
|
|
|
<template slot="htmlSlot" slot-scope="text"> |
|
|
|
|
<div v-html="text"></div> |
|
|
|
|
</template> |
|
|
|
|
<template slot="imgSlot" slot-scope="text"> |
|
|
|
|
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> |
|
|
|
|
<img v-else :src="getImgView(text)" height="25px" alt="" |
|
|
|
|
style="max-width:80px;font-size: 12px;font-style: italic;"/> |
|
|
|
|
</template> |
|
|
|
|
<template slot="fileSlot" slot-scope="text"> |
|
|
|
|
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> |
|
|
|
|
<a-button |
|
|
|
|
v-else |
|
|
|
|
:ghost="true" |
|
|
|
|
type="primary" |
|
|
|
|
icon="download" |
|
|
|
|
size="small" |
|
|
|
|
@click="downloadFile(text)"> |
|
|
|
|
下载 |
|
|
|
|
</a-button> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!--功能 开发者--> |
|
|
|
|
<!--这里只能用v-else-if / v-else 不能用v-if 用了没效果 原因不清楚 v-if="userRole1 === '1'"--> |
|
|
|
|
<span slot="actionManage" slot-scope="text, record" v-if="userRole1 === '1'"> |
|
|
|
|
|
|
|
|
|
<a @click="fabu(record)">发布</a> |
|
|
|
|
<a-divider type="vertical"/> |
|
|
|
|
|
|
|
|
|
<a @click="kaishi(record)">开始</a> |
|
|
|
|
<a-divider type="vertical"/> |
|
|
|
|
|
|
|
|
|
<a @click="tijiao(record)">提交</a> |
|
|
|
|
|
|
|
|
|
</span> |
|
|
|
|
|
|
|
|
|
<!--功能 管理员--> |
|
|
|
|
<span slot="actionManage" slot-scope="text, record" v-else-if="userRole1=== '2'"> |
|
|
|
|
|
|
|
|
|
<a @click="chehui(record)">撤回</a> |
|
|
|
|
<a-divider type="vertical"/> |
|
|
|
|
|
|
|
|
|
<a @click="bugfankui(record)">反馈</a> |
|
|
|
|
<a-divider type="vertical"/> |
|
|
|
|
|
|
|
|
|
<a @click="shenhe(record)">审核</a> |
|
|
|
|
</span> |
|
|
|
|
<!-- <template slot="htmlSlot" slot-scope="text">--> |
|
|
|
|
<!-- <div v-html="text"></div>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
<!-- <template slot="imgSlot" slot-scope="text">--> |
|
|
|
|
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>--> |
|
|
|
|
<!-- <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
<!-- <template slot="fileSlot" slot-scope="text">--> |
|
|
|
|
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>--> |
|
|
|
|
<!-- <a-button--> |
|
|
|
|
<!-- v-else--> |
|
|
|
|
<!-- :ghost="true"--> |
|
|
|
|
<!-- type="primary"--> |
|
|
|
|
<!-- icon="download"--> |
|
|
|
|
<!-- size="small"--> |
|
|
|
|
<!-- @click="downloadFile(text)">--> |
|
|
|
|
<!-- 下载--> |
|
|
|
|
<!-- </a-button>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
|
|
|
|
|
<span slot="action" slot-scope="text, record"> |
|
|
|
|
|
|
|
|
|
<a @click="handleEdit(record)">编辑</a> |
|
|
|
|
<a-divider type="vertical"/> |
|
|
|
|
|
|
|
|
|
<a @click="handleDetail(record)">详情</a> |
|
|
|
|
<a-divider type="vertical" /> |
|
|
|
|
|
|
|
|
|
<a-dropdown> |
|
|
|
|
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a> |
|
|
|
|
<a-menu slot="overlay"> |
|
|
|
|
<a-menu-item> |
|
|
|
|
<a @click="handleDetail(record)">详情</a> |
|
|
|
|
</a-menu-item> |
|
|
|
|
<a-menu-item> |
|
|
|
|
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
|
|
|
|
<a>删除</a> |
|
|
|
|
</a-popconfirm> |
|
|
|
|
|
|
|
|
|
</a-menu-item> |
|
|
|
|
</a-menu> |
|
|
|
|
</a-dropdown> |
|
|
|
|
</span> |
|
|
|
|
|
|
|
|
|
</a-table> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<task-modal ref="modalForm" @ok="modalFormOk"></task-modal> |
|
|
|
|
<bugx-modal ref="BugxModal"></bugx-modal> |
|
|
|
|
</a-card> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
|
|
|
|
|
import '@assets/less/TableExpand.less' |
|
|
|
|
import '@/assets/less/TableExpand.less' |
|
|
|
|
import { mixinDevice } from '@/utils/mixin' |
|
|
|
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
|
|
|
|
import TaskModal from './modules/TaskModal' |
|
|
|
|
import {getAction} from "@api/manage"; |
|
|
|
|
import store from "@/store"; |
|
|
|
|
import BugxModal from "@views/task/modules/BugxModal"; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
name: 'TaskList', |
|
|
|
|
mixins:[JeecgListMixin, mixinDevice], |
|
|
|
|
components: { |
|
|
|
|
BugxModal, |
|
|
|
|
TaskModal |
|
|
|
|
}, |
|
|
|
|
data () { |
|
|
|
|
return { |
|
|
|
|
description: '任务管理管理页面', |
|
|
|
|
userRole1: '', //开发者是1 其他是2 |
|
|
|
|
// 表头 |
|
|
|
|
columns: [ |
|
|
|
|
{ |
|
|
|
|
@ -175,17 +152,53 @@ export default { |
|
|
|
|
{ |
|
|
|
|
title:'中文名称', |
|
|
|
|
align:"center", |
|
|
|
|
dataIndex: 'functionTemplateName' |
|
|
|
|
dataIndex: 'taskName' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title:'任务层级', |
|
|
|
|
align:"center", |
|
|
|
|
dataIndex: 'level' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title:'任务类型', |
|
|
|
|
align:"center", |
|
|
|
|
dataIndex: 'typeId_dictText' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: '责任人', |
|
|
|
|
title:'关联', |
|
|
|
|
align:"center", |
|
|
|
|
dataIndex: 'managerUsers_dictText', |
|
|
|
|
dataIndex: 'union' |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// title:'项目', |
|
|
|
|
// align:"center", |
|
|
|
|
// dataIndex: 'projectId' |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// title:'模块', |
|
|
|
|
// align:"center", |
|
|
|
|
// dataIndex: 'moduleId' |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// title:'功能', |
|
|
|
|
// align:"center", |
|
|
|
|
// dataIndex: 'functionId' |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// title:'规则id', |
|
|
|
|
// align:"center", |
|
|
|
|
// dataIndex: 'ruleId' |
|
|
|
|
// }, |
|
|
|
|
|
|
|
|
|
// { |
|
|
|
|
// title:'责任人', |
|
|
|
|
// align:"center", |
|
|
|
|
// dataIndex: 'managerUsers' |
|
|
|
|
// }, |
|
|
|
|
{ |
|
|
|
|
title:'任务等级', |
|
|
|
|
align:"center", |
|
|
|
|
dataIndex: 'workLevel_dictText' |
|
|
|
|
dataIndex: 'workLevel' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title:'任务状态', |
|
|
|
|
@ -209,23 +222,41 @@ export default { |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: '任务时长', |
|
|
|
|
title:'预计结束时间', |
|
|
|
|
align:"center", |
|
|
|
|
dataIndex: 'duration' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: '创建时间', |
|
|
|
|
align: "center", |
|
|
|
|
dataIndex: 'createTime' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: '管理', |
|
|
|
|
dataIndex: 'actionManage', |
|
|
|
|
align: "center", |
|
|
|
|
fixed: "right", |
|
|
|
|
width: 147, |
|
|
|
|
scopedSlots: {customRender: 'actionManage'}, |
|
|
|
|
dataIndex: 'expectedEndTime', |
|
|
|
|
customRender:function (text) { |
|
|
|
|
return !text?"":(text.length>10?text.substr(0,10):text) |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// title:'预计任务时长', |
|
|
|
|
// align:"center", |
|
|
|
|
// dataIndex: 'expectedDuration' |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// title:'提交时间', |
|
|
|
|
// align:"center", |
|
|
|
|
// dataIndex: 'submitTime', |
|
|
|
|
// customRender:function (text) { |
|
|
|
|
// return !text?"":(text.length>10?text.substr(0,10):text) |
|
|
|
|
// } |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// title:'实际任务时长', |
|
|
|
|
// align:"center", |
|
|
|
|
// dataIndex: 'realDuration' |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// title:'项目描述', |
|
|
|
|
// align:"center", |
|
|
|
|
// dataIndex: 'taskDescribe' |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// title:'项目图片', |
|
|
|
|
// align:"center", |
|
|
|
|
// dataIndex: 'taskPic' |
|
|
|
|
// }, |
|
|
|
|
{ |
|
|
|
|
title: '操作', |
|
|
|
|
dataIndex: 'action', |
|
|
|
|
@ -240,7 +271,6 @@ export default { |
|
|
|
|
delete: "/task/task/delete", |
|
|
|
|
deleteBatch: "/task/task/deleteBatch", |
|
|
|
|
exportXlsUrl: "/task/task/exportXls", |
|
|
|
|
importExcelUrl: "task/task/importExcel", |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
dictOptions:{}, |
|
|
|
|
@ -248,9 +278,6 @@ export default { |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
created() { |
|
|
|
|
let usercode = store.getters.userInfo.id |
|
|
|
|
//根据id获得当前登录用户角色 |
|
|
|
|
this.loginRole(usercode) |
|
|
|
|
this.getSuperFieldList(); |
|
|
|
|
}, |
|
|
|
|
computed: { |
|
|
|
|
@ -259,90 +286,30 @@ export default { |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
loginRole(id) { |
|
|
|
|
getAction('functionx/functionx/loginrole', {id: id}).then((res) => { |
|
|
|
|
if (res.success) { |
|
|
|
|
//重新计算分页问题 |
|
|
|
|
this.userRole1 = res.result; |
|
|
|
|
// console.log('this.userRole1',this.userRole1) |
|
|
|
|
//console.log('this.userRole1',this.userRole1) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
shenhe(record) { |
|
|
|
|
getAction('/task/task/shenhe', {id: record.id}).then((res) => { |
|
|
|
|
if (res.success) { |
|
|
|
|
//重新计算分页问题 |
|
|
|
|
this.$message.success(res.result); |
|
|
|
|
this.loadData(); |
|
|
|
|
} else { |
|
|
|
|
this.$message.warning(res.message); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
bugfankui: function (record) { |
|
|
|
|
console.log('aaaaaaaaaaaa bugfankui bugfankui bugfankui'); |
|
|
|
|
this.$refs.BugxModal.add(); |
|
|
|
|
this.$refs.BugxModal.title = "BUG反馈"; |
|
|
|
|
this.$refs.BugxModal.disableSubmit = false; |
|
|
|
|
}, |
|
|
|
|
chehui(record) { |
|
|
|
|
getAction('/task/task/chehui', {id: record.id}).then((res) => { |
|
|
|
|
if (res.success) { |
|
|
|
|
//重新计算分页问题 |
|
|
|
|
this.$message.success(res.result); |
|
|
|
|
this.loadData(); |
|
|
|
|
} else { |
|
|
|
|
this.$message.warning(res.message); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
tijiao(record) { |
|
|
|
|
getAction('/task/task/tijiao', {id: record.id}).then((res) => { |
|
|
|
|
if (res.success) { |
|
|
|
|
//重新计算分页问题 |
|
|
|
|
this.$message.success(res.result); |
|
|
|
|
this.loadData(); |
|
|
|
|
} else { |
|
|
|
|
this.$message.warning(res.message); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
kaishi(record) { |
|
|
|
|
getAction('/task/task/kaishi', {id: record.id}).then((res) => { |
|
|
|
|
if (res.success) { |
|
|
|
|
//重新计算分页问题 |
|
|
|
|
this.$message.success(res.result); |
|
|
|
|
this.loadData(); |
|
|
|
|
} else { |
|
|
|
|
this.$message.warning(res.message); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
fabu(record) { |
|
|
|
|
getAction('/task/task/fabu', {id: record.id}).then((res) => { |
|
|
|
|
if (res.success) { |
|
|
|
|
//重新计算分页问题 |
|
|
|
|
this.$message.success(res.result); |
|
|
|
|
this.loadData(); |
|
|
|
|
} else { |
|
|
|
|
this.$message.warning(res.message); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
initDictConfig() { |
|
|
|
|
}, |
|
|
|
|
getSuperFieldList() { |
|
|
|
|
let fieldList = []; |
|
|
|
|
fieldList.push({type: 'string', value: 'functionTemplateName', text: '中文名称', dictCode: ''}) |
|
|
|
|
fieldList.push({type: 'string', value: 'managerUsers', text: '责任人', dictCode: ''}) |
|
|
|
|
fieldList.push({type: 'int', value: 'workLevel', text: '任务等级', dictCode: ''}) |
|
|
|
|
fieldList.push({type: 'int', value: 'workStatus', text: '任务状态', dictCode: ''}) |
|
|
|
|
fieldList.push({type: 'date', value: 'publishTime', text: '发布时间'}) |
|
|
|
|
fieldList.push({type: 'date', value: 'startTime', text: '开始时间'}) |
|
|
|
|
fieldList.push({type: 'string', value: 'duration', text: '任务时长', dictCode: ''}) |
|
|
|
|
this.superFieldList = fieldList |
|
|
|
|
} |
|
|
|
|
// initDictConfig(){ |
|
|
|
|
// }, |
|
|
|
|
// getSuperFieldList(){ |
|
|
|
|
// let fieldList=[]; |
|
|
|
|
// fieldList.push({type:'string',value:'taskName',text:'中文名称',dictCode:''}) |
|
|
|
|
// fieldList.push({type:'int',value:'level',text:'任务层级',dictCode:''}) |
|
|
|
|
// fieldList.push({type:'string',value:'projectId',text:'项目id',dictCode:''}) |
|
|
|
|
// fieldList.push({type:'string',value:'moduleId',text:'模块id',dictCode:''}) |
|
|
|
|
// fieldList.push({type:'string',value:'functionId',text:'功能id',dictCode:''}) |
|
|
|
|
// fieldList.push({type:'string',value:'ruleId',text:'规则id',dictCode:''}) |
|
|
|
|
// fieldList.push({type:'string',value:'typeId',text:'任务类型id',dictCode:''}) |
|
|
|
|
// fieldList.push({type:'string',value:'managerUsers',text:'责任人',dictCode:''}) |
|
|
|
|
// fieldList.push({type:'int',value:'workLevel',text:'任务等级',dictCode:''}) |
|
|
|
|
// fieldList.push({type:'int',value:'workStatus',text:'任务状态',dictCode:''}) |
|
|
|
|
// fieldList.push({type:'date',value:'publishTime',text:'发布时间'}) |
|
|
|
|
// fieldList.push({type:'date',value:'startTime',text:'开始时间'}) |
|
|
|
|
// fieldList.push({type:'date',value:'expectedEndTime',text:'预计结束时间'}) |
|
|
|
|
// fieldList.push({type:'double',value:'expectedDuration',text:'预计任务时长',dictCode:''}) |
|
|
|
|
// fieldList.push({type:'date',value:'submitTime',text:'提交时间'}) |
|
|
|
|
// fieldList.push({type:'double',value:'realDuration',text:'实际任务时长',dictCode:''}) |
|
|
|
|
// fieldList.push({type:'Text',value:'taskDescribe',text:'项目描述',dictCode:''}) |
|
|
|
|
// fieldList.push({type:'Text',value:'taskPic',text:'项目图片',dictCode:''}) |
|
|
|
|
// this.superFieldList = fieldList |
|
|
|
|
// } |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
</script> |
|
|
|
|
|
zhc077
2 years ago