14.7 提测

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/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: '前去查看',