From 4592784f69a77a2a5baed048adbd3b43de2b90c8 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 26 Jan 2022 16:22:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/regionalParty/activitysForm.vue    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index e18bc984..c79e2f58 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -516,6 +516,10 @@ export default {
 <style  lang="scss" scoped>
 .item_width_1 {
   width: 560px;
+
+  /deep/.tox .tox-dialog {
+    z-index: 20000;
+  }
 }
 .item_width_2 {
   width: 600px;

From ee7dcc8b342ea8ec264fde8b62748f553c4eaac9 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 27 Jan 2022 09:14:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/regionalParty/units.vue | 6 +++---
 src/views/modules/communityService/shzz/index.vue        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index 622ddd6d..d5679446 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -196,14 +196,14 @@
                          style="color:#1C6AFD;text-decoration: underline;"
                          size="small"
                          @click="handleDetail(scope.row)">查看</el-button>
-              <!-- <el-button type="text"
+              <el-button type="text"
                          style="color:#1C6AFD;text-decoration: underline;"
                          size="small"
                          @click="handleFinish(scope.row)">完成情况</el-button>
               <el-button type="text"
                          style="color:#1C6AFD;text-decoration: underline;"
                          size="small"
-                         @click="handleScore(scope.row)">积分记录</el-button> -->
+                         @click="handleScore(scope.row)">积分记录</el-button>
             </div>
             <div>
               <el-button type="text"
@@ -366,7 +366,7 @@ export default {
 
 
       let params = {
-        parentCategoryCode: '1010'
+        // parentCategoryCode: '1010'
       }
 
       const { data, code, msg } = await requestPost(url, params)
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 98cdf097..f8ce4fb5 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -139,10 +139,10 @@
             <el-button @click="handleWatch(scope.$index)"
                        type="text"
                        size="small">查看</el-button>
-            <!-- <el-button type="text"
+            <el-button type="text"
                        style="color:#00A7A9;"
                        size="small"
-                       @click="handleScore(scope.row)">积分记录</el-button> -->
+                       @click="handleScore(scope.row)">积分记录</el-button>
 
             <el-button @click="handleEdit(scope.$index)"
                        type="text"