Merge branch 'crm_15.9' into debug

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,14 @@ 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)
+	},	
+	//校验是否属于策略固收接口
+	rai_serve_search_chcck_PermissionName:params => {
+		return http.get('/cygx/rai_serve/chcck_PermissionName',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

@@ -4,11 +4,18 @@
         :visible.sync="isAddParticipateShow"
         width="500px"
         append-to-body
-        @close="$emit('close')"
+        @close="closeDlg"
     >
         <div class="partic-dialog-container">
+            <div v-if="isShowPermission" style="margin-bottom:20px">
+                <el-tag type="info" size="small"> {{this.chartPermissionName}}</el-tag>
+            </div>
+            <el-select v-else  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">
+                     
                     <el-autocomplete
                         class="inline-input"
                         v-model.trim="item.name"
@@ -38,7 +45,7 @@
         </div>
         <div slot="footer" class="dialog-footer" style="text-align: center;">
             <el-button type="primary" @click="confirmPerson">确定</el-button>
-            <el-button @click="$emit('close')">取消</el-button>
+            <el-button @click="closeDlg">取消</el-button>
         </div>
     </el-dialog>
 </template>
@@ -54,21 +61,32 @@ export default {
         RsCalendarId:{
             type:Number,
             default:0
+        },
+        ResearcherId:{
+            type:Number,
+            default:0
         }
     },
     watch:{
         isAddParticipateShow(newval){
             if(newval){
                 this.dynamicItem = [{name:'',isShow:false}]
+                this.getIsPermissionName()
             }
-        }
+        },
     },
     data() {
         return {
             dynamicItem:[{name:'',isShow:false}],
             companyList:[],
             timeout:0,
-            warningIsShow:false
+            warningIsShow:false,
+            hashtagValue:'',// 主题标签
+            hashtagOptions:[],// 主题数据
+            tagList:[],// /标签类型
+            tagName: '',
+            chartPermissionName:'',
+            isShowPermission:false
         };
     },
     methods: {
@@ -147,13 +165,63 @@ export default {
             if(!useId.length) return this.$message.error('请输入姓名')
             roadshowInterence.addMeetingUser({
                 RsCalendarId:this.RsCalendarId,
-                UserId:useId
+                UserId:useId,
+                TagList:this.tagList
             }).then(res=>{
                 if(res.Ret!==200) return 
                 this.$message.success('提交成功')
                 this.$emit('confirm')
             })
         },
+        // 获取标签
+        async remoteMethodHandler(query){
+          if (query !== '') {
+            let KeyWord = this.tagName? this.tagName + ',' + query : query;
+            const res = await roadshowInterence.rai_serve_search_tag({
+                KeyWord,
+                ResearcherId:this.ResearcherId,
+            })
+            if( res.Ret===200 ){
+                this.hashtagOptions = res.Data.List || []
+            }
+          }else if(!this.hashtagValue.length && !query){
+            this.hashtagOptions =[]
+          }
+        },
+        // 选择标签
+        tagSelectHandler(){
+            let tagListArr = []
+            let nameArr = []
+            this.hashtagOptions.forEach(item=>{
+                if(this.hashtagValue.length && this.hashtagValue.includes(item.Md5Key)) {
+                    tagListArr.push({
+                       TagType: item.TagType,
+                       TagId: item.TagId,
+                    })
+                    nameArr.push(item.TagName)
+                }
+            })
+            this.tagList = tagListArr
+            this.tagName = nameArr.join(',')
+        },
+        // 进入看看是否是策略
+        async getIsPermissionName(){
+            const res = await roadshowInterence.rai_serve_search_chcck_PermissionName({ResearcherId:this.ResearcherId})
+              if( res.Ret===200 ){
+                this.chartPermissionName = res.Data.ChartPermissionName
+                this.isShowPermission = res.Data.Belong
+            }
+        },
+        // 关闭弹框
+        closeDlg(){
+            this.hashtagValue = ''// 主题标签
+            this.hashtagOptions = []// 主题数据
+            this.tagList = []// /标签类型
+            this.tagName =  ''
+            this.chartPermissionName = ''
+            this.isShowPermission = false
+            this.$emit('close')
+        }
     },
 };
 </script>

src/views/roadshow_manage/compononts/showParticipateListDia.vue

@@ -4,9 +4,15 @@
         :visible.sync="isParticipateShow"
         width="700px"
         append-to-body
-        @close="$emit('close')"
+        @close="closeDlg"
     >
         <div class="partic-list-dialog-container">
+            <div v-if="isShowPermission" style="margin-bottom:20px">
+              <el-tag type="info" size="small"> {{this.chartPermissionName}}</el-tag>
+            </div>
+            <el-select v-else 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>
             <el-table :data="tableData" border>
                 <el-table-column align="center"
                     prop="RealName" label="姓名"
@@ -29,8 +35,9 @@
             </div>
         </div>
         <div slot="footer" class="dialog-footer" style="text-align: center;">
-            <el-button type="primary" @click="$emit('close')">确定</el-button>
-            <el-button @click="$emit('close')">取消</el-button>
+            <el-button @click="closeDlg">关闭</el-button>
+            <el-button type="primary" @click="saveTagsHandler">保存</el-button>
+
         </div>
         <addParticipateDia 
             :isAddParticipateShow="isAddShow"
@@ -53,18 +60,29 @@ export default {
         RsCalendarId: {
             type: Number,
             default: 0
+        },
+        ResearcherId:{
+            type:Number,
+            default:0
         }
     },
     data() {
         return {
             tableData: [],
-            isAddShow:false
+            isAddShow:false,
+            hashtagValue:[],// 主题标签
+            hashtagOptions:[],// 主题数据
+            tagList:[],// /标签类型
+            tagName: '',
+            chartPermissionName:'',
+            isShowPermission:false
         };
     },
     watch: {
         isParticipateShow(newval) {
             if (newval) {
                 this.getTableData();
+                this.getIsPermissionName()
             }
         },
     },
@@ -76,6 +94,15 @@ export default {
                 if (res.Ret !== 200)
                     return;
                 this.tableData = res.Data.List;
+                this.hashtagOptions = res.Data.ListLebel
+                console.log(res);
+                if(this.hashtagOptions.length){
+                    this.hashtagValue = []
+                    this.hashtagOptions.forEach(item=>{
+                        this.hashtagValue.push(item.Md5Key)
+                    })
+                    this.tagSelectHandler()
+                }
             });
         },
         addItem() {
@@ -90,6 +117,67 @@ export default {
                 this.getTableData()
             })
         },
+        // 获取标签
+        async remoteMethodHandler(query){
+          if (query !== '') {
+            let KeyWord = this.tagName? this.tagName + ',' + query : query;
+            const res = await roadshowInterence.rai_serve_search_tag({
+                KeyWord,
+                ResearcherId:this.ResearcherId,
+            })
+            if( res.Ret===200 ){
+                this.hashtagOptions = res.Data.List || []
+            }
+          }else if(!this.hashtagValue.length && !query){
+            this.hashtagOptions =[]
+          }
+        },
+        // 标签选择后处理
+        tagSelectHandler(){
+            let tagListArr = []
+            let nameArr = []
+            this.hashtagOptions.forEach(item=>{
+                if(this.hashtagValue.length && this.hashtagValue.includes(item.Md5Key)) {
+                    tagListArr.push({
+                       TagType: item.TagType,
+                       TagId: item.TagId,
+                    })
+                    nameArr.push(item.TagName)
+                }
+            })
+            this.tagList = tagListArr
+            this.tagName = nameArr.join(',')
+        },
+        // 提交标签
+        saveTagsHandler(){
+            if(!this.hashtagValue.length) return this.$message.error('请输入主题标签')
+            roadshowInterence.addMeetingUser({
+                RsCalendarId:this.RsCalendarId,
+                TagList:this.tagList
+            }).then(res=>{
+                if(res.Ret!==200) return 
+                this.$message.success('提交成功')
+                this.getTableData()
+            })
+        },
+        // 进入看看是否是策略
+        async getIsPermissionName(){
+            const res = await roadshowInterence.rai_serve_search_chcck_PermissionName({ResearcherId:this.ResearcherId})
+              if( res.Ret===200 ){
+                this.chartPermissionName = res.Data.ChartPermissionName
+                this.isShowPermission = res.Data.Belong
+            }
+        },
+        // 关闭弹框
+         closeDlg(){
+            this.hashtagValue = ''// 主题标签
+            this.hashtagOptions = []// 主题数据
+            this.tagList = []// /标签类型
+            this.tagName =  ''
+            this.chartPermissionName = ''
+            this.isShowPermission = false
+            this.$emit('close')
+        }
     },
     components: { addParticipateDia }
 };

src/views/roadshow_manage/myCalendar.vue

@@ -158,12 +158,12 @@
                   <span 
                     class="deletesty"
                     v-if="row.SubmitButton"
-                    @click="currentRsCalendarId=row.RsCalendarId;isAddParticipateShow=true;"
+                    @click="submitAttendees(row,'提交')"
                   >提交参会名单</span>
                   <span
                     class="editsty"
                     v-if="row.ViewButton"
-                    @click="currentRsCalendarId=row.RsCalendarId;isParticipateShow=true;"
+                    @click="submitAttendees(row,'查看')"
                   >查看参会名单
                   </span>
             </template>
@@ -296,6 +296,7 @@
     <addParticipateDia 
         :isAddParticipateShow="isAddParticipateShow"
         :RsCalendarId="currentRsCalendarId"
+        :ResearcherId="currentResearcherId"
         @close="isAddParticipateShow=false"
         @confirm="getCalendarList();isAddParticipateShow=false;"
     />
@@ -303,6 +304,7 @@
     <showParticipateListDia 
         :isParticipateShow="isParticipateShow"
         :RsCalendarId="currentRsCalendarId"
+        :ResearcherId="currentResearcherId"
         @close="isParticipateShow=false"
     />
   </div>
@@ -405,7 +407,8 @@ export default {
           text:'',
           time:''
       },
-      isReasonDiaShow:false
+      isReasonDiaShow:false,
+      currentResearcherId:0,
     };
   },
   methods: {
@@ -733,8 +736,13 @@ 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,type){
+      type==='查看'? (this.isParticipateShow = true)  : (this.isAddParticipateShow = true)
+      this.currentRsCalendarId = row.RsCalendarId
+      this.currentResearcherId = row.ResearcherId
+    },
   },
   mounted() {
     this.init();