页面提交

src/components/busManagement/busStatistics.vue

@@ -138,23 +138,22 @@
                 <div class="w80">{{item.GuideName}}</div>
               </td>
               <td>
-                <div class="w80">{{item.CommonReport.BusList[0].MainBusTypeStr}} </div>
+
+                <div class="w80">{{item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0].MainBusTypeStr}} </div>
               </td>
-              <td v-for="(x,ww) in item.CommonReport.BusList" style="vertical-align: top;">
+              <td v-for="(x,ww) in item.CommonReport.BusPlanListReport" style="vertical-align: top;">
                 <div class="w100">
-                  <p class="pDateStyle">{{x.PlanDateStr}}</p>
-                  <p class="pDateStyle">
-                    <template v-for="(childItem,childIndex) in x.DetailList">
-                      {{ (childItem.AirportPickUpStr!=""?childItem.AirportPickUpStr:"")+(childItem.UseTypeStr!=""?childItem.UseTypeStr:"") }}
-                      <template v-if="x.DetailList.length>1 && x.DetailList.length-1!=childIndex"><br /></template>
-                    </template>
-                    <template v-if="x.OrderState>-1">
-                      <br />
-                      <span style="color: #4BCA81;"
-                        v-if="(x.DetailList[0].AirportPickUpStr!='' ||x.DetailList[0].UseTypeStr!='')">√</span>
+                  <template v-for="(childItem,childIndex) in x.BusPlanOrderList">
+                    <p class="pDateStyle" v-if="childIndex==0"> {{childItem.PlanDateStr}}</p>
+                    <p class="pDateStyle">
+                      {{(childItem.AirportPickUpStr!=""?childItem.AirportPickUpStr:"") }}
+                      <span style="color: #4BCA81;" v-if="(childItem.AirportPickUpStr!='')">√</span>
                       <span style="color: #E95252;" v-else>X</span>
-                    </template>
-                  </p>
+                      <template v-if="x.BusPlanOrderList.length>1 && x.BusPlanOrderList.length-1!=childIndex">
+                       <br />
+                      </template>
+                    </p>
+                  </template>
                 </div>
               </td>
               <td v-for="is in item.isCha"></td>
@@ -166,12 +165,12 @@
               </td>
               <td>
                 <div class="w150">
-                  {{GetTotalPrice(item.CommonReport.BusList,item.CommonReport.HouseStatistics.RealityNum)}}
+                  {{GetTotalPrice(item.CommonReport.BusPlanListReport,item.CommonReport.HouseStatistics.RealityNum)}}
                 </div>
               </td>
               <td>
                 <div class="w100">
-                  {{GetPeiChe(item.CommonReport.BusList)}}
+                  {{GetPeiChe(item.CommonReport.BusPlanListReport)}}
                 </div>
               </td>
               <td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
@@ -242,9 +241,11 @@
       GetTotalPrice(obj) { //车费总价
         let totalPrice = 0;
         obj.forEach(busInfo => {
-          if (busInfo.CostPrice != undefined) {
-            totalPrice += busInfo.CostPrice ;
-          }
+          busInfo.BusPlanOrderList.forEach(subItem => {
+            if (subItem.CostPrice != undefined) {
+              totalPrice += subItem.CostPrice;
+            }
+          });
         });
         return totalPrice;
       },
@@ -271,7 +272,7 @@
         let DayNum = 0;
         obj.forEach((busInfo, index) => {
           if (index == 0) {
-            busInfo.DetailList.forEach(subItem => {
+            busInfo.BusPlanOrderList.forEach(subItem => {
               if (subItem.AirportPickUpStr != "") {
                 jieji += subItem.AirportPickUpStr + ",";
               } else {
@@ -281,7 +282,7 @@
             });
 
           } else if (index == (obj.length - 1)) {
-            busInfo.DetailList.forEach(subItem => {
+            busInfo.BusPlanOrderList.forEach(subItem => {
               if (subItem.AirportPickUpStr != "") {
                 songji += subItem.AirportPickUpStr + ",";
               } else {
@@ -289,9 +290,7 @@
               }
             });
           } else {
-            if (busInfo.OrderState > -1) {
-              DayNum += 1;
-            }
+            DayNum += 1;
           }
         });
         if (parseInt(DayNum) > 0) {
@@ -379,7 +378,7 @@
       },
       getList() {
         this.loading = true
-        this.apipost('bus_Get_GetBusUniteCombinationNumService', this.msg, res => {
+        this.apipost('bus_Get_GetBusUniteCombinationNumService_V2', this.msg, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
@@ -391,8 +390,9 @@
             }
             this.DataList.forEach(outItem => {
               outItem.StaticsReportList.forEach(item => {
-                if (item.CommonReport.BusList.length < res.data.data.pageData.columnsCount) {
-                  item.isCha = res.data.data.pageData.columnsCount - item.CommonReport.BusList.length;
+                if (item.CommonReport.BusPlanListReport.length < res.data.data.pageData.data.length) {
+                  item.isCha = res.data.data.pageData.columnsCount - item.CommonReport.BusPlanListReport
+                    .length;
                 } else {
                   item.isCha = 0;;
                 }
@@ -400,7 +400,7 @@
             })
             this.$forceUpdate();
           } else {
-            this.$message.error(res.data.message);
+            this.Error(res.data.message);
           }
         }, err => {})
       },
@@ -414,7 +414,7 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
-     
+
       let width = window.innerWidth - 50;
       let height = window.innerHeight - 65 - 210;
       this.boxHeight = height;