Merge branch 'master' into cygx_13.2

src/views/custom_manage/customList/customList.vue

@@ -303,6 +303,8 @@
 								</el-select>
 							</template>
 						</p>
+						<!-- 共享客户显示咨询组销售 -->
+						<span v-if="scope.row.IsShare==1 && scope.row.ShareSeller">{{ scope.row.ShareSeller }}</span>
 					</template>
 					</el-table-column>
           <el-table-column

src/views/dataReport_manage/statistic/newCustomlist.vue

@@ -8,7 +8,7 @@
 			class="table-cont"
 		>
 			<el-table-column
-				v-for="item in tableColumns"
+				v-for="item in tableColumnsComputed"
 				:key="item.label"
 				:label="item.label"
 				:width="item.widthsty"
@@ -143,6 +143,10 @@ export default {
 					label: '所属销售',
 					key: 'SellerName',
 				},
+				{
+					label: '分配销售',
+					key: 'ShareSeller',
+				},
 				{
 					label: '客户状态',
 					key: 'Status',
@@ -181,6 +185,21 @@ export default {
 			pageSize: 10,
 		}
 	},
+	computed:{
+		Role() {
+			return localStorage.getItem('Role');
+		},
+		tableColumnsComputed(){
+			// 分配销售 续约统计和续约异常统计需要显示
+			let hasDistributionSales = this.Role.indexOf('rai')==-1 && 
+																['/contractCustomlist','/abnormalRenewalCustomlist'].includes(this.$route.path)
+			if(hasDistributionSales){
+				return this.tableColumns
+			}else{
+				return this.tableColumns.filter(item => item.label!='分配销售')
+			}
+		}
+	},
 	methods: {
 
 		/* 获取数据	 */