957

src/components/calendar.vue

@@ -468,9 +468,9 @@ export default {
     // 处理赋值函数
     getReservationList() {
       const arr = this.eventList.map((item) => {
-        let title = (this.isSeller && item.ActivityType==='路演')
+        let title = (this.isSeller && (item.ActivityType==='路演'))
         ? `${item.CompanyName}${item.CompanyStatus ? '('+ item.CompanyStatus + ')' : ''}` 
-        : (this.isSeller && item.ActivityType==='公开会议')
+        : (this.isSeller && (item.ActivityType==='公开会议' || item.ActivityType==='沙龙'))
         ? item.Theme 
         : this.setDynamicTitle(item);
 
@@ -493,7 +493,6 @@ export default {
         };
       });
       this.calendarOptions.events = arr
-      console.log(this.eventList)
     },
 
     /* 拆分出活动id相同的数组和不同的数组 */

src/views/roadshow_manage/compononts/addActivityBtnDia.vue

@@ -20,7 +20,6 @@
             v-model="formData.activityType"
             placeholder="请选择活动类型"
             @change="activityTypeChange"
-            :disabled="edit_id||isRaiRole"
           >
             <el-option
               v-for="(type, index) in permission.activityTypeList"
@@ -52,34 +51,37 @@
                 :options="telTypeList">
             </el-cascader>
         </el-form-item>
-        <el-form-item
-          label="路演形式"
-          v-if="formData.activityType === '路演'"
-          prop="roadshowType"
-        >
-          <el-select
-            v-model="formData.roadshowType"
-            placeholder="请先选择路演形式"
+         <el-form-item
+            :label="`${formData.activityType}形式`"
+            v-if="formData.activityType === '路演' || formData.activityType === '沙龙'"
+            prop="roadshowType"
+            :rules="{ required: true, message: `请选择${formData.activityType}形式`, trigger: 'change' }"
           >
-            <el-option value="线上"></el-option>
-            <el-option value="线下"></el-option>
-          </el-select>
+            <el-select
+              v-model="formData.roadshowType"
+              :placeholder="`请先选择${formData.activityType}形式`"
+            >
+              <el-option value="线上"></el-option>
+              <el-option value="线下"></el-option>
+            </el-select>
         </el-form-item>
         <el-form-item
-          label="路演平台"
-          v-if="formData.roadshowType === '线上' && formData.activityType === '路演'"
+          :label="`${formData.activityType}平台`"
+          v-if="formData.roadshowType === '线上' && (formData.activityType === '路演' || formData.activityType === '沙龙')"
           prop="roadshowPlatform"
+          :rules="{ required: true, message: `请选择${formData.activityType}平台`, trigger: blur }"
         >
           <el-input
             v-model="formData.roadshowPlatform"
-            placeholder="请输入路演平台(eg：进门财经、腾讯会议)"
+            :placeholder="`请输入${formData.activityType}平台(eg：进门财经、腾讯会议)`"
           >
           </el-input>
         </el-form-item>
         <el-form-item
-          label="路演城市"
-          v-if="formData.roadshowType === '线下' && formData.activityType === '路演'"
+          :label="`${formData.activityType}城市`"
+          v-if="formData.roadshowType === '线下' && (formData.activityType === '路演' || formData.activityType === '沙龙')"
           prop="roadshowCity"
+          :rules="{ required: true, message: `请选择${formData.activityType}城市`, trigger: blur }"
         >
           <!-- <v-distpicker 
             ref="roadshowCity"
@@ -186,7 +188,7 @@
         </el-form-item>
         <el-form-item
           label="会议主题"
-          v-if="formData.activityType === '公开会议'"
+          v-if="formData.activityType === '公开会议' || formData.activityType === '沙龙'"
           prop="meetingTheme"
         >
           <el-input
@@ -510,7 +512,6 @@ export default {
     },
     initData(val){
       this.formData={...this.formData,...val}
-      console.log(this.formData)
     }
   },
   computed: {
@@ -602,7 +603,7 @@ export default {
       
       let parmas;
 
-      const param_research = ['公开会议', '路演'].includes(
+      const param_research = ['公开会议', '路演','沙龙'].includes(
         this.formData.activityType
       )
         ? this.formData.selectResearchers.map((item) => ({
@@ -665,7 +666,6 @@ export default {
         EnglishCompany:this.formData.englishCompany
       };
 
-      console.log(parmas);
       const res =  this.edit_id
       ? await roadshowInterence.editRoadshow({
           ...parmas,
@@ -675,7 +675,6 @@ export default {
         }) : await roadshowInterence.addRoadshow(parmas);
 
       if (res.Ret !== 200) return;
-
       const { text, content, query } = this.setDynamicLink(
         this.formData.activityType
       );
@@ -692,7 +691,6 @@ export default {
         //判断所选研究员是否有权益
         const ResearcherIds = this.formData.selectResearchers.map(i=>i.researcherId)
         const ResearcherTypes = ResearcherIds.map(i=>this.findType(i))
-        console.log('types',ResearcherTypes)
         //既有权益研究员的路演，又有ficc研究员路演时，提示弹窗
         if(ResearcherTypes.includes('rai')&&ResearcherTypes.includes('ficc')){
             const { text, content, query } = this.setDynamicLink(
@@ -802,7 +800,6 @@ export default {
       });
       if (res.Ret === 200) {
         let arr = res.Data || [];
-        console.log(arr);
         if (!arr.length) {
           cb([{ nodata: true }]);
         } else {

src/views/roadshow_manage/compononts/addActivityCellDia.vue

@@ -117,7 +117,6 @@
             v-model="formData.activityType"
             placeholder="请选择活动类型"
             @change="activityTypeChange"
-            :disabled="edit_id||isRaiRole"
           >
             <el-option
               v-for="(type, index) in permission.activityTypeList"
@@ -128,33 +127,36 @@
           </el-select>
         </el-form-item>
         <el-form-item
-          label="路演形式"
-          v-if="formData.activityType === '路演'"
+          :label="`${formData.activityType}形式`"
+          v-if="formData.activityType === '路演' || formData.activityType === '沙龙'"
           prop="roadshowType"
+          :rules="{ required: true, message: `请选择${formData.activityType}形式`, trigger: 'change' }"
         >
           <el-select
             v-model="formData.roadshowType"
-            placeholder="请先选择路演形式"
+            :placeholder="`请先选择${formData.activityType}形式`"
           >
             <el-option value="线上"></el-option>
             <el-option value="线下"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item
-          label="路演平台"
-          v-if="formData.roadshowType === '线上' && formData.activityType === '路演'"
+          :label="`${formData.activityType}平台`"
+          v-if="formData.roadshowType === '线上' && (formData.activityType === '路演' || formData.activityType === '沙龙')"
           prop="roadshowPlatform"
+          :rules="{ required: true, message: `请选择${formData.activityType}平台`, trigger: blur }"
         >
           <el-input
             v-model="formData.roadshowPlatform"
-            placeholder="请输入路演平台(eg：进门财经、腾讯会议)"
+            :placeholder="`请输入${formData.activityType}平台(eg：进门财经、腾讯会议)`"
           >
           </el-input>
         </el-form-item>
         <el-form-item
-          label="路演城市"
-          v-if="formData.roadshowType === '线下' && formData.activityType === '路演'"
+          :label="`${formData.activityType}城市`"
+          v-if="formData.roadshowType === '线下' && (formData.activityType === '路演' || formData.activityType === '沙龙')"
           prop="roadshowCity"
+          :rules="{ required: true, message: `请选择${formData.activityType}城市`, trigger: blur }"
         >
           <!-- <v-distpicker
             ref="roadshowCity"
@@ -250,7 +252,7 @@
         </el-form-item>
         <el-form-item
           label="会议主题"
-          v-if="formData.activityType === '公开会议'"
+          v-if="formData.activityType === '公开会议' || formData.activityType === '沙龙'"
           prop="meetingTheme"
         >
           <el-input
@@ -633,7 +635,6 @@ export default {
         //判断所选研究员是否有权益
         const ResearcherIds = this.formData.selectResearchers.map(i=>i.researcherId)
         const ResearcherTypes = ResearcherIds.map(i=>this.findType(i))
-        console.log('types',ResearcherTypes)
         //既有权益研究员的路演，又有ficc研究员路演时，提示弹窗
         if(ResearcherTypes.includes('rai')&&ResearcherTypes.includes('ficc')){
             const { text, content, query } = this.setDynamicLink(
@@ -705,7 +706,6 @@ export default {
         });
         if (res.Ret === 200) {
           let arr = res.Data || [];
-          console.log(arr);
           if (!arr.length) {
             cb([{ nodata: true }]);
           } else {

src/views/roadshow_manage/myCalendar.vue

@@ -53,7 +53,7 @@
 
               <!-- 客户拼接 -->
               <span v-else-if="item.key === 'company'">
-                {{ row.CooperationName || row.CompanyName }}
+                {{ row.CooperationName || row.CompanyName || '——'}}
 
                 <el-tooltip effect="dark" placement="top-start" v-if="row.CompanyId"  @mouseenter.native="getCompanyInfo(row)" popper-class="company-tip-poper">
                   <i class="el-icon-info"/>
@@ -733,8 +733,6 @@ 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);
-
-      console.log(this.tableColums,this.handleArr)
     }
 
   },

src/views/roadshow_manage/roleConfig/activityBtnDiaConfig.js

@@ -3,7 +3,11 @@ const seller_obj = {
     defaultActivityType: '内部会议',
     activityTypeList:['路演','内部会议','公开会议'],
 }
-
+//销售
+const seller_obj_rai = {
+    defaultActivityType: '内部会议',
+    activityTypeList:['路演','沙龙'],
+}
 //研究员 ficc管理员
 const researcher_obj = {
     defaultActivityType: '内部会议',
@@ -21,11 +25,11 @@ export default {
     // ficc销售权限
     ficc_seller: seller_obj,
     // 权益销售权限
-    rai_seller: seller_obj,
+    rai_seller: seller_obj_rai,
     // ficc组长权限
     ficc_group: seller_obj,
     // 权益组长权限
-    rai_group: seller_obj,
+    rai_group: seller_obj_rai,
     // ficc管理员权限
     ficc_admin: researcher_obj,
     // 权益管理员权限

src/views/roadshow_manage/roleConfig/activityCellDiaConfig.js

@@ -1,9 +1,13 @@
 //销售
-const seller_obj = {
+const seller_obj_ficc = {
     defaultActivityType: '路演',
     activityTypeList:['路演','内部会议','公开会议'],
 }
-
+//销售
+const seller_obj_rai = {
+    defaultActivityType: '路演',
+    activityTypeList:['路演','沙龙'],
+}
 //研究员 ficc管理员
 const researcher_obj = {
     defaultActivityType: '内部会议',
@@ -19,13 +23,13 @@ const admin_obj = {
 // 单元格添加活动弹窗权限
 export default {
     // ficc销售权限
-    ficc_seller: seller_obj,
+    ficc_seller: seller_obj_ficc,
     // 权益销售权限
-    rai_seller: seller_obj,
+    rai_seller: seller_obj_rai,
     // ficc组长权限
-    ficc_group: seller_obj,
+    ficc_group: seller_obj_ficc,
     // 权益组长权限
-    rai_group: seller_obj,
+    rai_group: seller_obj_rai,
     // ficc管理员权限
     ficc_admin: researcher_obj,
     // 权益管理员权限

src/views/roadshow_manage/roleConfig/mixins.js

@@ -6,15 +6,15 @@ export default {
 				activityType: [
 					{ required: true, message: "请选择活动类型", trigger: "change" },
 				],
-				roadshowType: [
-					{ required: true, message: "请选择路演形式", trigger: "change" },
-				],
-				roadshowPlatform: [
-					{ required: true, message: "请选择路演平台", trigger: "blur" },
-				],
-				roadshowCity: [
-					{ required: true, message: "请选择路演城市", trigger: "blur" },
-				],
+				// roadshowType: [
+				// 	{ required: true, message: "请选择路演形式", trigger: "change" },
+				// ],
+				// roadshowPlatform: [
+				// 	{ required: true, message: "请选择路演平台", trigger: "blur" },
+				// ],
+				// roadshowCity: [
+				// 	{ required: true, message: "请选择路演城市", trigger: "blur" },
+				// ],
 				companyName: [
 					{ required: true, message: "请选择客户", trigger: "blur" },
 				],
@@ -70,6 +70,13 @@ export default {
             act_tab: 1
           },
         }
+		case '沙龙' : return {
+			text: '活动申请已提交，请等待研究员处理',
+			content: `可前往【我的日历】-【待处理申请】查看`,
+			query: {
+			  act_tab: 1
+			},
+		  }
         case 'ficc&rai路演' : return {
             text: '权益研究员日历已添加成功，ficc研究员日历已发送申请，请等待处理',
             content: `可前往【我的日历】`,