页面修改

src/components/Ticketing/PassengerList.vue

@@ -116,8 +116,8 @@
           </table>
         </li>
         <li>
-          <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" style="display:none" />
-          <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" />
+          <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" />
+          <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" style="display:none" />
         </li>
       </ul>
     </div>
@@ -192,10 +192,10 @@
             公司/城市
           </th>
           <th colspan="6">
-             去程
+            去程
           </th>
           <th colspan="6">
-             回程
+            回程
           </th>
         </tr>
         <tr>
@@ -212,30 +212,30 @@
           <th>起飞机场</th>
           <th>到达机场</th>
         </tr>
-          <tr v-for="subItem in combineTeamList">
-            <td>{{subItem.TCNUM}}({{subItem.TCID}})</td>
-            <td>{{subItem.UnionBranchName}}({{subItem.UnionCityName}})</td>
-            <td>{{subItem.GoFlightDateStr}}</td>
-            <td>{{subItem.GoFlight_number}}</td>
-            <td>
-              <el-input class="w60" v-model="subItem.GoDepartTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
-            <td>
-              <el-input class="w60" v-model="subItem.GoArriveTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
-            </td>
-            </td>
-            <td>{{subItem.GoDepartAirportName}}</td>
-            <td>{{subItem.GoArrivalAirportName}}</td>
-            <td>{{subItem.BackFlightDateStr}}</td>
-            <td>{{subItem.BackFlight_number}}</td>
-            <td>
-              <el-input class="w60" v-model="subItem.BackDepartTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
-            <td>
-              <el-input class="w60" v-model="subItem.BackArriveTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
-            </td>
-            </td>
-            <td>{{subItem.BackDepartAirportName}}</td>
-            <td>{{subItem.BackArrivalAirportName}}</td>
-          </tr>
+        <tr v-for="subItem in combineTeamList">
+          <td>{{subItem.TCNUM}}({{subItem.TCID}})</td>
+          <td>{{subItem.UnionBranchName}}({{subItem.UnionCityName}})</td>
+          <td>{{subItem.GoFlightDateStr}}</td>
+          <td>{{subItem.GoFlight_number}}</td>
+          <td>
+            <el-input class="w60" v-model="subItem.GoDepartTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
+          <td>
+            <el-input class="w60" v-model="subItem.GoArriveTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
+          </td>
+          </td>
+          <td>{{subItem.GoDepartAirportName}}</td>
+          <td>{{subItem.GoArrivalAirportName}}</td>
+          <td>{{subItem.BackFlightDateStr}}</td>
+          <td>{{subItem.BackFlight_number}}</td>
+          <td>
+            <el-input class="w60" v-model="subItem.BackDepartTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
+          <td>
+            <el-input class="w60" v-model="subItem.BackArriveTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
+          </td>
+          </td>
+          <td>{{subItem.BackDepartAirportName}}</td>
+          <td>{{subItem.BackArrivalAirportName}}</td>
+        </tr>
       </table>
       <div slot="footer" class="dialog-footer">
         <button class="normalBtn" type="primary" @click="getCheckInfo()">确认航班信息</button> &nbsp;
@@ -336,12 +336,20 @@
           }
           FlightList.push(obj);
         })
-        var unionFlightList=[];
-
+        var unionFlightList = [];
+        this.combineTeamList.forEach(item => {
+          unionFlightList.push({
+            Id: item.Id,
+            GoDepartTime: item.GoDepartTime,
+            GoArriveTime: item.GoArriveTime,
+            BackDepartTime: item.BackDepartTime,
+            BackArriveTime: item.BackArriveTime
+          });
+        });
         let msg = {
           AirTicketId: this.$route.query.id,
           FlightList: FlightList,
-          UnionFlightList:unionFlightList
+          UnionFlightList: unionFlightList
         }
         this.apipost("ticket_post_SetFlightChildConfirm", msg, res => {
           if (res.data.resultCode == 1) {