From 99272e0fbec0e5a92d5b7454910eeb3e1b5b977f Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 2 Nov 2021 10:05:06 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E3=80=91=E4=BC=9A=E8=AE=AE=E5=88=97=E8=A1=A8=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AE=BD=E5=BA=A6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectManagement/CommitteeMeeting.vue  | 12 ++++++------
 .../projectManagement/ConferenceMaintenance.vue   |  6 +++---
 .../projectManagement/InternationalSeminar.vue    |  6 +++---
 src/views/projectManagement/OtherMeeting.vue      | 15 ++++++++-------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index 079f5fb..c8dec23 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -185,13 +185,13 @@ export default {
           align: 'center',
           dataIndex: 'meetingName',
           scopedSlots: {customRender: 'htmlSlot'},
-          width: 160,
+          width: 220,
         },
         {
           title: '会议类型',
           align: 'center',
           dataIndex: 'meetingType_dictText',
-          width: 100,
+          width: 120,
           scopedSlots: {customRender: 'text'}
         },
         {
@@ -205,7 +205,7 @@ export default {
           title: '召开时间',
           align: 'center',
           dataIndex: 'startTime',
-          width: 160,
+          width: 200,
           customRender: (text, record) => (
             <j-ellipsis value={record.startTime + '~' + record.endTime} length={20}></j-ellipsis>)
         },
@@ -213,14 +213,14 @@ export default {
           title: '召开地点',
           align: 'center',
           dataIndex: 'venue',
-          width: 160,
+          width: 260,
           customRender: (text, record) => (<j-ellipsis value={text + '/' + record.address} length={20}></j-ellipsis>)
         },
         {
           title: '年份',
           align: 'center',
           dataIndex: 'particularYear',
-          width: 100,
+          width: 120,
           scopedSlots: {customRender: 'text'}
         },
         {
@@ -240,7 +240,7 @@ export default {
           title: '操作',
           align: 'center',
           fixed: 'right',
-          width: 160,
+          width: 180,
           scopedSlots: {customRender: 'action'}
         },
       ],
diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index e08f403..d11c2f3 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -205,7 +205,7 @@ export default {
           title: '召开时间',
           align: 'center',
           dataIndex: 'startTime',
-          width: 160,
+          width: 200,
           customRender: (text, record) => (
             <j-ellipsis value={ record.startTime + '~' + record.endTime } length={ 20 }></j-ellipsis>)
         },
@@ -213,7 +213,7 @@ export default {
           title: '召开地点',
           align: 'center',
           dataIndex: 'venue',
-          width: 160,
+          width: 200,
           customRender: (text, record) => (
             <j-ellipsis value={ text + '/' + record.address } length={ 20 }></j-ellipsis>)
         },
@@ -221,7 +221,7 @@ export default {
           title: '年份',
           align: 'center',
           dataIndex: 'particularYear',
-          width: 100,
+          width: 120,
           scopedSlots: { customRender: 'text' }
         },
         {
diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue
index 963043e..a59fee2 100644
--- a/src/views/projectManagement/InternationalSeminar.vue
+++ b/src/views/projectManagement/InternationalSeminar.vue
@@ -170,14 +170,14 @@ export default {
           title: '召开时间',
           align: 'center',
           dataIndex: 'startTime',
-          width: 160,
+          width: 200,
           customRender: (text, record) => (<j-ellipsis value={record.startTime + '~' + record.endTime} length={20}></j-ellipsis>)
         },
         {
           title: '召开地点',
           align: 'center',
           dataIndex: 'venue',
-          width: 160,
+          width: 200,
           customRender: (text, record) => (<j-ellipsis value={text + '/' + record.address} length={20}></j-ellipsis>)
         },
         {
@@ -185,7 +185,7 @@ export default {
           align: 'center',
           dataIndex: 'particularYear',
           scopedSlots: {customRender: 'text'},
-          width: 100,
+          width: 120,
         },
         {
           title: '创建时间',
diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue
index 21347d2..4fe7c2d 100644
--- a/src/views/projectManagement/OtherMeeting.vue
+++ b/src/views/projectManagement/OtherMeeting.vue
@@ -86,7 +86,8 @@
           @change="handleTableChange">
 
           <template slot="htmlSlot" slot-scope="text,record">
-            <div class="primary-color" @click="toAttendance(record)">{{ text }}</div>
+            <j-ellipsis v-if="text" class="primary-color" @click="toAttendance(record)" :value="text" :length="20"></j-ellipsis>
+            <span v-else></span>
           </template>
 
           <template slot="text" slot-scope="text">
@@ -147,13 +148,13 @@ name: 'OtherMeeting',
           align: 'center',
           dataIndex: 'meetingName',
           scopedSlots: {customRender: 'htmlSlot'},
-          width: 160,
+          width: 220,
         },
         {
           title: '会议类型',
           align: 'center',
           dataIndex: 'meetingType_dictText',
-          width: 100,
+          width: 120,
           scopedSlots: {customRender: 'text'}
         },
         {
@@ -167,21 +168,21 @@ name: 'OtherMeeting',
           title: '召开时间',
           align: 'center',
           dataIndex: 'startTime',
-          width: 160,
+          width: 220,
           customRender: (text, record) => (<j-ellipsis value={record.startTime + '~' +  record.endTime} length={20}></j-ellipsis>)
         },
         {
           title: '召开地点',
           align: 'center',
           dataIndex: 'venue',
-          width: 160,
+          width: 240,
           customRender: (text, record) => (<j-ellipsis value={text + '/' + record.address} length={20}></j-ellipsis>)
         },
         {
           title: '年份',
           align: 'center',
           dataIndex: 'particularYear',
-          width: 100,
+          width: 120,
           scopedSlots: {customRender: 'text'}
         },
         {
@@ -194,7 +195,7 @@ name: 'OtherMeeting',
           title: '操作',
           align: 'center',
           fixed: 'right',
-          width: 160,
+          width: 180,
           scopedSlots: {customRender: 'action'}
         },
       ],