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 1/3] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E3=80=91=E4=BC=9A=E8=AE=AE=E5=88=97=E8=A1=A8=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=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'}
         },
       ],

From 2b95c403254360727946a67cd8e5ac00cbd83caa Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 2 Nov 2021 10:20:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E3=80=91=E7=BA=BF=E4=B8=8A=E7=BC=B4=E8=B4=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=8E=B0=E5=9C=BA=E7=BC=B4=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../revenueContract/modules/AddMeetingPerson.vue                | 2 +-
 src/views/incomePayments/meetManage/OtherMeetingForm.vue        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
index e2b1ce7..36d52a2 100644
--- a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
+++ b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
@@ -89,7 +89,7 @@
             <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-radio-group v-decorator="['payMode',validatorRules.payMode]" @change="changePayMode">
                 <a-radio :value="1">汇款</a-radio>
-                <a-radio :value="2">线上缴费</a-radio>
+                <a-radio :value="2">现场缴费</a-radio>
                 <a-radio :value="3" disabled>打包</a-radio>
               </a-radio-group>
             </a-form-item>
diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
index b1b57a9..6c84413 100644
--- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue
+++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
@@ -35,7 +35,7 @@
           <a-form-item label="缴费方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-radio-group v-decorator="['payMode',validatorRules.payMode]" :disabled="isEditBool" @change="changePayMode">
               <a-radio :value="1">汇款</a-radio>
-              <a-radio :value="2">线上缴费</a-radio>
+              <a-radio :value="2">现场缴费</a-radio>
               <a-radio :value="3">打包</a-radio>
             </a-radio-group>
           </a-form-item>

From 4847d497827d69121c86a0514a313c18ed7ed680 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 2 Nov 2021 10:29:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E3=80=91=E4=BC=9A=E8=AE=AE=E9=80=9A=E7=9F=A5=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/incomePayments/meetManage/AddOrDetailMeet.vue | 2 +-
 src/views/incomePayments/meetManage/meetingValidate.js  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index cbb1a70..5a09b7e 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -128,7 +128,7 @@
           <a-row :gutter="24">
             <a-col :xxl="8" :xl="12" :sm="24">
               <a-form-item label="会议通知" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-upload :return-id="true" v-decorator="[ 'meetingFiles']"></j-upload>
+                <j-upload :return-id="true" v-decorator="[ 'meetingFiles',validatorRules.meetingFiles]"></j-upload>
               </a-form-item>
             </a-col>
           </a-row>
diff --git a/src/views/incomePayments/meetManage/meetingValidate.js b/src/views/incomePayments/meetManage/meetingValidate.js
index 6675201..4f37a0e 100644
--- a/src/views/incomePayments/meetManage/meetingValidate.js
+++ b/src/views/incomePayments/meetManage/meetingValidate.js
@@ -11,6 +11,12 @@ export default {
     ],
         validateTrigger:['change']
   },
+  meetingFiles:{
+    rules: [
+      { required: true, message: '请上传会议通知' },
+    ],
+    validateTrigger:['change']
+  },
   meetingContent:{
     rules: [
       { required: true, message: '请输入会议内容' },