From 54251574f8397e7c637e4360f5e8faea5ce5bc43 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 9 Nov 2023 17:07:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=20=E5=8E=BB=E9=99=A41?=
 =?UTF-8?q?14/22=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dict/JMultiSelectTag.vue         |  1 +
 src/enums/commonEnums.js                        |  2 +-
 .../incomePayments/meetManage/Attendance.vue    | 17 ++++++++++++++++-
 .../meetManage/modules/wasicStaticData.js       |  4 ++--
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/components/dict/JMultiSelectTag.vue b/src/components/dict/JMultiSelectTag.vue
index 5a1ebf5..2befdaf 100644
--- a/src/components/dict/JMultiSelectTag.vue
+++ b/src/components/dict/JMultiSelectTag.vue
@@ -13,6 +13,7 @@
     :getPopupContainer="getParentContainer"
     optionFilterProp="children"
     :filterOption="filterOption"
+    v-bind="$attrs"
     allowClear>
     <a-select-option
       v-for="(item,index) in dictOptions"
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 0d1bab3..1aaef69 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -32,6 +32,6 @@ export const InvoiceTypeEnums = {
 export const LinkTopicsEnums = {
   free: { name: '免费专题', index: 6 },
   freeTwo: { name: '免费专题', index: 8 },
-  default: {name: '114/22焦点论坛(默认专题)', index: 99}
+  default: {name: '焦点论坛(默认专题)', index: 99}
 }
 
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index cca0809..650ba71 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -249,6 +249,21 @@
                   dictCode="invoice_project"/>
               </a-form-item>
             </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero">
+              <a-form-item label="会议名称">
+                <j-multi-select-tag
+                  v-model="queryParam.choiceTopic_regexp"
+                  :trigger-change="true"
+                  :max-tag-count="1"
+                  :max-tag-text-length="12"
+                  style="width: 100%"
+                  dict-code="linkTopics"
+                  placeholder="请选择会议名称"
+                  class="meeting-form-multi-select"
+                >
+                </j-multi-select-tag>
+              </a-form-item>
+            </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search"
@@ -398,7 +413,7 @@ import PreviewFile from '@comp/jero/PreviewFile'
 import JImageUpload from '@comp/jero/JImageUpload'
 import SetGuessUploadFlagModal from './modules/SetGuessUploadFlagModal'
 import { downloadFile } from '../../../api/manage'
-import WasicTopicData from "./modules/wasicStaticData";
+import WasicTopicData from './modules/wasicStaticData'
 
 
 export default {
diff --git a/src/views/incomePayments/meetManage/modules/wasicStaticData.js b/src/views/incomePayments/meetManage/modules/wasicStaticData.js
index 658d484..363b62f 100644
--- a/src/views/incomePayments/meetManage/modules/wasicStaticData.js
+++ b/src/views/incomePayments/meetManage/modules/wasicStaticData.js
@@ -35,8 +35,8 @@ const WasicTopicData = [
     children: [
       {
         'value': '99',
-        'text': '114/22焦点论坛（08:00-12:00，全体大会）',
-        'title': '114/22焦点论坛（08:00-12:00，全体大会）',
+        'text': '焦点论坛（08:00-12:00，全体大会）',
+        'title': '焦点论坛（08:00-12:00，全体大会）',
         // 'disabled': true
       }
     ],