diff --git a/src/views/modules/taskmanage/alltasklist.vue b/src/views/modules/taskmanage/alltasklist.vue index d07b53d..c42fbfa 100644 --- a/src/views/modules/taskmanage/alltasklist.vue +++ b/src/views/modules/taskmanage/alltasklist.vue @@ -27,6 +27,13 @@ + + + + + + + + + + - - + @@ -205,8 +214,8 @@ { tableId: "ProjectInfo", tableName: this.$route.meta.title, - columnProp: "taskHeader", - columnLabel: "任务主题", + columnProp: "project", + columnLabel: "项目", columnHidden: false, columnImage: false, columnSortable: false, @@ -223,8 +232,8 @@ { tableId: "ProjectInfo", tableName: this.$route.meta.title, - columnProp: "project", - columnLabel: "项目", + columnProp: "taskHeader", + columnLabel: "任务主题", columnHidden: false, columnImage: false, columnSortable: false, @@ -238,6 +247,7 @@ columnType: null, align: null }, + { tableId: "ProjectInfo", tableName: this.$route.meta.title, @@ -443,7 +453,7 @@ }, mounted() { this.$nextTick(() => { - this.height = window.innerHeight - 250; + this.height = window.innerHeight - 200; }) }, methods: { @@ -484,7 +494,7 @@ let dto = { fileTypeCode: 'TASK', orderRef2:row.id, - orderRef1:row.taskId, + orderRef3:row.taskId, } this.$nextTick(() => { this.$refs.taskFileList.init(dto) diff --git a/src/views/modules/taskmanage/mysendtasklist.vue b/src/views/modules/taskmanage/mysendtasklist.vue index 453c8d5..19e8ba5 100644 --- a/src/views/modules/taskmanage/mysendtasklist.vue +++ b/src/views/modules/taskmanage/mysendtasklist.vue @@ -27,15 +27,11 @@ - - - - - + + + + - - - @@ -49,6 +45,23 @@ format='yyyy-MM-dd' > + + + + + + + + + + + + + + + + + 修改 | 更改最终状态 | 沟通 | - 附件 | + 附件 | 删除 @@ -227,8 +240,8 @@ { tableId: "ProjectInfo", tableName: this.$route.meta.title, - columnProp: "taskHeader", - columnLabel: "任务主题", + columnProp: "project", + columnLabel: "项目", columnHidden: false, columnImage: false, columnSortable: false, @@ -245,8 +258,8 @@ { tableId: "ProjectInfo", tableName: this.$route.meta.title, - columnProp: "project", - columnLabel: "项目", + columnProp: "taskHeader", + columnLabel: "任务主题", columnHidden: false, columnImage: false, columnSortable: false, @@ -260,6 +273,7 @@ columnType: null, align: null }, + { tableId: "ProjectInfo", tableName: this.$route.meta.title, @@ -511,11 +525,12 @@ }) }, // 附件 - annex(id) { + annex(row) { this.taskFileVisible = true let dto = { fileTypeCode: 'TASK', - orderRef3:id + orderRef3:row.taskId, + orderRef2:row.id } this.$nextTick(() => { this.$refs.taskFileList.init(dto) diff --git a/src/views/modules/taskmanage/mytasklist.vue b/src/views/modules/taskmanage/mytasklist.vue index e663751..92e35c7 100644 --- a/src/views/modules/taskmanage/mytasklist.vue +++ b/src/views/modules/taskmanage/mytasklist.vue @@ -19,18 +19,14 @@ - - - - - + + + + - - - @@ -44,6 +40,21 @@ format='yyyy-MM-dd' > + + + + + + + + + + + + + + + @@ -214,8 +225,8 @@ { tableId: "ProjectInfo", tableName: this.$route.meta.title, - columnProp: "taskHeader", - columnLabel: "任务主题", + columnProp: "project", + columnLabel: "项目", columnHidden: false, columnImage: false, columnSortable: false, @@ -232,8 +243,8 @@ { tableId: "ProjectInfo", tableName: this.$route.meta.title, - columnProp: "project", - columnLabel: "项目", + columnProp: "taskHeader", + columnLabel: "任务主题", columnHidden: false, columnImage: false, columnSortable: false, @@ -247,6 +258,7 @@ columnType: null, align: null }, + { tableId: "ProjectInfo", tableName: this.$route.meta.title, @@ -496,11 +508,12 @@ }) }, // 附件 - annex(id) { + annex(row) { this.taskFileVisible = true let dto = { fileTypeCode: 'TASK', - orderRef2:id + orderRef2:row.id, + orderRef3:row.taskId } this.$nextTick(() => { this.$refs.taskFileList.init(dto) diff --git a/src/views/modules/taskmanage/task-file-upload-list.vue b/src/views/modules/taskmanage/task-file-upload-list.vue index 12f35a8..7183833 100644 --- a/src/views/modules/taskmanage/task-file-upload-list.vue +++ b/src/views/modules/taskmanage/task-file-upload-list.vue @@ -80,6 +80,21 @@ height: 200, // 展示列集 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: "文件名", @@ -163,9 +178,9 @@ // 回写关键字段 let dto = { id: childValue.id, - orderRef1: this.dataForm.orderRef2, - orderRef2: this.dataForm.orderRef2, - orderRef3: this.dataForm.orderRef2, + orderRef1: this.dataForm.orderRef3, + orderRef2: this.dataForm.orderRef3, + orderRef3: this.dataForm.orderRef3, fileTypeCode: this.dataForm.fileTypeCode, businessType: '任务附件', } diff --git a/src/views/modules/taskmanage/tasklist.vue b/src/views/modules/taskmanage/tasklist.vue index 1940234..d498b9d 100644 --- a/src/views/modules/taskmanage/tasklist.vue +++ b/src/views/modules/taskmanage/tasklist.vue @@ -48,13 +48,8 @@ - - - - - - - + + 修改 |--> - 附件 + 附件 @@ -238,8 +233,8 @@ { tableId: "ProjectInfo", tableName: this.$route.meta.title, - columnProp: "taskHeader", - columnLabel: "任务主题", + columnProp: "project", + columnLabel: "项目", columnHidden: false, columnImage: false, columnSortable: false, @@ -256,8 +251,8 @@ { tableId: "ProjectInfo", tableName: this.$route.meta.title, - columnProp: "project", - columnLabel: "项目", + columnProp: "taskHeader", + columnLabel: "任务主题", columnHidden: false, columnImage: false, columnSortable: false, @@ -271,6 +266,7 @@ columnType: null, align: null }, + { tableId: "ProjectInfo", tableName: this.$route.meta.title, @@ -307,42 +303,6 @@ columnType: null, align: null }, - { - tableId: "ProjectInfo", - tableName: this.$route.meta.title, - columnProp: "status", - columnLabel: "状态", - columnHidden: false, - columnImage: false, - columnSortable: false, - columnWidth: null, - 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: "finalStatus", - columnLabel: "最终状态", - columnHidden: false, - columnImage: false, - columnSortable: false, - columnWidth: null, - 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, @@ -493,11 +453,11 @@ }) }, // 附件 - annex(id) { + annex(row) { this.taskFileVisible = true let dto = { fileTypeCode: 'TASK', - orderRef3: id + orderRef3: row.id } this.$nextTick(() => { this.$refs.taskFileList.init(dto)