wilson
/
ha-mes-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

任务管理 2022-10-13 sxm

master
[li_she] 3 years ago
parent
3d4056a2e8
commit
7890ab0b4d
10 changed files with 42 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/api/taskmanage/tasklist.js
  2. 11
      src/views/modules/taskmanage/alltasklist.vue
  3. 1
      src/views/modules/taskmanage/chat-history.vue
  4. 14
      src/views/modules/taskmanage/mysendtasklist.vue
  5. 6
      src/views/modules/taskmanage/mytasklist.vue
  6. 18
      src/views/modules/taskmanage/task-file-list.vue
  7. 2
      src/views/modules/taskmanage/task-file-upload-list.vue
  8. 26
      src/views/modules/taskmanage/taskReport.vue
  9. 1
      src/views/modules/taskmanage/tasklist-add-or-update.vue
  10. 4
      src/views/modules/taskmanage/tasklist.vue

7
src/api/taskmanage/tasklist.js
View File

@ -1,10 +1,8 @@
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,12 +12,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);
// 修改任务状态
export const updateTaskDetail = data => createAPI(`taskmanage/taskDetail/updateTaskDetail`, 'post', data);

11
src/views/modules/taskmanage/alltasklist.vue
View File

@ -99,12 +99,12 @@
fixed="right"
header-align="center"
align="center"
width="130"
width="120"
label="操作">
<template slot-scope="scope">
<el-link type="text" size="small" @click="chatHistoryDialog(scope.row.id)">沟通记录 |</el-link>
<el-link type="text" size="small" @click="annex(scope.row.id)">沟通附件 |</el-link>
<el-link type="text" size="small" @click="annex(scope.row.taskId)">任务附件 </el-link>
<el-link type="text" size="small" @click="annex(scope.row)">附件</el-link>
<!-- <el-link type="text" size="small" @click="annex(scope.row.taskId)">任务附件 </el-link>-->
<!-- <el-link v-if="isAuth('taskmanage:tasklist:delete')" type="text" size="small"-->
<!-- @click="deleteHandle(scope.row.id)">|删除-->
<!-- </el-link>-->
@ -479,11 +479,12 @@
})
},
// 附件
annex(id) {
annex(row) {
this.taskFileVisible = true
let dto = {
fileTypeCode: 'TASK',
orderRef2:id
orderRef2:row.id,
orderRef1:row.taskId,
}
this.$nextTick(() => {
this.$refs.taskFileList.init(dto)

1
src/views/modules/taskmanage/chat-history.vue
View File

@ -164,7 +164,6 @@
this.taskFileVisible = true
let dto = {
fileTypeCode: 'TASK',
orderRef2: this.dataForm.taskId,
orderRef1:id
}
this.$nextTick(() => {

14
src/views/modules/taskmanage/mysendtasklist.vue
View File

@ -101,8 +101,8 @@
<el-link type="text" size="small" @click="addOrUpdateHandle(scope.row.taskId)">修改 |</el-link>
<el-link type="text" size="small" @click="updateStatusDialog(scope.row)">更改最终状态 |</el-link>
<el-link type="text" size="small" @click="chatHistoryDialog(scope.row.id)">沟通 |</el-link>
<el-link type="text" size="small" @click="annex(scope.row.taskId)">任务附件 |</el-link>
<el-link type="text" size="small" @click="annex(scope.row.id)"> 沟通附件</el-link>
<el-link type="text" size="small" @click="annex(scope.row.taskId)">附件 |</el-link>
<!-- <el-link type="text" size="small" @click="annex(scope.row.id)"> 沟通附件</el-link>-->
<el-link type="text" size="small"
@click="deleteHandle(scope.row.id)">删除
</el-link>
@ -144,7 +144,7 @@
<script>
import ChatHistory from './chat-history.vue'
import {getTaskDetailList,updateTask} from '@/api/taskmanage/tasklist.js'
import {getTaskDetailList,updateTaskDetail} from '@/api/taskmanage/tasklist.js'
import TaskFileList from './task-file-upload-list.vue'
import AddOrUpdate from "./tasklist-add-or-update";
@ -488,12 +488,12 @@
// 更改状态模态框
updateStatusDialog(row) {
this.selectRow.finalStatus = row.finalStatus
this.selectRow.id = row.taskId
this.selectRow.id = row.id
this.statusVisible = true;
},
// 更改状态提交
updateStatus() {
updateTask(this.selectRow).then(({data}) =>{
updateTaskDetail(this.selectRow).then(({data}) =>{
if (data && data.code == 0 ){
this.statusVisible = false
this.$message.success(data.msg)
@ -523,9 +523,7 @@
},
// 删除
deleteHandle(id) {
var ids = id ? [id] : this.dataListSelections.map(item => {
return item.id
})
var ids = id
this.$confirm(`确定进行删除操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',

6
src/views/modules/taskmanage/mytasklist.vue
View File

@ -90,12 +90,12 @@
fixed="right"
header-align="center"
align="center"
width="220"
width="100"
label="操作">
<template slot-scope="scope">
<el-link type="text" size="small" @click="chatHistoryDialog(scope.row.id)">沟通 |</el-link>
<el-link type="text" size="small" @click="annex(scope.row.taskId)">任务附件 |</el-link>
<el-link type="text" size="small" @click="annex(scope.row.id)"> 沟通附件</el-link>
<el-link type="text" size="small" @click="annex(scope.row.taskId)">附件</el-link>
<!-- <el-link type="text" size="small" @click="annex(scope.row.id)"> 沟通附件</el-link>-->
</template>
</el-table-column>
</el-table>

18
src/views/modules/taskmanage/task-file-list.vue
View File

@ -68,6 +68,20 @@
// 展示列集
columnList: [
{
columnProp: "businessType",
columnLabel: "附件类型",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 80,
format: null,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: null
},{
columnProp: "fileName",
columnLabel: "文件名",
columnHidden: false,
@ -88,7 +102,7 @@
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 80,
columnWidth: 60,
format: null,
sortLv: 0,
status: true,
@ -103,7 +117,7 @@
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 100,
columnWidth: 80,
format: null,
sortLv: 0,
status: true,

2
src/views/modules/taskmanage/task-file-upload-list.vue
View File

@ -165,7 +165,9 @@
id: childValue.id,
orderRef1: this.dataForm.orderRef2,
orderRef2: this.dataForm.orderRef2,
orderRef3: this.dataForm.orderRef2,
fileTypeCode: this.dataForm.fileTypeCode,
businessType: '任务附件',
}
this.updateOrderRef(dto)
},

26
src/views/modules/taskmanage/taskReport.vue
View File

@ -60,7 +60,7 @@
project: '',
taskDescription: '',
taskInitiator: '',
finalStatus: '',
finalStatus: '未完成',
department: '',
responsiblePerson: '',
startDate: '',
@ -165,30 +165,12 @@
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "department",
columnLabel: "责任部门",
columnProp: "depUserName",
columnLabel: "责任部门|责任人",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 80,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "responsiblePerson",
columnLabel: "责任人",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 80,
columnWidth: 120,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,

1
src/views/modules/taskmanage/tasklist-add-or-update.vue
View File

@ -258,6 +258,7 @@
'createdBy': this.$store.state.user.name,
'site': this.$store.state.user.site,
'status': this.dataForm.status,
'finalStatus': this.dataForm.finalStatus,
}
return newItem;
})

4
src/views/modules/taskmanage/tasklist.vue
View File

@ -114,7 +114,7 @@
<template slot-scope="scope">
<!-- <el-link type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改 |</el-link>-->
<!-- <el-link type="text" size="small" @click="updateStatusDialog(scope.row)">更改最终状态 |</el-link>-->
<el-link type="text" size="small" @click="chatHistoryDialog(scope.row.id)">沟通记录 |</el-link>
<!-- <el-link type="text" size="small" @click="chatHistoryDialog(scope.row.id)">沟通记录 |</el-link>-->
<el-link type="text" size="small" @click="annex(scope.row.id)">附件</el-link>
<!-- <el-link v-if="isAuth('taskmanage:tasklist:delete')" type="text" size="small"-->
<!-- @click="deleteHandle(scope.row.id)">删除-->
@ -497,7 +497,7 @@
this.taskFileVisible = true
let dto = {
fileTypeCode: 'TASK',
orderRef2: id
orderRef3: id
}
this.$nextTick(() => {
this.$refs.taskFileList.init(dto)

Write Preview
Loading…
Cancel
Save