From 2a53d3e6774678eeebf2b0f028c6aec2c70a4774 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 10 十一月 2023 09:55:38 +0800
Subject: [PATCH] 2023.11.10

---
 src/views/notice/NoticeManage.vue |   53 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/views/notice/NoticeManage.vue b/src/views/notice/NoticeManage.vue
index bcdcd05..35c111f 100644
--- a/src/views/notice/NoticeManage.vue
+++ b/src/views/notice/NoticeManage.vue
@@ -118,18 +118,18 @@
     />
     <el-table-column width="160" prop="ecCreator" label="鍒涘缓浜�" />
     <!-- <el-table-column prop="ecPicurl" label="鍥剧墖" /> -->
-    <!-- <el-table-column prop="ecReceiverid" label="绛炬敹浜�" /> -->
+    <el-table-column prop="ecReceiverid" label="绛炬敹浜�" />
   </el-table>
   <!-- <el-affix :offset="0" position="bottom"> -->
-    <el-pagination
-      class="el-pagination"
-      v-model:current-page="currentPage"
-      v-model:page-size="pageSize"
-      :page-sizes="[10, 20, 50, 100]"
-      :background="true"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-    />
+  <el-pagination
+    class="el-pagination"
+    v-model:current-page="currentPage"
+    v-model:page-size="pageSize"
+    :page-sizes="[10, 20, 50, 100]"
+    :background="true"
+    layout="total, sizes, prev, pager, next, jumper"
+    :total="total"
+  />
   <!-- </el-affix> -->
   <CompNoticeAddDrawer
     v-model:drawer="drawer"
@@ -173,12 +173,12 @@
     // }
     currentPage(nValue, oValue) {
       if (nValue != oValue) {
-        this.onNoticeType()
+        this.onNoticeType();
       }
     },
     pageSize(nValue, oValue) {
       if (nValue != oValue) {
-        this.onNoticeType()
+        this.onNoticeType();
       }
     },
   },
@@ -204,13 +204,13 @@
           type: noticeType,
           subtype: noticeSubType,
           page: this.currentPage,
-          perPage: this.pageSize
+          perPage: this.pageSize,
         })
         .then((res) => {
           if (res.success) {
             this.tableData = res.data;
-            this.currentPage = res.head.page
-            this.total = res.head.totalCount
+            this.currentPage = res.head.page;
+            this.total = res.head.totalCount;
           }
         })
         .finally(() => {
@@ -219,15 +219,21 @@
       // noticeApi.getNotification().then()
     },
     districtFormatter(row) {
-      let district = '鏈缃�';
-      this.districts.forEach((d) => {
-        if (d.value == row.ecExtension1) {
-          district = d.label;
-          return;
-        }
-      });
-      if (row.ecExtension1 == null) {
+      let district = '';
+      if (row.ecExtension1 == null || row.ecExtension1 == '0;') {
         district = '鍏ㄩ儴';
+      } else if (row.ecExtension1 == '-1') {
+        district = '鏈缃�';
+      } else {
+        row.ecExtension1.split(';').forEach((t) => {
+          this.districts.forEach((d) => {
+            if (t == d.value) {
+              district += d.label + '銆�';
+              return;
+            }
+          });
+        });
+        district = district.slice(0, district.length - 1)
       }
       return district;
     },
@@ -246,6 +252,7 @@
             }
           });
         });
+        scene = scene.slice(0, scene.length - 1)
       }
       return scene;
     },

--
Gitblit v1.9.3