no message

pages/teamLeader/billDetails.vue

@@ -165,8 +165,9 @@
                 </view>
             </view>
             <view>
-                <!-- <template v-for="(item,index) in TeamUsePriceList">
-                    <view v-if="item.TotalPrice>0" class="billDetailsCTop one">
+                <template v-if="TeamUsePriceList&&TeamUsePriceList.length>0">
+                    <template v-for="(item,index) in TeamUsePriceList">
+                        <view class="billDetailsCTop one">
                             <view class="billDetailsCHeader row justify-between items-center"
                             @click="showTeamUse(index)">
                                 <view class="billDetailsCHeaderL">
@@ -180,7 +181,7 @@
                             </view>
                             <view v-if="item.showList">
                                 <template v-for="child in item.list">
-                                <view v-if="child.price>0" class="billDetailsCCBox row items-center fz28">
+                                    <view class="billDetailsCCBox row items-center fz28">
                                         <img :src="typeImgs[child.index]" />
                                         <view class="billDetailsCCR flex1 row justify-between items-center">
                                             <view class="ML23 fz28">{{ child.name }}</view>
@@ -191,7 +192,8 @@
                                 <u-empty v-if="item.list.length==0||!item.list" text="暂无数据" mode="data" paddingTop="0"></u-empty>
                             </view>
                         </view>
-                </template> -->
+                    </template>
+                </template>
                 <view class="billDetailsCTop">
                     <view class="billDetailsCHeader billDetailsCHeaderOth row justify-between items-center"
                     @click="showOther=!showOther">
@@ -264,7 +266,7 @@ export default {
                 date: '',
                 year: '',
                 month: '',
-                showList: false,
+                showList: true,
                 list:[]
             },
             showOther: false,
@@ -348,6 +350,7 @@ export default {
                         price: x.DiningTotalPrice,
                         index: 3,
                     })
+                    
                     this.TotalList[0].price += x.BusTotalPrice
                     this.TotalList[1].price += x.HouseTotalPrice
                     this.TotalList[2].price += x.ScenicTotalPrice
@@ -368,9 +371,10 @@ export default {
             this.apipost("dmcstatistics_post_GetTotalPrice_V2", this.msg, (res) => {
                 if (res.resultCode == 1) {
                     uni.hideLoading()
-                    this.dataList = res.data.sort((a,b)=>{
-                        return new Date(b.TeamUsePriceList[0].UseTime) - new Date(a.TeamUsePriceList[0].UseTime)
-                    })
+                    this.dataList = res.data
+                    //this.dataList = res.data.sort((a,b)=>{
+                    //     return new Date(b.TeamUsePriceList[0].UseTime) - new Date(a.TeamUsePriceList[0].UseTime)
+                    // })
                     this.dataList.forEach(x=>{
                         if(x.TeamUsePriceList) x.TeamUsePriceList.forEach(y=>{
                             y.date = this.$utils.formatDates(new Date(y.UseTime),'yyyy-MM-dd')
@@ -387,6 +391,9 @@ export default {
                             id: res.data[i].CurrencyId,
                         })
                     }
+                    if(this.dataList[this.currentIndex].OtherTotalPriceList&&this.dataList[this.currentIndex].OtherTotalPriceList.length>0){
+                        this.showOther = true
+                    }
                     this.newTeamUsePrice()
                 }
             }, (failed) => {

pages/teamLeader/schedule.vue

@@ -370,26 +370,45 @@ export default {
                     arrList(this.inforData1.PrincipalList)
                     this.PrincipalList.forEach((item,index)=> {
                             let data = this.inforData1.PrincipalList[0]
+                            let findIndex1 = data.CreateByNameList.findIndex(x=>x.name==item.CreateByName)
+                            if(findIndex1==-1){
                                 data.CreateByNameList.push({
                                     name: item.CreateByName,
                                     tel: item.CreateByMobile
                                 })
+                            }
+                            
+                            let findIndex2 = data.HConfirmNameList.findIndex(x=>x.name==item.HConfirmName)
+                            if(findIndex2==-1){
                                 data.HConfirmNameList.push({
                                     name:item.HConfirmName,
                                     tel:item.HConfirmMobile
                                 })
+                            }
+                            
+                            let findIndex3 = data.BConfirmNameList.findIndex(x=>x.name==item.BConfirmName)
+                            if(findIndex3==-1){
                                 data.BConfirmNameList.push({
                                     name:item.BConfirmName,
                                     tel:item.BConfirmMobile
                                 })
+                            }
+
+                            let findIndex4 = data.DConfirmNameList.findIndex(x=>x.name==item.DConfirmName)
+                            if(findIndex4==-1){
                                 data.DConfirmNameList.push({
                                     name:item.DConfirmName,
                                     tel:item.DConfirmMobile
                                 })
+                            }
+
+                            let findIndex5 = data.TConfirmNameList.findIndex(x=>x.name==item.TConfirmName)
+                            if(findIndex5==-1){
                                 data.TConfirmNameList.push({
                                     name:item.TConfirmName,
                                     tel:item.TConfirmMobile
                                 })
+                            }
                     })
                     uni.hideLoading()
                 }