申请转正

src/views/contract_manage/components/allocationNumber.vue

@@ -143,15 +143,15 @@ export default {
     },
     // 平均分配
     averageaAllocation() {
-      let isName = this.listArr.some((item) => item.ChartPermissionName == "买方研选");
+      let isName = this.listArr.some((item) => item.ChartPermissionName == "研选订阅");
       let num = 100 / (isName ? this.listArr.length - 1 : this.listArr.length);
       this.listArr.forEach((item) => {
-        if (item.ChartPermissionName != "买方研选") {
+        if (item.ChartPermissionName != "研选订阅") {
           item.Proportion = num;
         }
         let childrenNum = num / item.List.length;
         item.List.forEach((key) => {
-          if (key.RealName != "买方研选") {
+          if (key.RealName != "研选订阅") {
             key.Proportion = childrenNum;
           }
         });

src/views/custom_manage/compontents/CauthList.vue

@@ -99,7 +99,7 @@
 				</el-table-column>
 				<el-table-column align="center">
 					<template slot-scope="scope">
-						<span v-if="scope.row.choose.value === '买方研选'">
+						<span v-if="scope.row.choose.value === '研选订阅'">
 							{{scope.row.choose.value}}
 						</span>
 						<el-checkbox-group v-model="qyCheckList" v-else >
@@ -108,6 +108,17 @@
 						</el-checkbox-group>
 					</template>
 				</el-table-column>
+				<el-table-column align="center" width="100px">
+					<template slot-scope="scope">
+						<span v-if="scope.row.points.value === '研选扣点包'">
+							{{scope.row.points.value}}
+						</span>
+						<el-checkbox-group v-model="qyCheckList" v-else >
+							<el-checkbox :label="scope.row.points.value" class="checkbox-flex"
+							:disabled="scope.row.points.isDisabled">{{''}}</el-checkbox>
+						</el-checkbox-group>
+					</template>
+				</el-table-column>
 			</el-table>
 		</div>
 
@@ -133,7 +144,6 @@ export default {
 	},
 	watch: {
 		autharr(value){
-			// console.log(value);
 			if(value[0] && value[0].customType=='权益') this.qyCheckList = value[0].CheckList
 		},
 		qyCheckList(value){
@@ -171,7 +181,6 @@ export default {
 					this.autharr[0].dataList[i+1].PermissionTypeName.isIndeterminate=true
 				}
 			}
-			
 		}
 	},
 	data () {
@@ -230,7 +239,6 @@ export default {
 				})
 			}
 			item.CheckList = [...new Set(item.CheckList)]
-			// console.log(item);
 			let len = item.CheckList.length;
 			item.checkAll = len === item.Items.length;
 			item.isIndeterminate = len > 0 && len < item.Items.length;
@@ -238,7 +246,7 @@ export default {
 		// 权益选择套餐方法
 		// 合并单元格
 		spanMethod({ row, rowIndex, column,columnIndex  }){
-			if([5,6,7,8].includes(columnIndex)){
+			if([5,6,7,8,9].includes(columnIndex)){
 				if(rowIndex == 1){
 					return [2,1]
 				}else if(rowIndex == 2){
@@ -247,7 +255,6 @@ export default {
 			}
 		},
 		handleCheckQY(item){
-			// console.log(item);
 			let arr = ['medicine','consumption','technology','smart']
 			let arrCh = ['医药','消费','科技','智造']
 			// 全选
@@ -309,7 +316,6 @@ export default {
 					}
 				}
 			}
-			// console.log(this.qyCheckList);
 		}
 	},
 	created() {},

src/views/custom_manage/customList/customList.vue

@@ -1919,8 +1919,11 @@ ShareListDialog},
 									value:'路演服务'
 								},
 								choose:{
-									value:'买方研选'
-								}
+									value:'研选订阅'
+								},
+								points:{
+									value:'研选扣点包'
+								},
 							},
 							{
 								PermissionTypeName:{
@@ -1963,6 +1966,10 @@ ShareListDialog},
 								choose:{
 									value:obj.Items[11].ChartPermissionId,
 									isDisabled:item.CheckList.includes(obj.Items[11].ChartPermissionId)
+								},
+								points:{
+									value:obj.Items[12].ChartPermissionId,
+									isDisabled:item.CheckList.includes(obj.Items[12].ChartPermissionId)
 								}
 							},
 							{
@@ -2006,6 +2013,10 @@ ShareListDialog},
 								choose:{
 									value:obj.Items[11].ChartPermissionId,
 									isDisabled:item.CheckList.includes(obj.Items[11].ChartPermissionId)
+								},
+								points:{
+									value:obj.Items[12].ChartPermissionId,
+									isDisabled:item.CheckList.includes(obj.Items[12].ChartPermissionId)
 								}
 							}
 						]

src/views/custom_manage/customList/customShareList.vue

@@ -907,8 +907,11 @@ export default {
 									value:'路演服务'
 								},
 								choose:{
-									value:'买方研选'
-								}
+									value:'研选订阅'
+								},
+								points:{
+									value:'研选扣点包'
+								},
 							},
 							{
 								PermissionTypeName:{
@@ -951,6 +954,10 @@ export default {
 								choose:{
 									value:obj.Items[11].ChartPermissionId,
 									isDisabled:item.CheckList.includes(obj.Items[11].ChartPermissionId)
+								},
+								points:{
+									value:obj.Items[12].ChartPermissionId,
+									isDisabled:item.CheckList.includes(obj.Items[12].ChartPermissionId)
 								}
 							},
 							{
@@ -994,6 +1001,10 @@ export default {
 								choose:{
 									value:obj.Items[11].ChartPermissionId,
 									isDisabled:item.CheckList.includes(obj.Items[11].ChartPermissionId)
+								},
+								points:{
+									value:obj.Items[12].ChartPermissionId,
+									isDisabled:item.CheckList.includes(obj.Items[12].ChartPermissionId)
 								}
 							}
 						]

src/views/custom_manage/customList/updateServe.vue

@@ -433,7 +433,7 @@ export default {
 						/* 处理数据把复选框 拆分成三个*/
 						res.Data.Item.PermissionList.length&&res.Data.Item.PermissionList.forEach(item => {
 						let arr = item.Items.filter(key=> [22,21,20,19,23,30].includes(key.ChartPermissionId))
-						let ItemsPrivate = item.Items.filter(key=> [29,31,20031,20032].includes(key.ChartPermissionId))
+						let ItemsPrivate = item.Items.filter(key=> [29,31,52,20031,20032].includes(key.ChartPermissionId))
 						let ItemsUp = item.Items.filter(key=> key.PermissionName.includes('升级'))
 						let ItemsBig = item.Items.filter(key=> key.ChartPermissionId==0)
 							let obj = {
@@ -509,7 +509,7 @@ export default {
 						/* 处理数据把复选框 拆分成三个*/
 						res.Data.List.length&&res.Data.List.forEach(item => {
 						let arr = item.Items.filter(key=> [22,21,20,19,23,30].includes(key.ChartPermissionId))
-						let ItemsPrivate = item.Items.filter(key=> [29,31,20031,20032].includes(key.ChartPermissionId))
+						let ItemsPrivate = item.Items.filter(key=> [29,31,52,20031,20032].includes(key.ChartPermissionId))
 						let ItemsUp = item.Items.filter(key=> key.PermissionName.includes('升级'))
 						let ItemsBig = item.Items.filter(key=> key.ChartPermissionId==0)
 							let obj = {

src/views/custom_manage/customSearch.vue

@@ -1393,8 +1393,11 @@ export default {
 									value:'路演服务'
 								},
 								choose:{
-									value:'买方研选'
-								}
+									value:'研选订阅'
+								},
+								points:{
+									value:'研选扣点包'
+								},
 							},
 							{
 								PermissionTypeName:{
@@ -1437,6 +1440,10 @@ export default {
 								choose:{
 									value:obj.Items[11].ChartPermissionId,
 									isDisabled:item.CheckList.includes(obj.Items[11].ChartPermissionId)
+								},
+								points:{
+									value:obj.Items[12].ChartPermissionId,
+									isDisabled:item.CheckList.includes(obj.Items[12].ChartPermissionId)
 								}
 							},
 							{
@@ -1480,6 +1487,10 @@ export default {
 								choose:{
 									value:obj.Items[11].ChartPermissionId,
 									isDisabled:item.CheckList.includes(obj.Items[11].ChartPermissionId)
+								},
+								points:{
+									value:obj.Items[12].ChartPermissionId,
+									isDisabled:item.CheckList.includes(obj.Items[12].ChartPermissionId)
 								}
 							}
 						]

src/views/rai_manage/activityManage/components/addActivity.vue

@@ -410,7 +410,7 @@ export default {
     if (!this.isResearch) {
       this.chartPermission();
     } else {
-      this.optionFormregion = "买方研选";
+      this.optionFormregion = "研选订阅";
     }
     this.getActivityType();
     this.customerTypelist();

src/views/rai_manage/activityManage/roadShow/components/addVideoDlg.vue

@@ -26,7 +26,7 @@
           <el-form-item prop="industryId">
             <el-select style="width: 100%" placeholder="请选择行业" v-model="addEditVideo.industryId" clearable @change="selectChangeHandle">
               <el-option 
-              v-for="item in chartPermissionList.filter(item => item.PermissionName != '宏观' && item.PermissionName != '策略' && item.PermissionName != '买方研选')" 
+              v-for="item in chartPermissionList.filter(item => item.PermissionName != '宏观' && item.PermissionName != '策略' && item.PermissionName != '研选订阅')" 
                 :label="item.PermissionName" :key="item.ChartPermissionId" :value="item.ChartPermissionId"></el-option>
             </el-select>
           </el-form-item>

src/views/rai_manage/activityManage/roadShow/components/releaseAudio.vue

@@ -25,7 +25,7 @@
           <el-form-item prop="industryId">
             <el-select style="width: 100%" placeholder="请选择行业" v-model="addEditAudio.industryId" clearable @change="selectChangeHandle">
               <el-option
-                v-for="item in chartPermissionList.filter((item) => item.PermissionName != '宏观' && item.PermissionName != '策略' && item.PermissionName != '买方研选')"
+                v-for="item in chartPermissionList.filter((item) => item.PermissionName != '宏观' && item.PermissionName != '策略' && item.PermissionName != '研选订阅')"
                 :label="item.PermissionName"
                 :key="item.ChartPermissionId"
                 :value="item.ChartPermissionId"