From cd63276f760ed9b022311df41c14fb781dfa3248 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 15 Aug 2024 10:25:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=96=E8=A7=A3=E6=94=B9=E6=88=90=E8=B0=83?=
 =?UTF-8?q?=E8=A7=A3=20=20=E5=88=97=E8=A1=A8=E5=8A=A0=E4=B8=A4=E5=88=97?=
 =?UTF-8?q?=E4=B8=93=E9=A1=B9=E7=BB=84=E8=B7=9F=E7=BB=84=E9=95=BF/?=
 =?UTF-8?q?=E6=88=90=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/next/dialog-module/conflict-mediation/index.vue     | 4 ++--
 .../next/dialog-module/conflict-mediation/street-table.vue    | 4 +++-
 src/views/next/screen-content-left/red-party-build/index.vue  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/next/dialog-module/conflict-mediation/index.vue b/src/views/next/dialog-module/conflict-mediation/index.vue
index e7fad4a..3ea6225 100644
--- a/src/views/next/dialog-module/conflict-mediation/index.vue
+++ b/src/views/next/dialog-module/conflict-mediation/index.vue
@@ -43,8 +43,8 @@ export default {
     return {
       dialogTitle: '矛盾调解',
       tabList: [
-        { label: '街道一站式矛盾纠纷多元化解中心', value: 'tab1' },
-        { label: '社区（村）一站式化解工作站', value: 'tab2' },
+        { label: '街道一站式矛盾纠纷多元调解中心', value: 'tab1' },
+        { label: '社区（村）一站式调解工作站', value: 'tab2' },
         { label: '社区（村）社会组织', value: 'tab3' }
       ],
       currentTab: 'tab1'
diff --git a/src/views/next/dialog-module/conflict-mediation/street-table.vue b/src/views/next/dialog-module/conflict-mediation/street-table.vue
index 6d95106..e3c68a6 100644
--- a/src/views/next/dialog-module/conflict-mediation/street-table.vue
+++ b/src/views/next/dialog-module/conflict-mediation/street-table.vue
@@ -15,6 +15,8 @@ export default {
     return {
       headerList: [
         { width: '100%', title: '序号' },
+        { width: '200%', title: '专项组' },
+        { width: '200%', title: '组长/成员' },
         { width: '200%', title: '姓名' },
         { width: '200%', title: '职务' }
       ],
@@ -42,7 +44,7 @@ export default {
           console.log('获取街道一站式矛盾纠纷多元化解中心列表', res)
           this.conflictStreetTableList = res.list || []
           this.conflictStreetTableList.forEach((item, index) => {
-            this.dataList.push([index + 1, item.name || '-', item.positon || '-'])
+            this.dataList.push([index + 1, item.groupName || '-', item.groupPosition || '-', item.name || '-', item.positon || '-'])
           })
         }).catch(err => {
           console.error('获取街道一站式矛盾纠纷多元化解中心列表', err)
diff --git a/src/views/next/screen-content-left/red-party-build/index.vue b/src/views/next/screen-content-left/red-party-build/index.vue
index 44bfef9..69d87e6 100644
--- a/src/views/next/screen-content-left/red-party-build/index.vue
+++ b/src/views/next/screen-content-left/red-party-build/index.vue
@@ -97,8 +97,8 @@ export default {
       partyerList: [],
       partyerStyleSwipper: '',
       tabList: [
-        { label: '街道一站式矛盾纠纷多元化解中心', value: 'tab1' },
-        { label: '社区（村）一站式化解工作站', value: 'tab2' },
+        { label: '街道一站式矛盾纠纷多元调解中心', value: 'tab1' },
+        { label: '社区（村）一站式调解工作站', value: 'tab2' },
         { label: '社区（村）社会组织', value: 'tab3' }
       ]
     }