1

src/api/modules/ficcApi.js

@@ -209,12 +209,12 @@ export const ficcManageInterface={
 	delSpeakerCheck:params=>{
 		return http.post('/yb/speaker/del_check',params)
 	},
-  //全时会议分享销售
-  qs_shareSeller:params=>{
-    return http.post('/yb/activity/qs_share2seller',params)
-  },
-  //进门到会分享销售
-  jm_shareSeller:params=>{
-    return http.post('/yb/activity/comein/share2seller',params)
-  }
+	//全时会议分享销售
+	qs_shareSeller:params=>{
+		return http.post('/yb/activity/qs_share2seller',params)
+	},
+	//进门到会分享销售
+	jm_shareSeller:params=>{
+		return http.post('/yb/activity/comein/share2seller',params)
+	}
 }

src/api/modules/roadshowApi.js

@@ -360,6 +360,10 @@ const roadshowInterence={
 	getResearcherBusinessTrip: params => {
 		return http.get('/roadshow/report/researcher/business_trip',params)
 	},
+	//标签搜索（研究员日历添加到会信息）
+	rai_serve_search_tag:params => {
+		return http.get('/cygx/rai_serve/search_tag_by_calendar',params)
+	},	
 }
 
 export {

src/views/custom_manage/contacts/compontents/contactsColums.js

@@ -348,6 +348,25 @@ export const tableColums = (type) => {
           key: "CreateTime",
         },
       ]
+    : type === 15
+    ? [
+        {
+          label: "路演时间",
+          key: "ActivityTimeText",
+        },
+        {
+          label: "研究员",
+          key: "ResearcherName",
+        },
+        {
+          label: "路演形式",
+          key: "ActivityType",
+        },
+        {
+          label: "主题标签",
+          key: "LabelKeyWord",
+        },
+      ]
     : [];
 };
 
@@ -837,6 +856,33 @@ export const organizationTableColums = (type) => {
           key: "CreateTime",
         },
       ]
+    : type === 15
+    ? [
+        {
+          label: "姓名",
+          key: "RealName",
+        },
+        {
+          label: "手机号",
+          key: "Mobile",
+        },
+        {
+          label: "路演时间",
+          key: "ActivityTimeText",
+        },
+        {
+          label: "研究员",
+          key: "ResearcherName",
+        },
+        {
+          label: "路演形式",
+          key: "ActivityType",
+        },
+        {
+          label: "主题标签",
+          key: "LabelKeyWord",
+        },
+      ]
     : [];
 };
 
@@ -1358,5 +1404,36 @@ export const wholeOrganizationTableColums = (type) => {
           key: "CreateTime",
         },
       ]
+    : type === 15
+    ? [
+        {
+          label: "客户名称",
+          key: "CompanyName",
+        },
+        {
+          label: "姓名",
+          key: "RealName",
+        },
+        {
+          label: "手机号",
+          key: "Mobile",
+        },
+        {
+          label: "路演时间",
+          key: "ActivityTimeText",
+        },
+        {
+          label: "研究员",
+          key: "ResearcherName",
+        },
+        {
+          label: "路演形式",
+          key: "ActivityType",
+        },
+        {
+          label: "主题标签",
+          key: "LabelKeyWord",
+        },
+      ]
     : [];
 };

src/views/custom_manage/contacts/mixins/mutualAssistance.js

@@ -138,7 +138,7 @@ export const mutualMixin = {
       } else if (key == "Source") {
         return row[key] == 1 ? "纪要" : row[key] == 2 ? "图表" : row[key] == 3 ? "纪要/图表" : row[key] == 4 ? "产业资源包" : row[key] == 5 ? "报告" : "活动";
       } else if (key == "ActivityType") {
-        return row[key] == 1 ? "线上" : `线下(${row["City"]})`;
+        return row[key] == 1 ? "线上" : row["City"] ? `线下(${row["City"]})` : "线下";
       } else if (key == "SpecialType") {
         return row[key] == 1 ? "笔记" : row[key] == 2 ? "观点" : "";
       } else {

src/views/custom_manage/contacts/mutualList.vue

@@ -49,8 +49,9 @@
       <template v-if="activeName != 4">
         <el-table style="margin-top: 20px" :data="tableData" v-loading="tableLoading" element-loading-text="数据加载中..." border>
           <el-table-column v-for="item in tableColumsList" :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center">
-            <template slot-scope="{ row }">
-              <span @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
+            <template slot-scope="{ row }" >
+              <span v-if="item.key !== 'LabelKeyWord'" @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
+              <div v-else>  <el-tag style="margin: 5px" type="info" size="small" v-for="tag in row.LabelKeyWord.split(',')" :key="tag">{{ tag }}</el-tag></div>
             </template>
           </el-table-column>
           <div slot="empty" style="padding: 20px 0">

src/views/custom_manage/contacts/organizationList.vue

@@ -55,7 +55,8 @@
         <el-table style="margin-top: 20px" :data="tableData" v-loading="tableLoading" element-loading-text="数据加载中..." border>
           <el-table-column v-for="item in tableColumsList" :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center">
             <template slot-scope="{ row }">
-              <span @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
+              <span v-if="item.key !== 'LabelKeyWord'" @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
+              <div v-else>  <el-tag style="margin: 5px" type="info" size="small" v-for="tag in row.LabelKeyWord.split(',')" :key="tag">{{ tag }}</el-tag></div>
             </template>
           </el-table-column>
           <div slot="empty" style="padding: 20px 0">

src/views/custom_manage/contacts/wholeOrganization.vue

@@ -61,7 +61,8 @@
         <el-table style="margin-top: 20px" :data="tableData" v-loading="tableLoading" element-loading-text="数据加载中..." border>
           <el-table-column v-for="item in tableColumsList" :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center">
             <template slot-scope="{ row }">
-              <span @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
+              <span v-if="item.key !== 'LabelKeyWord'" @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
+              <div v-else>  <el-tag style="margin: 5px" type="info" size="small" v-for="tag in row.LabelKeyWord.split(',')" :key="tag">{{ tag }}</el-tag></div>
             </template>
           </el-table-column>
           <div slot="empty" style="padding: 20px 0">

src/views/roadshow_manage/compononts/addParticipateDia.vue

@@ -7,8 +7,8 @@
         @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 v-model="hashtagValue" multiple filterable remote reserve-keyword placeholder="请输入路演主题标签(可多选)" :remote-method="remoteMethodHandler" style="width:392px;margin-bottom:20px" @change="tagSelectHandler">
+                 <el-option v-for="item in hashtagOptions" :key="item.Md5Key" :label="item.TagName" :value="item.Md5Key"> </el-option>
             </el-select>
             <div class="inline" v-for="(item, index) in dynamicItem" :key="index">
                 <div class="inline-content">
@@ -58,6 +58,10 @@ export default {
         RsCalendarId:{
             type:Number,
             default:0
+        },
+        ResearcherId:{
+            type:Number,
+            default:0
         }
     },
     watch:{
@@ -75,6 +79,8 @@ export default {
             warningIsShow:false,
             hashtagValue:'',// 主题标签
             hashtagOptions:[],// 主题数据
+            tagIdTypes:[],// /标签类型
+            tagIds:[],//标签ID
         };
     },
     methods: {
@@ -160,9 +166,31 @@ export default {
                 this.$emit('confirm')
             })
         },
-        remoteMethod(query){
-          if (query !== '') {}
+      async remoteMethodHandler(query){
+          if (query !== '') {
+            const res = await roadshowInterence.rai_serve_search_tag({
+                KeyWord:query,
+                ResearcherId:this.ResearcherId,
+            })
+            if( res.Ret===200 ){
+                this.hashtagOptions = res.Data.List || []
+            }
+          }else if(!this.hashtagValue && !query){
+            this.hashtagOptions =[]
+          }
         },
+        tagSelectHandler(){
+            let types = []
+            let ids =[]
+            this.hashtagOptions.forEach(item=>{
+                if(this.hashtagValue && this.hashtagValue.includes(item.Md5Key)) {
+                    types.push(item.TagType)
+                    ids.push(item.TagId)
+                }
+            })
+            
+            console.log(arr,this.hashtagValue);
+        }
     },
 };
 </script>

src/views/roadshow_manage/myCalendar.vue

@@ -158,7 +158,7 @@
                   <span 
                     class="deletesty"
                     v-if="row.SubmitButton"
-                    @click="currentRsCalendarId=row.RsCalendarId;isAddParticipateShow=true;"
+                    @click="submitAttendees(row)"
                   >提交参会名单</span>
                   <span
                     class="editsty"
@@ -296,6 +296,7 @@
     <addParticipateDia 
         :isAddParticipateShow="isAddParticipateShow"
         :RsCalendarId="currentRsCalendarId"
+        :ResearcherId="currentResearcherId"
         @close="isAddParticipateShow=false"
         @confirm="getCalendarList();isAddParticipateShow=false;"
     />
@@ -405,7 +406,8 @@ export default {
           text:'',
           time:''
       },
-      isReasonDiaShow:false
+      isReasonDiaShow:false,
+      currentResearcherId:0,
     };
   },
   methods: {
@@ -733,8 +735,14 @@ export default {
       this.default_tab = this.$route.query.act_tab ? this.$route.query.act_tab : this.Role === 'admin' ? 3 : 1;
       this.tableColums = tableColums(this.default_tab);
       this.handleArr = handleArr(this.default_tab);
-    }
-
+    },
+    // 提交参会名单
+    submitAttendees(row){
+      console.log(112333);
+      this.isAddParticipateShow = true
+      this.currentRsCalendarId = row.RsCalendarId
+      this.currentResearcherId = row.ResearcherId
+    },
   },
   mounted() {
     this.init();