diff --git a/src/api/taskmanage/tasklist.js b/src/api/taskmanage/tasklist.js index 07688f8..b135e12 100644 --- a/src/api/taskmanage/tasklist.js +++ b/src/api/taskmanage/tasklist.js @@ -4,6 +4,7 @@ import { createAPI } from "@/utils/httpRequest.js"; // 获取列表 export const getTaskList = data => createAPI(`taskmanage/tasklist/list`, 'post', data); + // 看板列表 export const getTaskListReport = data => createAPI(`taskmanage/tasklist/getTaskListReport`, 'post', data); @@ -14,3 +15,11 @@ export const saveBatchTaskList = data => createAPI(`taskmanage/tasklist/saveBatc export const updateTask = data => createAPI(`taskmanage/tasklist/update`, 'post', data); +// 任务分配明细 +export const getTaskDetailList = data => createAPI(`taskmanage/taskDetail/taskDetailList`, 'post', data); + +// 删除任务明细 +export const removerDetail = data => createAPI(`taskmanage/taskDetail/delete`, 'post', data); + + + diff --git a/src/views/modules/taskmanage/alltasklist.vue b/src/views/modules/taskmanage/alltasklist.vue new file mode 100644 index 0000000..00c874e --- /dev/null +++ b/src/views/modules/taskmanage/alltasklist.vue @@ -0,0 +1,534 @@ + + + + diff --git a/src/views/modules/taskmanage/mysendtasklist.vue b/src/views/modules/taskmanage/mysendtasklist.vue new file mode 100644 index 0000000..9f31768 --- /dev/null +++ b/src/views/modules/taskmanage/mysendtasklist.vue @@ -0,0 +1,560 @@ + + + + diff --git a/src/views/modules/taskmanage/mytasklist.vue b/src/views/modules/taskmanage/mytasklist.vue index 97b6974..75f7e07 100644 --- a/src/views/modules/taskmanage/mytasklist.vue +++ b/src/views/modules/taskmanage/mytasklist.vue @@ -3,6 +3,15 @@ 查询 + + {{ '导出' }} + @@ -13,8 +22,16 @@ - - + + + + + + + + + + - - - - - - - - - - - - - - - @@ -130,7 +133,7 @@ diff --git a/src/views/modules/taskmanage/tasklist-add-or-update.vue b/src/views/modules/taskmanage/tasklist-add-or-update.vue index 3dd72cc..38271eb 100644 --- a/src/views/modules/taskmanage/tasklist-add-or-update.vue +++ b/src/views/modules/taskmanage/tasklist-add-or-update.vue @@ -9,7 +9,7 @@ label-width="80px"> - + - + 责任人 import {getUserList} from '@/api/taskmanage/users.js' - import {saveBatchTaskList} from '@/api/taskmanage/tasklist.js' + import {saveBatchTaskList, updateTask} from '@/api/taskmanage/tasklist.js' export default { data() { @@ -175,19 +175,19 @@ }, dataRule: { project: [ - {required: true, message: '项目不能为空', trigger: 'blur'} + {required: true, message: ' ', trigger: 'blur'} ], customer: [ - {required: true, message: '客户不能为空', trigger: 'blur'} + {required: true, message: ' ', trigger: 'blur'} ], taskHeader: [ - {required: true, message: '任务主题不能为空', trigger: 'blur'} + {required: true, message: ' ', trigger: 'blur'} ], requiredCompletionDate: [ - {required: true, message: '要求完成日期不能为空', trigger: 'blur'} + {required: true, message: ' ', trigger: 'blur'} ], taskStartDate: [ - {required: true, message: '任务发起日期不能为空', trigger: 'blur'} + {required: true, message: ' ', trigger: 'blur'} ], } } @@ -197,43 +197,46 @@ this.dataForm.id = id || 0 this.visible = true this.getUserList() - - this.$refs['dataForm'].resetFields() - // this.$nextTick(() => { - // this.$refs['dataForm'].resetFields() - // if (this.dataForm.id) { - // this.$http({ - // url: this.$http.adornUrl(`/taskmanage/tasklist/info/${this.dataForm.id}`), - // method: 'get', - // params: this.$http.adornParams() - // }).then(({data}) => { - // if (data && data.code === 0) { - // this.dataForm.project = data.taskList.project - // this.dataForm.customer = data.taskList.customer - // this.dataForm.taskInitiator = data.taskList.taskInitiator - // this.dataForm.taskDescription = data.taskList.taskDescription - // this.dataForm.department = data.taskList.department - // this.dataForm.requiredCompletionDate = data.taskList.requiredCompletionDate - // this.dataForm.status = data.taskList.status - // this.dataForm.finalStatus = data.taskList.finalStatus - // this.dataForm.taskStartDate = data.taskList.taskStartDate - // this.dataForm.createdDate = data.taskList.createdDate - // this.dataForm.createdBy = data.taskList.createdBy - // this.dataForm.updatedDate = data.taskList.updatedDate - // this.dataForm.updatedBy = data.taskList.updatedBy - // } - // }) - // } - // }) - //this.dataForm.taskStartDate = this.dayjs().format("YYYY-MM-DD") + this.$nextTick(() => { + this.$refs['dataForm'].resetFields() + if (this.dataForm.id) { + this.$http({ + url: this.$http.adornUrl(`/taskmanage/tasklist/info/${this.dataForm.id}`), + method: 'get', + params: this.$http.adornParams() + }).then(({data}) => { + if (data && data.code === 0) { + this.dataForm.project = data.taskList.project + this.dataForm.customer = data.taskList.customer + this.dataForm.taskInitiator = data.taskList.taskInitiator + this.dataForm.taskDescription = data.taskList.taskDescription + this.dataForm.department = data.taskList.department + this.dataForm.taskHeader = data.taskList.taskHeader + this.dataForm.requiredCompletionDate = data.taskList.requiredCompletionDate + this.dataForm.status = data.taskList.status + this.dataForm.finalStatus = data.taskList.finalStatus + this.dataForm.taskStartDate = data.taskList.taskStartDate + this.dataForm.createdDate = data.taskList.createdDate + this.dataForm.createdBy = data.taskList.createdBy + this.dataForm.updatedDate = data.taskList.updatedDate + this.dataForm.updatedBy = data.taskList.updatedBy + this.dataForm.site = data.taskList.site + } + }) + } else { + this.dataForm.taskStartDate = this.dayjs().format("YYYY-MM-DD") + } + }) }, // 表单提交 dataFormSubmit() { - + if (!this.dataForm.taskStartDate) return this.$message.warning('任务发起日期不能为空!') + if (!this.dataForm.customer) return this.$message.warning('客户不能为空!') + if (!this.dataForm.project) return this.$message.warning('项目不能为空!') + if (!this.dataForm.requiredCompletionDate) return this.$message.warning('任务结束日期不能为空') + if (!this.dataForm.taskHeader) return this.$message.warning('任务主题不能为空!') this.$refs['dataForm'].validate((valid) => { if (valid) { - console.log(this.dataForm.taskStartDate) - console.log(this.dayjs().format("YYYY-MM-DD")) if (this.dataForm.taskStartDate < this.dayjs().format("YYYY-MM-DD")) { this.$message.warning('任务发起日期不能小于当前日期') return @@ -242,46 +245,67 @@ this.$message.warning('任务发起日期不能早于要求完成日期') return } - if (this.dataListSelections.length == 0) { - this.$message.warning('请选择责任人') - return - } - let newTaskList = this.dataListSelections.map(item => { - let newItem = { + if (!this.dataForm.id) { + if (this.dataListSelections.length == 0) { + this.$message.warning('请选择责任人') + return + } + let newTaskList = this.dataListSelections.map(item => { + let newItem = { + 'department': item.department, + 'responsiblePerson': item.userid, + 'createdDate': this.dayjs().format("YYYY-MM-DD HH:mm:ss"), + 'createdBy': this.$store.state.user.name, + 'site': this.$store.state.user.site, + 'status': this.dataForm.status, + } + return newItem; + }) + let taskDto = { 'project': this.dataForm.project, 'customer': this.dataForm.customer, 'taskInitiator': this.$store.state.user.name, 'taskDescription': this.dataForm.taskDescription, - 'department': item.department, 'requiredCompletionDate': this.dataForm.requiredCompletionDate, 'status': this.dataForm.status, 'finalStatus': this.dataForm.finalStatus, - 'responsiblePerson': item.userid, 'taskStartDate': this.dataForm.taskStartDate, 'createdDate': this.dayjs().format("YYYY-MM-DD HH:mm:ss"), 'createdBy': this.$store.state.user.name, - 'updatedDate': this.dayjs().format("YYYY-MM-DD HH:mm:ss"), - 'updatedBy': this.$store.state.user.name, 'site': this.$store.state.user.site, 'taskHeader': this.dataForm.taskHeader, + 'taskDetails': newTaskList + } - return newItem; - }) - saveBatchTaskList(newTaskList).then(({data}) => { - if (data && data.code === 0) { - this.$message.success('操作成功') - this.visible = false - this.$emit('refreshDataList') - } else { - this.$message.error(data.msg) - } - }) + + saveBatchTaskList(taskDto).then(({data}) => { + if (data && data.code === 0) { + this.$message.success('操作成功') + this.visible = false + this.$emit('refreshDataList') + } else { + this.$message.error(data.msg) + } + }) + } else { + this.dataForm.updatedDate = this.dayjs().format("YYYY-MM-DD HH:mm:ss") + this.dataForm.updatedBy = this.$store.state.user.name, + updateTask(this.dataForm).then(({data}) => { + if (data && data.code === 0) { + this.$message.success('操作成功') + this.visible = false + this.$emit('refreshDataList') + } else { + this.$message.error(data.msg) + } + }) + } } }) }, // 获取用户信息 getUserList() { - getUserList({site: this.$store.state.user.site, status: 'Y'}).then(({data}) => { + getUserList({site: this.$store.state.user.site, status: 'N'}).then(({data}) => { if (data && data.code === 0) { this.userList = data.data } else { diff --git a/src/views/modules/taskmanage/tasklist.vue b/src/views/modules/taskmanage/tasklist.vue index c237905..13d5712 100644 --- a/src/views/modules/taskmanage/tasklist.vue +++ b/src/views/modules/taskmanage/tasklist.vue @@ -3,8 +3,8 @@ 查询 - 新增 - 发起任务 + 发起任务 + {{ '导出' }} - 批量删除 - + + + @@ -82,13 +82,13 @@ @selection-change="selectionChangeHandle" highlight-current-row style="width: 100%;"> - - + + + + + + + @@ -156,8 +157,8 @@