Merge branch 'master' into cygx_14.8

src/views/custom_manage/customList/applyTurn.vue

@@ -140,7 +140,7 @@
 								<el-radio :label="2">小套餐</el-radio>
 							</el-radio-group>
 						</el-form-item>
-						<el-form-item class="textarea_item" style="width:97%;paddingLeft:26px;" prop="CheckList">
+						<el-form-item class="textarea_item" style="" prop="CheckList">
 							<label style="display:block;marginBottom:10px;fontSize:16px;position:relative;color:#666;">
 								<i style="color:#f00;fontSize:20px;position:absolute;left:-15px;top:10%;">*</i>
 								权限设置
@@ -639,6 +639,8 @@ export default {
 	/*  */
 	.card_cont {
 		margin-bottom: 20px;
+		overflow: hidden;
+		overflow-x: auto;
 		border: 1px solid #ECECEC;
 		padding: 30px;
 		background: #fff;

src/views/custom_manage/customList/components/raiPermissionbox.vue

@@ -291,7 +291,7 @@ export default {
 
 <style scoped lang="scss">
 .rai-checkbox-box {
-  width: 102%;
+  padding-right: 50px;
   .main-list {
     display: flex;
     padding-right: 15px;
@@ -336,7 +336,7 @@ export default {
 }
 @media screen and (max-width: 1701px) {
   .rai-checkbox-box {
-    width: 107%;
+   padding-right: 600px;
   }
 }
 </style>

src/views/custom_manage/customList/updateServe.vue

@@ -38,6 +38,7 @@
 			</div>
 		</div>
 		<div class="card_cont">
+			<div>
 			<div class="apply_info">
 				<h3 style="fontSize:16px;">{{$route.path=='/updateCustom'?'续约申请':'补充协议'}}</h3>
 				<div class="info_cont">
@@ -117,7 +118,7 @@
 								<el-radio :label="2">小套餐</el-radio>
 							</el-radio-group>
 						</el-form-item>
-						<el-form-item class="textarea_item" style="width:97%;paddingLeft:26px;" prop="CheckList">
+						<el-form-item class="textarea_item" style="" prop="CheckList">
 							<label style="display:block;marginBottom:10px;fontSize:16px;position:relative;color:#666;">
 								<i style="color:#f00;fontSize:20px;position:absolute;left:-15px;top:10%;">*</i>
 								权限设置
@@ -160,6 +161,7 @@
 					<el-button type="primary" plain style="width:80px;" @click="cancelHandle">取消</el-button>
 				</div>
 			</div>
+			</div>
 		</div>
 		<!-- 历史签约弹窗 -->
 		<el-dialog
@@ -1009,6 +1011,9 @@ export default {
 	}
 	/*  */
 	.card_cont {
+		width: 100%;
+		overflow: hidden;
+		overflow-x: auto;
 		margin-bottom: 20px;
 		border: 1px solid #ECECEC;
 		padding: 30px;

src/views/dataReport_manage/configdata.js

@@ -80,6 +80,12 @@ export const incrementTableColums = [
     key: "SellerName",
     widthsty: "150px",
   },
+  {
+    label: "咨询组",
+    dataType: "未续约客户",
+    key: "ShareSeller",
+    widthsty: "150px",
+  },
   {
     label: "新增时间",
     key: "CreateTime",

src/views/dataReport_manage/equityDataSummary.vue

@@ -57,14 +57,14 @@
         </div>
       </div>
       <!-- 数据表格 -->
-      <el-table :data="flattenedData" border style="width: 100%; margin-top: 20px" :span-method="mergeRows">
+      <el-table :data="flattenedData" ref="myTable" border style="width: 100%; margin-top: 20px" :span-method="mergeRows" @sort-change="sortChangeHandle">
         <!-- DataType 作为合并行 -->
         <el-table-column prop="DataType" label="" align="center" width="120px" />
 
         <!-- 销售姓名 -->
         <el-table-column prop="SellerName" label="销售姓名" align="center" width="150px" />
 
-        <el-table-column v-for="col in dynamicColumns" :key="col.key" :prop="col.key" align="center">
+        <el-table-column v-for="col in dynamicColumns" :key="col.key" :prop="col.key" align="center" :sortable="showSortable">
           <template slot="header" slot-scope="{ row }">
             <el-tooltip :content="col.tooltip" placement="top">
               <div style="display: inline-flex; align-items: center">
@@ -128,6 +128,8 @@ export default {
       serviceGroupSwitch: false, //服务组开关
       dataItem: {}, //数据项
       timeSelection: [], //时间选择器的值
+      sortParam: "", //用来排序的字段
+      sortType: "", //正序还是倒序
     };
   },
   methods: {
@@ -164,6 +166,8 @@ export default {
         ServerButton: this.serviceGroupSwitch,
         StartDate: this.timeSelection && this.timeSelection.length ? this.timeSelection[0] : "",
         EndDate: this.timeSelection && this.timeSelection.length ? this.timeSelection[1] : "",
+        SortType: this.sortType,
+        SortParam: this.sortParam,
       };
       const res = await dataMainInterface.getRaiDataSummary(params);
       this.tableData = res.Data.List;
@@ -225,8 +229,26 @@ export default {
       });
     },
     salesChangeHandedl() {
+      this.handleSwitchChange();
       this.getDataList();
     },
+    // 表格排序方式改变
+    sortChangeHandle({ column, prop, order }) {
+      const sortOrderMap = {
+        ascending: "asc",
+        descending: "desc",
+        null: "",
+      };
+      const sortOrder = sortOrderMap[order];
+      this.sortParam = prop; //用来排序的字段
+      this.sortType = sortOrder; //正序还是倒序
+      this.getDataList();
+    },
+    handleSwitchChange() {
+      this.$refs.myTable.clearSort();
+      this.sortParam = ""; //用来排序的字段
+      this.sortType = ""; //正序还是倒序
+    },
   },
   computed: {
     // 计算动态表头
@@ -280,6 +302,10 @@ export default {
       };
       return useName == "梁春悦6" ? { 续约: obj.续约 } : obj;
     },
+    // 是否可以显示排序
+    showSortable() {
+      return this.pathfinderSwitch !== this.serviceGroupSwitch ? "custom" : false;
+    },
   },
   mounted() {
     this.getDataList();

src/views/dataReport_manage/equityServiceStatistics.vue

@@ -58,7 +58,7 @@
     </el-card>
     <el-card style="margin-top: 20px">
       <el-table :data="tableData" border style="width: 100%" @sort-change="sortChangeHandle">
-        <el-table-column align="center" prop="CompanyName" width="180">
+        <el-table-column align="center" prop="CompanyName" width="200"  fixed>
           <template slot="header" slot-scope="{}">
             <span>客户名称</span>
             <el-tooltip effect="dark" placement="top-start">

src/views/roadshow_manage/compononts/addActivityBtnDia.vue

@@ -700,7 +700,7 @@ export default {
             confirmDiaLink(text, content, query)
         //只提交权益研究员的路演时，提示弹窗：
         }else if(ResearcherTypes.includes('rai')){
-            confirmDiaRai()
+            confirmDiaRai(res.Data)
         //只提交ficc研究员的路演时，提示弹窗：（维持原来的不变）
         }else{
             confirmDiaLink(text, content, query)

src/views/roadshow_manage/compononts/addActivityCellDia.vue

@@ -652,7 +652,7 @@ export default {
             confirmDiaLink(text, content, query)
         //只提交权益研究员的路演时，提示弹窗：
         }else if(ResearcherTypes.includes('rai')){
-            confirmDiaRai()
+            confirmDiaRai(res.Data)
         //只提交ficc研究员的路演时，提示弹窗：（维持原来的不变）
         }else{
             confirmDiaLink(text, content, query)

src/views/roadshow_manage/roleConfig/index.js

@@ -27,10 +27,12 @@ export const confirmDiaLink = (sub_msg,message,query) => {
 	}).catch(()=>{});
 }
 //给权益研究员添加的日历 确认弹窗 需要停留在原先页面
-export const confirmDiaRai = ()=>{
+export const confirmDiaRai = (data)=>{
+	let pointsText = `,扣除客户${data.Points}个服务点数`
+	let message = `<span>研究员日程已添加成功${data.AddType == 1 ? pointsText : '' }</span><p>可前往【研究员日历】查看</p>` 
     bus.$msgbox({
 		title: '添加活动成功',
-		message: `<span>研究员日程已添加成功</span><p>可前往【研究员日历】查看</p>`,
+		message,
 		dangerouslyUseHTMLString:true,
 		showCancelButton: true,
 		confirmButtonText: '前去查看',