车辆信息修改

src/components/busManagement/busStatistics.vue

@@ -10,6 +10,12 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>地接团号</em>
+            <el-input v-model='msg.CombinationNum'></el-input>
+          </span>
+        </li>
         <li>
           <span>
             <em>团号</em>
@@ -28,7 +34,6 @@
             <el-option label='取消' value='1' key='1'></el-option>
           </el-select>
         </li>
-
         <li>
           <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
         </li>
@@ -38,7 +43,8 @@
       车辆状态&nbsp;&nbsp;&nbsp;已确定:<span style="color:#4BCA81 ;">√</span>未确定:<span
         style="color: #ff6600;">O</span>未分配:<span style="color:#E95252 ;">X</span>
     </div>
-    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle" :style="{height: boxHeight + 'px'}">
+    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"
+      :style="{height: boxHeight + 'px'}">
       <table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'>
         <tr>
           <th class="w100">序号</th>
@@ -57,7 +63,7 @@
           <th width="80">配车天数</th>
           <th width="120">操作</th>
         </tr>
-        <tbody v-for="(outItem,outindex) in list" :class="{splitTrCss:outindex%2!=0}">
+        <tbody v-for="(outItem,outindex) in DataList" :class="{splitTrCss:outindex%2!=0}">
           <template v-for="(item,index) in outItem.StaticsReportList">
             <tr>
               <td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
@@ -137,18 +143,17 @@
               <td v-for="(x,ww) in item.CommonReport.BusList" style="vertical-align: top;">
                 <div class="w100">
                   <p class="pDateStyle">{{x.PlanDateStr}}</p>
-                  <p class="pDateStyle" v-if="ww==0">
-										<template v-for="childItem in x.DetailList">
-											 {{childItem.AirportPickUpStr!=""?childItem.AirportPickUpStr:"接机"}}<br/>
-										</template>
-									</p>
-                  <p class="pDateStyle" v-else-if="ww==item.CommonReport.BusList.length-1">	
-										<template v-for="childItem in x.DetailList">
-											 {{childItem.AirportPickUpStr!=""?childItem.AirportPickUpStr:"送机"}}<br/>
-										</template></p>
-                  <p class="pDateStyle fbold fz16" v-else-if="x.AirportPickUp==0">
-                    <span style="color: #E95252;" v-if="x.OrderState==-1">X</span>
-                    <span style="color: #4BCA81;" v-else-if="x.OrderState>-1">√</span>
+                  <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>
+                      <span style="color: #E95252;" v-else>X</span>
+                    </template>
                   </p>
                 </div>
               </td>
@@ -172,7 +177,7 @@
               <td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                 <div class="w100 link">
                   <span @click="goUrlX('BusInfo',item,outItem,'车配信息')">详情</span>
-                  <span @click="DownLoadFile(item,outItem.NewCombinationNum)">下载</span>
+                  <span @click="GoDownLoad(outItem)">手配书</span>
                 </div>
               </td>
             </tr>
@@ -210,12 +215,13 @@
           LineteamId: "-1",
           StartDate: '',
           EndDate: '',
-          PriceStatus: "0"
+          PriceStatus: "0",
+          CombinationNum: ""
         },
         LineList: [],
         LineTeamList: [],
         thLengthTitle: [],
-        list: [],
+        DataList: [],
         colspanTotal: 0,
         isCha: 0,
         boxHeight: 0,
@@ -223,12 +229,7 @@
 
     },
     methods: {
-      DownLoadFile(item, NewCombinationNum) {
-        let msg = {
-          TCIDS: item.TCIDS
-        };
-        this.GetLocalFile("bus_get_NewDownLoadBusConfig", msg, "バス手配依頼書" + NewCombinationNum + ".xls");
-      },
+
       getLineList() {
         this.apipost("line_post_GetAllList", {}, res => {
           if (res.data.resultCode == 1) {
@@ -238,15 +239,31 @@
           }
         });
       },
-      GetTotalPrice(obj, PeopleNum) { //车费总价
+      GetTotalPrice(obj) { //车费总价
         let totalPrice = 0;
         obj.forEach(busInfo => {
           if (busInfo.CostPrice != undefined) {
-            totalPrice += busInfo.CostPrice * (Number(busInfo.TransferNum) + 1) * PeopleNum;
+            totalPrice += busInfo.CostPrice ;
           }
         });
         return totalPrice;
       },
+      //获取系列列表
+      getLineTeamList(lineId) {
+        this.LineTeamList = [];
+        this.apipost(
+          "team_post_GetList", {
+            lineID: 14,
+            isTOOP: 1
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+              this.msg.LineteamId = "-1";
+              this.LineTeamList = res.data.data;
+            }
+          }
+        );
+      },
       GetPeiChe(obj) { //配车信息
         let jieji = "";
         let songji = "";
@@ -266,7 +283,7 @@
           } else if (index == (obj.length - 1)) {
             busInfo.DetailList.forEach(subItem => {
               if (subItem.AirportPickUpStr != "") {
-								 songji += subItem.AirportPickUpStr + ",";
+                songji += subItem.AirportPickUpStr + ",";
               } else {
                 songji += "送机,";
               }
@@ -285,39 +302,21 @@
         }
         return allStr;
       },
-      GetCheType(obj) { //车型信息
-        let jieji = "";
-        let DayNum = 0;
-        obj.forEach((busInfo, index) => {
-          if (busInfo.AirportPickUp == 0 && busInfo.OrderState > -1) {
-            if (jieji.length == 0) {
-              jieji = busInfo.ResultBusTypeStr
-            }
-          }
-        });
-        return jieji;
-      },
-      //获取系列列表
-      getLineTeamList(lineId) {
-        this.LineTeamList = [];
-        this.apipost(
-          "team_post_GetList", {
-            lineID: 14,
-            isTOOP: 1
-          },
-          res => {
-            if (res.data.resultCode == 1) {
-              this.msg.LineteamId = "-1";
-              this.LineTeamList = res.data.data;
-            }
+      GoDownLoad(item) {
+        this.$router.push({
+          name: "busHandBook",
+          query: {
+            "TCID": item.TCIDs,
+            blank: 'y',
+            tab: "手配依赖书"
           }
-        );
+        })
       },
       goUrlX(path, obj, outItem, title) {
         this.$router.push({
           name: path,
           query: {
-            "TCID": obj.TCIDS,
+            "TCID": outItem.TCIDs,
             StartDate: obj.StartDateStr,
             DayNum: obj.DayNum,
             TotalNumber: obj.TotalSeat, //机位总数
@@ -380,17 +379,17 @@
       },
       getList() {
         this.loading = true
-        this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
+        this.apipost('bus_Get_GetBusUniteCombinationNumService', this.msg, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
-            this.list = res.data.data.pageData.data;
+            this.DataList = res.data.data.pageData.data;
             this.thLengthTitle = [];
             this.colspanTotal = res.data.data.pageData.columnsCount + 12;
             for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
               this.thLengthTitle.push('第' + i + '天');
             }
-            this.list.forEach(outItem => {
+            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;
@@ -399,7 +398,7 @@
                 }
               })
             })
-            this.$forceUpdate()
+            this.$forceUpdate();
           } else {
             this.$message.error(res.data.message);
           }
@@ -415,11 +414,12 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
-      let width = window.innerWidth - 50
-      let height = window.innerHeight - 65 - 210
-      console.log(height)
+      this.msg.StartDate = "2019-04-20";
+      let width = window.innerWidth - 50;
+      let height = window.innerHeight - 65 - 210;
       this.boxHeight = height;
-      this.offsetwidth = width
+      this.offsetwidth = width;
+      this.msg.CombinationNum = 'JVS0422OTC-NHA';
       this.getList();
       this.getLineTeamList();
     },