Merge branch 'crm_17.0' into debug

src/api/modules/roadshowApi.js

@@ -380,7 +380,19 @@ const roadshowInterence={
 	// 客户路演问答汇总
 	roadShowQuestionSummary:params=>{
 		return http.get('/roadshow/question/summary/list',params)
-	}
+	},
+	// 活动FICC销售列表
+	ficcSellerList:params=>{
+		return http.get('/custom/seller/activity_ficc/list',params)
+	},	
+	// 新增活动FICC
+	ficcAddActivity:params=>{
+		return http.post('/roadshow_seller/add',params)
+	},	
+	// 删除新增活动FICC
+	ficcDeleteActivity:params=>{
+		return http.post('/roadshow_seller/delete',params)
+	},	
 }
 
 export {

src/components/calendar.vue

@@ -406,7 +406,7 @@ export default {
                 RoadshowType:RoadshowType
             }].filter(item=>item.RoadshowType===RoadshowType)
         ////ActivityType不为空时，需要显示的内容
-        const {ResearcherName,SysUserRealName} = this.selectEventInfo
+        const {ResearcherName,SysUserRealName,SellerName} = this.selectEventInfo
         const SuppleContent=[{
             key:'ResearcherName',
             label:'研究员：',
@@ -416,6 +416,27 @@ export default {
             label:'发起人：',
             content:`${SysUserRealName}`,
         }]
+        // ficc 新增活动后的展示
+        const ficcSuppleContent=[{
+            key:'Theme',
+            label:'会议主题：',
+            content:`${Theme}`,
+        },
+        {
+            key:'CompanyName',
+            label:'客户名称：',
+            content:`${CompanyName}`,
+        },
+        {
+            key:'SellerName',
+            label:'销售：',
+            content:`${SellerName}`,
+        },
+        {
+            key:'SysUserRealName',
+            label:'发起人：',
+            content:`${SysUserRealName}`,
+        }]
         //ActivityType为空时，需要显示的内容
         const {MatterContent,EditReason,ModifyTime} = this.selectEventInfo
         const MattersContent=[{
@@ -435,7 +456,8 @@ export default {
             '沙龙':SalonContent,
         }
         if(ActivityType){
-            this.popContentArr = [...popContent,...contentMap[ActivityType]||[],...SuppleContent]
+            let content = ['参会','拜访'].includes(ActivityType) ? ficcSuppleContent : SuppleContent
+            this.popContentArr = [...popContent,...contentMap[ActivityType]||[],...content]
         }else{
             this.popContentArr = [...popContent,...MattersContent]
         }
@@ -584,7 +606,9 @@ export default {
       if(Source === 1) return Title;
 
       switch(ActivityType || RsMattersId) {
-        case '内部会议': return ActivityType;
+        case '内部会议':
+        case '参会':
+        case '拜访': return ActivityType;
         case '沙龙': return Theme;
         case '公开会议': return `${RoadshowType}${ActivityType}(${RoadshowType==='线上' ? RoadshowPlatform : Province+City})`;
         case '路演': return `${RoadshowType}${ActivityType}(${RoadshowType==='线上' ? RoadshowPlatform : Province+City})`;
@@ -712,6 +736,11 @@ export default {
     .content-item{
         display: flex;
         margin-top: 5px;
+        .label {
+          width: 80px;
+          display: inline-block;
+          text-align: right;
+        }
         .content{
             .other-text{
                 color:#999;

src/views/custom_manage/compontents/accumulativeFrequencyDlg.vue

@@ -11,7 +11,7 @@
           <el-table-column prop="RoadShowTime" label="路演日期" align="center"> </el-table-column>
           <el-table-column prop="RoadshowType" label="路演形式" align="center"> </el-table-column>
           <el-table-column prop="RoadshowPlatform" label="路演平台" align="center"> </el-table-column>
-          <el-table-column prop="Researchers" label="研究员" align="center"> </el-table-column>
+          <el-table-column prop="Researchers" label="研究员/销售" align="center"> </el-table-column>
           <el-table-column prop="SysUserRealName" label="对接销售" align="center"> </el-table-column>
         </el-table>
       </div>
@@ -68,4 +68,3 @@ export default {
   },
 };
 </script>
-<style scoped lang="less"></style>

src/views/roadshow_manage/compononts/sellerAddAct.vue

@@ -0,0 +1,331 @@
+<template>
+  <div class="activity-btn-dia">
+    <el-dialog v-dialogDrag title="添加活动" :visible.sync="isShow" :modal-append-to-body="false" @close="cancel" width="500px">
+      <el-form ref="form" :model="formData" :rules="rules" label-width="100px" label-position="left">
+        <el-form-item label="活动类型" prop="activityType">
+          <el-select v-model="formData.activityType" placeholder="请选择活动类型" @change="activityTypeChange">
+            <el-option v-for="(item, index) in activityTypeList" :key="index" :label="item.label" :value="item.keyCode"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="会议主题" prop="meetingTheme">
+          <el-input v-model="formData.meetingTheme" placeholder="请输入会议主题"> </el-input>
+        </el-form-item>
+
+        <el-form-item label="客户名称" prop="companyName">
+          <el-autocomplete v-model="formData.companyName" popper-class="company-autocomplete" :fetch-suggestions="companySearch" placeholder="请输入客户名称" @select="companySelect" clearable>
+            <template slot-scope="{ item }">
+              <div v-if="item.nodata" style="text-align: center">暂无数据</div>
+              <div class="name" v-else>{{ item.CompanyName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+        <el-form-item label="销售" prop="sellerUser">
+          <!-- <el-input v-model="formData.sellerUser" placeholder="请选择人员"> </el-input> -->
+          <el-cascader
+            v-model="formData.sellerUser"
+            :options="sellerList"
+            :show-all-levels="false"
+            :props="{
+              expandTrigger: 'hover',
+              children: 'Child',
+              emitPath: false,
+              label: 'AdminName',
+              value: 'AdminId',
+              multiple: true,
+            }"
+            filterable
+            collapse-tags
+            clearable
+            placeholder="请选择销售"
+          />
+        </el-form-item>
+
+        <el-form-item label="开始时间" prop="selectResearchers[0].startTime" :rules="[{ required: true, message: '请选择开始时间', trigger: 'blur' }]">
+          <el-col :span="12">
+            <date-picker
+              format="MM.DD(ddd)"
+              v-model="formData.selectResearchers[0].startDate"
+              style="width: 100% !important"
+              :clearable="false"
+              :editable="false"
+              @change="(value) => startTimeChange('date', value, formData.selectResearchers[0])"
+            >
+              <template #icon-calendar>
+                <i class="el-icon-date"></i>
+              </template>
+            </date-picker>
+          </el-col>
+          <el-col :span="12">
+            <date-picker
+              format="HH:mm"
+              type="time"
+              :show-second="false"
+              v-model="formData.selectResearchers[0].startTime"
+              style="width: 100% !important"
+              :clearable="false"
+              :editable="false"
+              @change="(value) => startTimeChange('time', value, formData.selectResearchers[0])"
+            >
+              <template #icon-calendar>
+                <i class="el-icon-time"></i>
+              </template>
+            </date-picker>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="selectResearchers[0].endTime" :rules="[{ required: true, message: '请选择结束时间', trigger: 'blur' }]">
+          <el-col :span="12">
+            <date-picker format="MM.DD(ddd)" v-model="formData.selectResearchers[0].endDate" style="width: 100% !important" :clearable="false" :editable="false">
+              <template #icon-calendar>
+                <i class="el-icon-date"></i>
+              </template>
+            </date-picker>
+          </el-col>
+          <el-col :span="12">
+            <date-picker format="HH:mm" type="time" :show-second="false" v-model="formData.selectResearchers[0].endTime" style="width: 100% !important" :clearable="false" :editable="false">
+              <template #icon-calendar>
+                <i class="el-icon-time"></i>
+              </template>
+            </date-picker>
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="btn-group">
+        <el-button @click="cancel">取消</el-button>
+        <el-button type="primary" @click="confirm">确定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { roadshowInterence } from "@/api/api.js";
+import { confirmDiaLink } from "../roleConfig";
+
+export default {
+  props: {
+    isShow: {
+      type: Boolean,
+      require: true,
+      default: false,
+    },
+    sellerList: {
+      type: Array,
+      require: true,
+      default: [],
+    },
+  },
+
+  data() {
+    return {
+      formData: {
+        activityType: "参会", // 活动类型
+        meetingTheme: "", // 会议主题
+        companyName: "", // 客户名称
+        sellerUser: "", // 销售
+        companyId: "", //客户ID
+        englishCompany: "",
+        selectResearchers: [
+          {
+            startDate: null,
+            startTime: null,
+            endDate: null,
+            endTime: null,
+          },
+        ],
+      }, // 表单数据
+      rules: {
+        activityType: [{ required: true, message: "请选择活动类型", trigger: "blur" }],
+        meetingTheme: [{ required: true, message: "请输入会议主题", trigger: "blur" }],
+        companyName: [{ required: true, message: "请输入客户名称", trigger: "blur" }],
+        sellerUser: [{ required: true, message: "请选择人员", trigger: "blur" }],
+      },
+      companyInfo: null,
+      activityTypeList: [
+        {
+          label: "参会",
+          keyCode: "参会",
+        },
+        {
+          label: "拜访",
+          keyCode: "拜访",
+        },
+      ],
+    };
+  },
+  methods: {
+    // 取消按钮
+    cancel() {
+      this.$refs.form.resetFields();
+      this.$emit("update:isShow", false);
+    },
+
+    // 确认按钮
+    async confirm() {
+      await this.$refs.form.validate();
+      const res = await roadshowInterence.ficcAddActivity({
+        ActivityType: this.formData.activityType, //活动类型
+        Theme: this.formData.meetingTheme, //会议主题
+        CompanyId: this.formData.companyId, //客户id
+        CompanyName: this.formData.companyName, //客户名称
+        EnglishCompany: this.formData.englishCompany,
+        SellerId: this.formData.sellerUser.toString(),
+        SellerName: this.findResearcherName(),
+        StartDate: this.$moment(this.formData.selectResearchers[0].startDate).format("YYYY-MM-DD"),
+        EndDate: this.$moment(this.formData.selectResearchers[0].endDate).format("YYYY-MM-DD"),
+        StartTime: this.$moment(this.formData.selectResearchers[0].startTime).format("HH:mm:ss"),
+        EndTime: this.$moment(this.formData.selectResearchers[0].endTime).format("HH:mm:ss"),
+        StartWeek: this.$moment(this.formData.selectResearchers[0].startDate).format("ddd"),
+        EndWeek: this.$moment(this.formData.selectResearchers[0].endDate).format("ddd"),
+      });
+      if (res.Ret === 200) {
+        this.cancel();
+        this.$emit("updateList");
+        confirmDiaLink("添加成功，已加入销售员日历", "可前往【我的日历】-【活动】查看", {act_tab:6});
+      }
+    },
+    findResearcherName() {
+      let userName = [];
+      const result = this.sellerList.flatMap((group) =>
+        group.Child
+          ? group.Child.map((child) => ({
+              ...child,
+              GroupName: group.GroupName,
+            }))
+          : []
+      );
+      result.forEach((item) => {
+        if (this.formData.sellerUser.includes(item.AdminId)) {
+          userName.push(item.AdminName);
+        }
+      });
+      return userName.toString();
+    },
+    // 客户名称搜索
+    async companySearch(query, cb) {
+      cb([]);
+      if (!query) return;
+      const res = await roadshowInterence.searchRoadshowCompany({
+        KeyWord: query,
+      });
+      if (res.Ret === 200) {
+        let arr = res.Data || [];
+        if (!arr.length) {
+          cb([{ nodata: true }]);
+        } else {
+          cb(arr);
+        }
+      }
+    },
+
+    // 选择客户
+    async companySelect(e) {
+      if (e.nodata) return;
+      this.formData.companyId = e.CompanyId;
+      this.formData.companyName = e.CompanyName;
+      this.formData.englishCompany = e.EnglishCompany;
+
+      const { Data } = await roadshowInterence.componyDetail({
+        CompanyId: this.formData.companyId,
+        EnglishCompany: e.EnglishCompany,
+      });
+      this.companyInfo = Data;
+    },
+    initDefaultTime() {
+      const now = new Date();
+      const start = new Date(now.setHours(9, 0, 0, 0)); // 今天上午9:00
+      const end = new Date(start.getTime() + 60 * 60 * 1000); // 加1小时
+
+      this.formData.selectResearchers[0].startDate = start;
+      this.formData.selectResearchers[0].startTime = start;
+      this.formData.selectResearchers[0].endDate = end;
+      this.formData.selectResearchers[0].endTime = end;
+    },
+    startTimeChange(type, value, row) {
+      // type 是 "date" 或 "time"
+      const date = row.startDate;
+      const time = row.startTime;
+
+      if (!date || !time) return;
+
+      const start = new Date(date);
+      start.setHours(new Date(time).getHours(), new Date(time).getMinutes(), 0, 0);
+
+      const end = new Date(start.getTime() + 60 * 60 * 1000); // 结束时间 = 开始时间 + 1小时
+
+      // 同步更新开始时间和结束时间
+      row.startDate = start;
+      row.startTime = start;
+      row.endDate = end;
+      row.endTime = end;
+    },
+  },
+  created() {
+    this.initDefaultTime();
+  },
+};
+</script>
+
+<style lang="scss">
+.activity-btn-dia {
+  .el-form {
+    .el-cascader,
+    .el-select,
+    .el-autocomplete,
+    .el-input {
+      width: 100%;
+    }
+    .distpicker-address-wrapper {
+      display: flex;
+      label:nth-child(-n + 2) {
+        padding: 0 5px;
+        flex: 50%;
+        select {
+          width: 100%;
+        }
+      }
+    }
+    .el-col {
+      padding: 0 5px;
+    }
+    .company-info {
+      margin-bottom: 20px;
+      border: 1px solid #b3d8ff;
+      background: #ecf5ff;
+      padding: 10px;
+      p {
+        margin: 6px 0;
+        text-indent: -70px;
+        margin-left: 70px;
+      }
+    }
+    .add-researcher-box .el-form-item .el-form-item__content {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .el-cascader {
+        padding-right: 20px;
+      }
+      .el-icon-remove-outline {
+        font-size: 20px;
+        cursor: pointer;
+        color: #f00;
+      }
+    }
+  }
+  .add-box {
+    width: 100px;
+    display: flex;
+    align-items: center;
+    color: #5882ef;
+    cursor: pointer;
+  }
+  .btn-group {
+    margin: 20px 0;
+    text-align: center;
+    .el-button {
+      width: 140px;
+    }
+  }
+}
+</style>

src/views/roadshow_manage/myCalendar.vue

@@ -225,7 +225,13 @@
             >问答详情
             </span>
           </template>
-
+          <!-- 事项的操作栏由后端控制 -->
+          <template v-if="default_tab===6">
+              <span
+                class="deletesty"
+                @click="delNormalHandle(row)"
+                >删除</span>
+          </template>
           </template>
         </el-table-column>
         <div slot="empty" style="padding: 20px 0;">
@@ -673,13 +679,14 @@ export default {
     },
 
     /* 非审核删除 气泡确认 内部会议 电话会 事项*/
-    delNormalHandle({RsCalendarId,RsCalendarResearcherId,RsMattersId}) {
+    delNormalHandle({RsCalendarId,RsCalendarResearcherId,RsMattersId,RsActivityId}) {
 
       this.$confirm("删除该活动后，将从日历中移除，确定继续吗?", "删除", {
         type: "warning"
       }).then( async() => {
         //删除事项
-        let { Ret } = RsMattersId ? await roadshowInterence.delMatters({ RsMattersId }) 
+        // ficcDeleteActivity
+        let { Ret } = this.default_tab === 6 && RsActivityId ? await roadshowInterence.ficcDeleteActivity({ RsActivityId: RsActivityId }) :  RsMattersId ? await roadshowInterence.delMatters({ RsMattersId }) 
         //删除活动
         : await roadshowInterence.deleteRoadshow({ RsCalendarId, RsCalendarResearcherId });
 
@@ -790,6 +797,7 @@ export default {
       this.eventList = [
         ...(res.Data.CalendarList || []),
         ...(res.Data.RsMattersList || []),
+        ...(res.Data.RsSellerList || []),
       ].map((item, index) => {
         return { ...item, id: index };
       });

src/views/roadshow_manage/roleConfig/myCalendarConfig.js

@@ -27,6 +27,10 @@ export const getTabs = (role) => {
 				label: '事项',
 				key:5
 			},
+			{
+				label: '活动',
+				key:6
+			},
 		] : sellerList.includes(role)
 		? [
 			{
@@ -42,8 +46,8 @@ export const getTabs = (role) => {
 				key:3
 			}, //研报后台5.9 销售也增加事项
 			{
-				label: '事项',
-				key:5
+				label: '活动',
+				key:6
 			},
 		] : adminList.includes(role)
 		? [
@@ -216,7 +220,43 @@ export const tableColums = (type) => {
 			key: 'CreateTime',
 			// widthsty: '100px',
 		}
-	] : [
+	] : type === 6 ? [
+		{
+			label: '活动时间',
+			key: 'time',
+			widthsty: '200px'
+		},
+		{
+			label: '销售',
+			key: 'ResearcherName',
+			// minwidthsty: '115px',
+		},
+		{
+			label: '活动类型',
+			key: 'ActivityType',
+			// minwidthsty: '115px',
+		},
+		{
+			label: '会议主题',
+			key: 'Theme',
+			// widthsty: '100px',
+		},
+		{
+			label: '客户名称',
+			key: 'company',
+			// widthsty: '100px',
+		},
+		{
+			label: '提交时间',
+			key: 'CreateTime',
+			// widthsty: '100px',
+		},
+		{
+			label: '提交人',
+			key: 'SysUserRealName',
+			// widthsty: '100px',
+		},
+		] : [
 		{
 			label: '活动时间',
 			key: 'time',
@@ -243,6 +283,7 @@ export const tableColums = (type) => {
 //操作
 export const handleArr = (type) => {
 	if(type === 1 && sellerList.includes(localStorage.getItem('Role'))) return ['撤回']
+	if(type === 6 && sellerList.includes(localStorage.getItem('Role'))) return ['删除']
 	if(type === 1 && ENUM_RESEARCHLIST.includes(localStorage.getItem('Role'))) return ['接受','拒绝']
 	if(type === 2 && ENUM_RESEARCHLIST.includes(localStorage.getItem('Role'))) return ['填写客户问答','问答详情']
 	if(type === 2 && sellerList.includes(localStorage.getItem('Role'))) return ['拒绝理由','修改重提','删除','问答详情']

src/views/roadshow_manage/sellerCalendar.vue

@@ -1,141 +1,128 @@
 <template>
-    <div class="seller-calendar">
-      <el-card class="seller-calendar-context">
-        <!-- 日程组件 -->
-        <calendar
-          ref="calendarRef"
-          :eventList="eventList"
-          @eventClick="eventClick"
-          @cellClick="cellClick"
-          @weekChange="getEventList"
-        >
-          <template #left>
-            <el-cascader
-              v-model="selectSeller"
-              :options="sellerList"
-              :show-all-levels="false"
-              :props="{
-                expandTrigger: 'hover',
-                children: 'Child',
-                emitPath: false,
-                label:'AdminName',
-                value:'AdminId',
-              }"
-              filterable
-              clearable
-              placeholder="请选择销售"
-              @change="getEventList"
-            />
-          </template>
-          <!-- <template #right>
-            <el-button
-              type="primary"
-              @click="addMatterBtn"
-              >添加事项</el-button
-            >
-          </template> -->
-        </calendar>
-      </el-card>
-      <!-- 事项弹窗  -->
-      <addMatterDia 
-        :isShow.sync="isAddMatterDiaShow" 
-        :edit_matter_id="edit_matter_id" 
-        :matter_form="matter_form"
-        @ensureCallback="addCallback"
-      />
-    </div>
-  </template>
-  
-  <script>
-  import { roadshowInterence,customInterence } from "@/api/api.js";
-  import calendar from "@/components/calendar.vue";
-  import addMatterDia from "./compononts/addMatterDia.vue";
-  export default {
-    components: {
-      calendar,
-      addMatterDia
+  <div class="seller-calendar">
+    <el-card class="seller-calendar-context">
+      <!-- 日程组件 -->
+      <calendar ref="calendarRef" :eventList="eventList" @eventClick="eventClick" @cellClick="cellClick" @weekChange="getEventList">
+        <template #left>
+          <el-cascader
+            v-model="selectSeller"
+            :options="sellerList"
+            :show-all-levels="false"
+            :props="{
+              expandTrigger: 'hover',
+              children: 'Child',
+              emitPath: false,
+              label: 'AdminName',
+              value: 'AdminId',
+              multiple: true,
+            }"
+            filterable
+            collapse-tags
+            clearable
+            placeholder="请选择销售"
+            @change="getEventList"
+          />
+        </template>
+        <template #right>
+          <el-button type="primary" @click="actAddDlg = true">添加活动</el-button>
+        </template>
+      </calendar>
+    </el-card>
+    <!-- 事项弹窗  -->
+    <addMatterDia :isShow.sync="isAddMatterDiaShow" :edit_matter_id="edit_matter_id" :matter_form="matter_form" @ensureCallback="addCallback" />
+    <SellerAddAct :isShow.sync="actAddDlg" :sellerList="sellerList" @updateList="getEventList"/>
+  </div>
+</template>
+
+<script>
+import { roadshowInterence, customInterence } from "@/api/api.js";
+import calendar from "@/components/calendar.vue";
+import addMatterDia from "./compononts/addMatterDia.vue";
+import SellerAddAct from "./compononts/sellerAddAct.vue";
+export default {
+  components: {
+    calendar,
+    addMatterDia,
+    SellerAddAct,
+  },
+  data() {
+    return {
+      // 活动列表
+      eventList: [],
+      // 销售员列表
+      sellerList: [],
+      // 选择的销售
+      selectSeller: "",
+      activityStartDate: new Date(),
+      // 点击单元格对应日期时间
+      cellDate: null,
+      // 子组件默认数据
+      sonData: null,
+      edit_id: 0,
+      edit_rs_id: 0,
+
+      // 删除弹窗显示
+      isDeleteDiaShow: false,
+      // 删除原因
+      deleteReason: "",
+      rowInfo: "",
+
+      edit_matter_id: 0,
+      isAddMatterDiaShow: false,
+      matter_form: {},
+
+      actAddDlg: false,
+    };
+  },
+  methods: {
+    //获取销售列表
+    async getSellerList() {
+      const res = await roadshowInterence.ficcSellerList();
+      if (res.Ret !== 200) return;
+      this.sellerList = res.Data.List || [];
+      this.sellerList = this.sellerList.map((i) => {
+        if (!i.AdminName) {
+          i.AdminName = i.GroupName;
+        }
+        if (!i.AdminId) {
+          i.AdminId = i.GroupId;
+        }
+        return i;
+      });
     },
-    data() {
-      return {
-        // 活动列表
-        eventList: [],
-        // 销售员列表
-        sellerList: [],
-        // 选择的销售
-        selectSeller: "",
-        activityStartDate:new Date(),
-        // 点击单元格对应日期时间
-        cellDate: null,
-        // 子组件默认数据
-        sonData: null,
-        edit_id:0,
-        edit_rs_id: 0,
-  
-        // 删除弹窗显示
-        isDeleteDiaShow: false,
-        // 删除原因
-        deleteReason: "",
-        rowInfo:'',
-  
-        edit_matter_id: 0,
-        isAddMatterDiaShow: false,
-        matter_form: {}
-        
-      };
+
+    // 获取活动列表
+    async getEventList() {
+      //当前的起始日期
+      const { currentStart, currentEnd } = this.$refs.calendarRef.calendarApi.view;
+
+      const { formateDate } = this.$refs.calendarRef;
+      console.log(this.selectSeller);
+      let SellerId = this.selectSeller ? this.selectSeller.toString() : "";
+      // 获取本周日程
+      const res = await roadshowInterence.getSellerCalendarDetail({
+        StartDate: formateDate(currentStart),
+        EndDate: formateDate(new Date(currentEnd.getTime() - 24 * 60 * 60 * 1000)),
+        SellerId,
+      });
+
+      this.eventList = [...(res.Data.CalendarList || []), ...(res.Data.RsMattersList || []), ...(res.Data.RsSellerList || [])].map((item, index) => {
+        return { ...item, id: index };
+      });
     },
-    methods: {
-      //获取销售列表
-      async getSellerList(){
-        const res = await roadshowInterence.getSellerList();
-        if(res.Ret!==200) return 
-        this.sellerList = res.Data.List||[]
-        this.sellerList = this.sellerList.map(i=>{
-            if(!i.AdminName){
-                i.AdminName = i.GroupName
-            }
-            if(!i.AdminId){
-                i.AdminId = i.GroupId
-            }
-            return i
-        })
 
-      },
-      
-      // 获取活动列表
-      async getEventList() {
-  
-        //当前的起始日期
-        const { currentStart,currentEnd } = this.$refs.calendarRef.calendarApi.view;
-  
-        const { formateDate } = this.$refs.calendarRef;
-  
-        // 获取本周日程
-        const res = await roadshowInterence.getSellerCalendarDetail({
-          StartDate: formateDate(currentStart),
-          EndDate: formateDate(new Date(currentEnd.getTime()- 24*60*60*1000)),
-          SellerId: Number(this.selectSeller) || -1
-        });
-  
-        this.eventList = [
-          ...(res.Data.CalendarList || []),
-          ...(res.Data.RsMattersList || []),
-        ].map((item, index) => {
-          return { ...item, id: index };
-        });
-      },
-  
-      // 添加说明弹窗
-      addMatterBtn() {
-        //当前的起始日期
-        const { currentStart } = this.$refs.calendarRef.calendarApi.view;
-        this.edit_id = 0;
-        this.edit_rs_id = 0;
-        this.activityStartDate = currentStart
-        this.isAddMatterDiaShow = true;
-      },
-      
-      // 单元格添加说明事件
-      /* cellClick(startDate) {
+    // 添加说明弹窗
+    addMatterBtn() {
+      //当前的起始日期
+      const { currentStart } = this.$refs.calendarRef.calendarApi.view;
+      this.edit_id = 0;
+      this.edit_rs_id = 0;
+      this.activityStartDate = currentStart;
+      this.isAddMatterDiaShow = true;
+    },
+
+    // 单元格添加说明事件
+    /* cellClick(startDate) {
         if (!this.selectSeller)
           return this.$message.warning("请先选择销售");
         const endDate = new Date(startDate.getTime() + 1000 * 60 * 60);
@@ -154,18 +141,17 @@
         this.edit_rs_id = 0;
         this.isActivityCellDiaShow = true;
       }, */
-  
-      // 添加活动后刷新
-      addCallback() {
-        this.getEventList();
-      },
+
+    // 添加活动后刷新
+    addCallback() {
+      this.getEventList();
     },
-    computed: {},
-    mounted() {
-      this.getSellerList();
-    }
-  };
-  </script>
-  
-  <style>
-  </style>
+  },
+  computed: {},
+  mounted() {
+    this.getSellerList();
+  },
+};
+</script>
+
+<style></style>