周报列表

pages/mine/messageList.vue

@@ -31,6 +31,10 @@
 										{{ fomatDate(item.createTime) }}
 									</template>
 									
+									<template v-if="item.orgCode&&item.orgName">
+										{{ item.orgName }}
+									</template>
+									
 									{{item.title}}
 									
 									<template v-if="item.readFlag==0">
@@ -197,9 +201,8 @@
 					success: (res) => {
 						if (res.data.data) {
 							if (this.pageNum != 1) {
-								this.updateAnnList = [...this.updateAnnList, ...res.data.data.list.results];
+								this.updateAnnList = [...this.updateAnnList, ...res.data.data.list.records];
 							} else {
-								
 								this.updateAnnList = res.data.data.list.records || []
 							}
 						}

pages/reportExcel/weekReport.vue

@@ -52,7 +52,7 @@
 
 
 			<!-- 销讲场景执行排名 -->
-			<view class="execution-ranking">
+			<view class="execution-ranking" v-if="!weekObj.orgCode">
 				<view class="execution-ranking-title">
 					销讲场景执行排名
 				</view>
@@ -125,8 +125,14 @@
 					<view class="table">
 						<view class="thead">
 							<block v-for="(head, headIndex) in tableHead" :key="headIndex">
-								<view class="thead-item" :style="[head.style]">
-									{{ head.title }}
+								<view class="thead-item"
+									:style="[(weekObj.orgCode && head.title2) ? head.style1 : head.style]">
+									<template v-if="weekObj.orgCode && head.title2">
+										{{ head.title2 }}
+									</template>
+									<template v-else>
+										{{ head.title }}
+									</template>
 								</view>
 							</block>
 						</view>
@@ -349,9 +355,13 @@
 				nodata: false,
 				tableHead: [{
 						title: '顾问',
+						title2: '项目名称',
 						style: {
 							flex: 1
-						}
+						},
+						style1: {
+							flex: 2
+						},
 					},
 					{
 						title: '接待量',