团队版发布时团队选择判断提示；团队版报告图表数字未显示问题修复

components/CusSelect/index.vue

@@ -43,6 +43,10 @@
 			confirmText:{
 				typeof:String,
 				default:'确定'
+			},
+			team:{
+				typeof:Boolean,
+				default:false
 			}
 		},
 		data(){
@@ -68,6 +72,14 @@
 				this.$emit('close')
 			},
 			selectItem(item,index){
+				if(this.$props.team){
+					if(!item.functions||item.functions.length===0) return this.$showModal(`该【${item.teamName}】下团队职能类型信息未填写，不能发送报告，请更换或添加团队。`)
+					if(!item.organizations||item.organizations.length===0) return this.$showModal(`该【${item.teamName}】下团队模式类型信息未填写，不能发送报告，请更换或添加团队。`)
+					if(!item.organizations||item.organizations.length===0) return this.$showModal(`该【${item.teamName}】下团队模式类型信息未填写，不能发送报告，请更换或添加团队。`)
+					if(!item.scale) return this.$showModal(`该【${item.teamName}】下团队规模信息未填写，不能发送报告，请更换或添加团队。`)
+					if(!item.brief) return this.$showModal(`该【${item.teamName}】下团队简介信息未填写，不能发送报告，请更换或添加团队。`)
+				}
+				
 				this.current = item;
 				this.originList.forEach((t,i)=>{
 					this.$set(this.originList[i],'select',i===index)

pagesHome/pdf.vue

@@ -114,7 +114,7 @@
 											</view>
 										</view>
 										<view class="vbt2r-num adf">
-											<view class="vbt2r-num-pre" v-for="(item,index) in [5,4,3,2,1,0,1,2,3,4,5]" :key="index">{{ item }}</view>
+											<view class="vbt2r-num-pre" v-for="(num,ni) in [5,4,3,2,1,0,1,2,3,4,5]" :key="ni">{{ num }}</view>
 										</view>
 									</view>
 								</view>

pagesHome/questionnaireEdit.vue

@@ -68,7 +68,7 @@
 		<view class="bottom">
 			<view class="zt_btn" @click="confirmPublish">{{confirmText}}</view>
 		</view>
-		<cus-select :show="teamShow" :list="teamList" :addShow="true" 
+		<cus-select :show="teamShow" :list="teamList" :addShow="true" :team="true"
 			@close="teamShow=false" @addTeam="addTeam" @confirmTeam="confirmTeam"></cus-select>
 		<u-datetime-picker ref="datetimePicker1" title="开始时间" :minDate="minStartTime" itemHeight="88" :show="startShow" mode="datetime" :formatter="formatter" @cancel="startShow=false" @confirm="startConfirm"></u-datetime-picker>
 		<u-datetime-picker ref="datetimePicker2" title="结束时间" :minDate="minEndTime" itemHeight="88" :show="endShow" mode="datetime" :formatter="formatter" @cancel="endShow=false" @confirm="endConfirm"></u-datetime-picker>
@@ -161,7 +161,8 @@
 					coachId:JSON.parse(uni.getStorageSync('userInfo')).id
 				}).then(({data:res})=>{
 					if(res.code!==0) return this.$showToast(res.msg)
-					this.teamList = res.data.list.filter(l=>l.hierarchy&&l.scale);
+					// this.teamList = res.data.list.filter(l=>l.hierarchy&&l.scale);
+					this.teamList = res.data.list;
 					this.teamList.forEach(t=>t.name=t.teamName)
 				})
 			},
@@ -181,7 +182,8 @@
 								coachId:JSON.parse(uni.getStorageSync('userInfo')).id
 							}).then(({data:res})=>{
 								if(res.code!==0) return this.$showToast(res.msg)
-								this.teamList = res.data.list.filter(l=>l.hierarchy&&l.scale);
+								// this.teamList = res.data.list.filter(l=>l.hierarchy&&l.scale);
+								this.teamList = res.data.list;
 								this.teamList.forEach(t=>t.name=t.teamName)
 							})
 						}
@@ -205,6 +207,7 @@
 				this.dto.memberList.splice(index,1);
 			},
 			confirmTeam(item){
+				if(!item) return this.$showToast('请选择团队')
 				this.teamName = item.teamName;
 				this.dto.teamId = item.id;
 				this.teamShow = false;