diff --git a/src/pages/policyRegulation/meeting/index.vue b/src/pages/policyRegulation/meeting/index.vue
index 28fa32f6d..964985aa5 100644
--- a/src/pages/policyRegulation/meeting/index.vue
+++ b/src/pages/policyRegulation/meeting/index.vue
@@ -94,30 +94,35 @@
prop="meetingName"
label="会议名称"
align="center"
+ sortable="custom"
>
{{ scope.row.meetingTopicList.map(item => item.agendaName).join(',') }}
@@ -226,8 +231,17 @@ export default {
}
},
// 表格排序
- sortChange(sortObj) {
-
+ sortChange({ column, prop, order }) {
+ this.searchForm.sortField = prop
+ this.searchForm.sortMode = 'asc'
+ if (order === 'descending') {
+ this.searchForm.sortMode = 'desc'
+ }
+ if (!order) {
+ this.searchForm.sortField = ''
+ this.searchForm.sortMode = ''
+ }
+ this.getData()
},
// 分页点击后方法
pageChange (page) {
diff --git a/src/pages/policyRegulation/policyTopics/components/editDrawer.vue b/src/pages/policyRegulation/policyTopics/components/editDrawer.vue
index 7d211f694..0e8ba510a 100644
--- a/src/pages/policyRegulation/policyTopics/components/editDrawer.vue
+++ b/src/pages/policyRegulation/policyTopics/components/editDrawer.vue
@@ -177,7 +177,7 @@
attrField: 'conferenceMaterials'
}"
v-model="form.conferenceMaterials"
- :allowType="['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX', '.pdg', '.PDG', 'mp3', 'MP3', 'mp4', 'MP4']"
+ :allowType="['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX', '.pdg', '.PDG', '.mp3', '.MP3', '.Ogg', '.Wav', '.mp4', '.MP4', '.WebM']"
:size="2048"
>
diff --git a/src/pages/policyRegulation/policyTopics/index.vue b/src/pages/policyRegulation/policyTopics/index.vue
index 9a29293c8..6193637c2 100644
--- a/src/pages/policyRegulation/policyTopics/index.vue
+++ b/src/pages/policyRegulation/policyTopics/index.vue
@@ -107,24 +107,28 @@
prop="topicName"
label="课题名称"
align="center"
+ sortable="custom"
>