From ed92755ff156a4458e7c6b33b996bde998f1a062 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Wed, 18 Oct 2023 10:03:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=A4=96=E9=83=A8=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E3=80=81=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/policyRegulation/meeting/index.vue   | 18 ++++++++++++++++--
 .../policyTopics/components/editDrawer.vue     |  2 +-
 .../policyRegulation/policyTopics/index.vue    | 17 +++++++++++++++--
 .../tabComponents/processCenter/index.vue      |  4 ++--
 4 files changed, 34 insertions(+), 7 deletions(-)

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"
         >
         </el-table-column>
         <el-table-column
             prop="meetingOrganizer"
             label="会议主办单位"
             align="center"
+            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="meetingTime"
             label="会议时间"
             align="center"
+            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="meetingAddress"
             label="会议地点"
             align="center"
+            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="agendaName"
             label="议题名称"
             align="center"
+            sortable="custom"
         >
           <template slot-scope="scope">
             <span>{{ scope.row.meetingTopicList.map(item => item.agendaName).join(',') }}</span>
@@ -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"
             ></customFile>
           </el-col>
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"
         >
         </el-table-column>
         <el-table-column
             prop="organizer"
             label="课题承办单位"
             align="center"
+            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="startTime"
             label="启动时间"
             align="center"
+            sortable="custom"
         >
         </el-table-column>
         <el-table-column
             prop="topicStatus"
             label="课题状态"
             align="center"
+            sortable="custom"
         >
         </el-table-column>
         <el-table-column
@@ -243,8 +247,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/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index ec7f2c7ed..391920ba8 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -2264,10 +2264,10 @@ export default {
           let routeName = ''
           switch (row.taskInfo) {
             case '内外部会议入库审批':
-              routeName = 'zcrk2'
+              routeName = 'hyrk2'
               break
             case '重新发起内外部会议入库流程':
-              routeName = 'zcrk1'
+              routeName = 'hyrk1'
               break
           }
           this.$router.push({