diff --git a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue index 9fccb96..625ce28 100644 --- a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue +++ b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue @@ -89,7 +89,7 @@ 汇款 - 线上缴费 + 现场缴费 打包 diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index 766fb97..b7bea71 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -128,7 +128,7 @@ - + diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue index d01c5df..7922d4e 100644 --- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue +++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue @@ -36,7 +36,7 @@ 汇款 - 线上缴费 + 现场缴费 打包 diff --git a/src/views/incomePayments/meetManage/meetingValidate.js b/src/views/incomePayments/meetManage/meetingValidate.js index d8c00ce..34faa7d 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: '请输入会议内容' }, diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue index 96e8533..4abd076 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) => ( ) }, @@ -213,14 +213,14 @@ export default { title: '召开地点', align: 'center', dataIndex: 'venue', - width: 160, + width: 260, customRender: (text, record) => () }, { 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) => ( ) }, @@ -213,7 +213,7 @@ export default { title: '召开地点', align: 'center', dataIndex: 'venue', - width: 160, + width: 200, customRender: (text, record) => ( ) }, @@ -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) => () }, { title: '召开地点', align: 'center', dataIndex: 'venue', - width: 160, + width: 200, customRender: (text, record) => () }, { @@ -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">