Merge branch 'xqc_961' into crm_15.9

src/views/roadshow_manage/compononts/addParticipateDia.vue

@@ -7,8 +7,12 @@
         @close="$emit('close')"
     >
         <div class="partic-dialog-container">
+            <el-select v-model="hashtagValue" multiple filterable remote reserve-keyword placeholder="请输入路演主题标签(可多选)" :remote-method="remoteMethod" style="width:392px;margin-bottom:20px">
+                 <el-option v-for="item in hashtagOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+            </el-select>
             <div class="inline" v-for="(item, index) in dynamicItem" :key="index">
                 <div class="inline-content">
+                     
                     <el-autocomplete
                         class="inline-input"
                         v-model.trim="item.name"
@@ -68,7 +72,9 @@ export default {
             dynamicItem:[{name:'',isShow:false}],
             companyList:[],
             timeout:0,
-            warningIsShow:false
+            warningIsShow:false,
+            hashtagValue:'',// 主题标签
+            hashtagOptions:[],// 主题数据
         };
     },
     methods: {
@@ -154,6 +160,9 @@ export default {
                 this.$emit('confirm')
             })
         },
+        remoteMethod(query){
+          if (query !== '') {}
+        },
     },
 };
 </script>

src/views/roadshow_manage/compononts/showParticipateListDia.vue

@@ -7,6 +7,9 @@
         @close="$emit('close')"
     >
         <div class="partic-list-dialog-container">
+            <el-select v-model="hashtagValue" multiple filterable remote reserve-keyword placeholder="请输入路演主题标签(可多选)" :remote-method="remoteMethod" style="width:392px;margin-bottom:20px">
+                 <el-option v-for="item in hashtagOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+            </el-select>
             <el-table :data="tableData" border>
                 <el-table-column align="center"
                     prop="RealName" label="姓名"
@@ -58,7 +61,9 @@ export default {
     data() {
         return {
             tableData: [],
-            isAddShow:false
+            isAddShow:false,
+            hashtagValue:'',// 主题标签
+            hashtagOptions:[],// 主题数据
         };
     },
     watch: {
@@ -90,6 +95,9 @@ export default {
                 this.getTableData()
             })
         },
+        remoteMethod(query){
+          if (query !== '') {}
+        },
     },
     components: { addParticipateDia }
 };