From 41e55392896caff580e9da4df23078d30dd3be15 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 9 May 2022 14:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=BE=E8=AE=A1=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=80=A7=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/PersonnelSelection/index.vue     |  1 -
 .../components/engineeringConfirmation.vue          | 13 ++++++++++---
 .../views/projectManagement/components/TaskList.vue |  7 ++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index b417b1025..17a94d9ce 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -36,7 +36,6 @@
           @check="onCheck"
           @expand="onExpand"
           v-model:checkedKeys="defaultCheckedKeys"
-          :defaultCheckedKeys="defaultCheckedKeys"
           :defaultExpandedKeys="defaultExpandedKeys"
         >
         </a-tree>
diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 3d3ae378d..15e87227c 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -23,7 +23,7 @@
       ref="table"
       :loading="loading"
       :pagination="false"
-      :scroll="{x: true}"
+      :scroll="{x: 1600}"
       :data-source="dataSource"
       :columns="columns"
     >
@@ -297,32 +297,39 @@
             dataIndex: 'index',
             key: 'index',
             align: 'center',
+            width: 140,
+            fixed: 'left',
             customRender: (text, record, index) => `${index + 1}`
           },
           {
             title: this.$t('feedbackFromTheEngineer'),
             dataIndex: 'engineerFeedbackContent',
-            align: 'center'
+            align: 'center',
+            ellipsis: true
           },
           {
             title: this.$t('Deliverables'),
             dataIndex: 'fileId',
             align: 'center',
+            ellipsis: true,
             scopedSlots: { customRender: 'Deliverables' }
           },
           {
             title: this.$t('completedBy'),
             dataIndex: 'createBy',
+            ellipsis: true,
             align: 'center'
           },
           {
             title: this.$t('completedTime'),
             dataIndex: 'createTime',
+            ellipsis: true,
             align: 'center'
           },
           {
             title: this.$t('replyFromProjectContactPerson'),
             dataIndex: 'engineeringInterfacePersonReply',
+            ellipsis: true,
             align: 'center'
           },
           {
@@ -366,7 +373,7 @@
         let query = {
           status: 'NotDone',
           actiProcInstId: this.$route.query.actiProcInstId,
-          projectTaskInventoryId: this.$route.query.id,
+          projectTaskInventoryId: this.$route.query.projectTaskInventoryId,
           flowType: '2',
           userIds: this.formInline.userId,
           taskDefinitionKey: 'dreDispose'
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 72d13dcc1..ff51fa889 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -214,7 +214,7 @@
             query = {
               taskIds: val.designTaskId,
               actiProcInstId: val.designPId,
-              id: val.id,
+              projectTaskInventoryId: val.projectLawsInventoryId,
               projectLibraryId: this.$route.query.id,
               serialNumber: val.serialNumber
             }
@@ -223,7 +223,7 @@
             query = {
               taskIds: val.prehomoTaskId,
               actiProcInstId: val.prehomoPId,
-              id: val.id,
+              projectTaskInventoryId: val.projectLawsInventoryId,
               projectLibraryId: this.$route.query.id,
               serialNumber: val.serialNumber
             }
@@ -234,7 +234,8 @@
               actiProcInstId: val.verifyPId,
               id: val.id,
               projectLibraryId: this.$route.query.id,
-              serialNumber: val.serialNumber
+              serialNumber: val.serialNumber,
+              projectTaskInventoryId: val.projectLawsInventoryId,
             }
             break
         }