From 7890ab0b4db1a2c3f97141e47e5e8333136267a6 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 13 Oct 2022 13:42:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=20=202022-?=
 =?UTF-8?q?10-13=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/taskmanage/tasklist.js                |  7 ++---
 src/views/modules/taskmanage/alltasklist.vue  | 11 ++++----
 src/views/modules/taskmanage/chat-history.vue |  1 -
 .../modules/taskmanage/mysendtasklist.vue     | 14 +++++-----
 src/views/modules/taskmanage/mytasklist.vue   |  6 ++---
 .../modules/taskmanage/task-file-list.vue     | 18 +++++++++++--
 .../taskmanage/task-file-upload-list.vue      |  2 ++
 src/views/modules/taskmanage/taskReport.vue   | 26 +++----------------
 .../taskmanage/tasklist-add-or-update.vue     |  1 +
 src/views/modules/taskmanage/tasklist.vue     |  4 +--
 10 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/src/api/taskmanage/tasklist.js b/src/api/taskmanage/tasklist.js
index b135e12..941dbb3 100644
--- a/src/api/taskmanage/tasklist.js
+++ b/src/api/taskmanage/tasklist.js
@@ -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);
 
 
 
diff --git a/src/views/modules/taskmanage/alltasklist.vue b/src/views/modules/taskmanage/alltasklist.vue
index 868923d..d07b53d 100644
--- a/src/views/modules/taskmanage/alltasklist.vue
+++ b/src/views/modules/taskmanage/alltasklist.vue
@@ -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)
diff --git a/src/views/modules/taskmanage/chat-history.vue b/src/views/modules/taskmanage/chat-history.vue
index b6a5ac2..d615499 100644
--- a/src/views/modules/taskmanage/chat-history.vue
+++ b/src/views/modules/taskmanage/chat-history.vue
@@ -164,7 +164,6 @@
         this.taskFileVisible = true
         let dto = {
           fileTypeCode: 'TASK',
-          orderRef2: this.dataForm.taskId,
           orderRef1:id
         }
         this.$nextTick(() => {
diff --git a/src/views/modules/taskmanage/mysendtasklist.vue b/src/views/modules/taskmanage/mysendtasklist.vue
index 635608f..e67fd40 100644
--- a/src/views/modules/taskmanage/mysendtasklist.vue
+++ b/src/views/modules/taskmanage/mysendtasklist.vue
@@ -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: '取消',
diff --git a/src/views/modules/taskmanage/mytasklist.vue b/src/views/modules/taskmanage/mytasklist.vue
index 6eea9c6..e663751 100644
--- a/src/views/modules/taskmanage/mytasklist.vue
+++ b/src/views/modules/taskmanage/mytasklist.vue
@@ -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>
diff --git a/src/views/modules/taskmanage/task-file-list.vue b/src/views/modules/taskmanage/task-file-list.vue
index df3f9ee..d304268 100644
--- a/src/views/modules/taskmanage/task-file-list.vue
+++ b/src/views/modules/taskmanage/task-file-list.vue
@@ -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,
diff --git a/src/views/modules/taskmanage/task-file-upload-list.vue b/src/views/modules/taskmanage/task-file-upload-list.vue
index e6952a8..12f35a8 100644
--- a/src/views/modules/taskmanage/task-file-upload-list.vue
+++ b/src/views/modules/taskmanage/task-file-upload-list.vue
@@ -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)
       },
diff --git a/src/views/modules/taskmanage/taskReport.vue b/src/views/modules/taskmanage/taskReport.vue
index 8a6f5ee..f603df4 100644
--- a/src/views/modules/taskmanage/taskReport.vue
+++ b/src/views/modules/taskmanage/taskReport.vue
@@ -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,
diff --git a/src/views/modules/taskmanage/tasklist-add-or-update.vue b/src/views/modules/taskmanage/tasklist-add-or-update.vue
index de8e720..077489f 100644
--- a/src/views/modules/taskmanage/tasklist-add-or-update.vue
+++ b/src/views/modules/taskmanage/tasklist-add-or-update.vue
@@ -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;
               })
diff --git a/src/views/modules/taskmanage/tasklist.vue b/src/views/modules/taskmanage/tasklist.vue
index 5ad36db..5354040 100644
--- a/src/views/modules/taskmanage/tasklist.vue
+++ b/src/views/modules/taskmanage/tasklist.vue
@@ -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)