From 6dbd5c8625561b5795086a7862ba248a1bc9634e Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 22 Oct 2021 10:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/UserAnnouncementList.vue | 45 +++++++++++++++++++++--
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 1c2124e..d2cd76a 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -9,8 +9,19 @@
 
            <a-col :xl="7" :lg="8" :md="8" :sm="24">
              <a-form-item label="提醒类型">
-               <j-dict-select-tag dict-code="notice_type" placeholder="请选择提醒类型"
-                                  v-model="queryParam.titile"></j-dict-select-tag>
+               <a-select
+                 v-model="queryParam.titile"
+                 show-search
+                 allowClear
+                 option-filter-prop="children"
+                 :filter-option="filterOption"
+                 placeholder="请选择提醒类型"
+               >
+                 <a-select-option v-for="(item,index) in noticeTypeList" :key="index" :value="item.value">{{
+                     item.name
+                   }}
+                 </a-select-option>
+               </a-select>
              </a-form-item>
            </a-col>
            <a-col :xl="10" :lg="11" :md="12" :sm="24">
@@ -86,7 +97,6 @@ import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
 import {RangeDateMixin} from '@/mixins/RangeDateMixin'
 import DynamicNotice from '../../components/tools/DynamicNotice'
-import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import '@/assets/less/TableExpand.less'
 import JDate from '@comp/tools/JDate'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
@@ -99,7 +109,6 @@ export default {
   components: {
     DynamicNotice,
     ShowAnnouncement,
-    JDictSelectTag,
     JDate,
     PageHeaderTitle
   },
@@ -107,6 +116,29 @@ export default {
     return {
       description: '系统通告表管理页面',
       queryParam: {},
+      // 管理端消息提醒类型
+      noticeTypeList: [
+        {
+          name: '项目通知',
+          value: '1'
+        },
+        {
+          name: '合同通知',
+          value: '2'
+        },
+        {
+          name: '会议通知',
+          value: '3'
+        },
+        {
+          name: '打包通知',
+          value: '4'
+        },
+        {
+          name: '企业通知',
+          value: '5'
+        }
+      ],
       IconImg,
       columns: [
         {
@@ -170,6 +202,11 @@ export default {
     Bus.$off('header-notice-change')
   },
   methods: {
+    filterOption(input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
     handleDetail: function (record) {
       this.$refs.sysAnnouncementModal.detail(record)
       this.$refs.sysAnnouncementModal.title = '查看'