Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelList/RegistrationStatistics.vue

@@ -116,9 +116,9 @@
           <td>{{item.B2CMemberPrice}}</td>
           <td>{{item.TotalSeat}}</td>
           <td>
-              <span class="Order_RS" :class="{'RS_RedType':item.OrderTotalNum>0}"  @click="goUrl('RegistrationList',item.TCID)">{{item.OrderTotalNum-item.OrderLeaderGuestNum}}<span v-if="item.OrderLeaderGuestNum>0">+{{item.OrderLeaderGuestNum}}</span></span>
+              <span class="Order_RS" :class="{'RS_RedType':item.OrderTotalNum>0}"  @click="goUrl('RegistrationList',item.TCID,'设置领队')">{{item.OrderTotalNum-item.OrderLeaderGuestNum}}<span v-if="item.OrderLeaderGuestNum>0">+{{item.OrderLeaderGuestNum}}</span></span>
           </td>
-          <td><span class="Order_RS"  @click="goUrl('RegistrationList',item.TCID)">{{item.OrderPaymentNum}}</span></td>
+          <td><span class="Order_RS"  @click="goUrl('RegistrationList',item.TCID,'设置领队')">{{item.OrderPaymentNum}}</span></td>
           <td><span :class="item.LeaderName!=''&&item.LeaderName!=null?'PingFangSC Order_RS':'Order_RS'" @click="goUrl('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName!=""&&item.LeaderName!=null ?item.LeaderName:"设置领队"}}</span></td>
           <td><span :class="item.GuideName!=''&&item.GuideName!=null?'RS_RedType PingFangSC Order_RS':'Order_RS'" @click="goUrl('leaderArrangement',item.TCID,'设置导游')">{{item.GuideName!=""&&item.GuideName!=null?item.GuideName:"设置导游"}}</span></td>
           <td><span class="RS_Nameover">{{item.OPRemark}}</span></td>
@@ -265,9 +265,10 @@ export default {
         "报名统计.xls"
       );
     },
-    goUrl(path, id) {
+    goUrl(path, id,NameStr) {
       if (id > 0) {
-        this.$router.push({name: path, query: {id: id}});
+        this.$router.push({name: path, query: {id: id,blank: "y",
+          tab: NameStr}});
       } else {
         this.$router.push({name: path});
       }

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1176,7 +1176,8 @@
                     item.SalePlatList.push(parseInt(y))
                   })
                 }
-              })
+                //console.log("HotelOrderListReports",item.HotelOrderListReports);
+              });
             }
           },
           err => {}
@@ -1782,7 +1783,7 @@
       if (this.queryCommonData.IsParentCompany != 1) {
         this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
       }
-      this.getControlList()
+      this.getControlList();
     }
   }
 

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -55,8 +55,8 @@
       v-loading="QueryMsg.loading"
     >
       <tr>
-        <th width="50">ID</th>
-        <th width="50">分房</th>
+        <th width="50">房间数</th>
+        <th width="50">房号</th>
         <th width="130">酒店及房型</th>
         <th width="130">旅客姓名</th>
         <th width="110">英文姓</th>
@@ -82,8 +82,8 @@
       </tr>
       <tbody v-for="(item,index) in QueryMsg.dataList" :key="index">
         <tr v-for="(subItem,subIndex) in item">
-          <td>{{subItem.Number}}</td>
-          <td>{{subItem.HouseNo!="10000"?subItem.HouseNo:""}}</td>
+          <td v-if="subIndex==0" :rowspan="subItem.RowsCount">{{index+1}}</td>
+          <td v-if="subIndex==0" :rowspan="subItem.RowsCount"></td>
           <td>{{getHouseTypeStr(subItem)}}</td>        
           <td>{{subItem.GuestName}}</td>
           <td>{{subItem.ESurName}}</td>
@@ -106,11 +106,11 @@
           </td>
           <td>{{subItem.VisaType}}</td>
         </tr>
-        <tr height="30">
+        <!-- <tr height="30">
           <td colspan="21" align="left">
             <span class="colorE95252" style="text-align:left">备注：{{item[0].Remarks}}</span>
           </td>
-        </tr>
+        </tr> -->
       </tbody>
     </table>
   </div>

src/components/busManagement/busHandBook.vue

+<style>
+  .busManagerTalbe {
+    background: #ccc;
+    font-size:12px;
+  }
+  .busManagerTalbe tr {
+    background: #fff;
+    text-align: center;
+    height: 40px;
+  }
+  .commonBackColor {
+      background-color: #E6E6E6;
+      color:#333;
+  }
+  .comTextAlign{
+      text-align: left;
+      padding-left: 20px;
+  }
+</style>
+<template>
+    <div>
+        <table border="0" cellspacing="1" cellpadding="0" class="busManagerTalbe" style="width: 100%;">
+            <tr>
+                <td colspan="6">印象ｼﾞｬﾊﾟﾝバス手配依頼書</td>
+            </tr>
+            <tr>
+                <td class="commonBackColor">団　體　名：</td>
+                <td colspan="5" class="comTextAlign">HP20190428A1</td>
+            </tr>
+            <tr>
+                <td class="commonBackColor">ガイド名前：</td>
+                <td class="comTextAlign">张三丰</td>
+                <td class="commonBackColor">攜帯番號：</td>
+                <td colspan="3" class="comTextAlign">123456789</td>
+            </tr>
+            <tr>
+                <td class="commonBackColor">人　　  數：</td>
+                <td colspan="5" class="comTextAlign">25+1</td>
+            </tr>
+            <tr>
+                <td class="commonBackColor">バス　種類：</td>
+                <td colspan="5" class="comTextAlign">1</td>
+            </tr>
+            <tr>
+                <td class="commonBackColor">スケジュール：</td>
+                <td colspan="5" class="comTextAlign"></td>
+            </tr>
+            <tr>
+                <td class="commonBackColor">日付</td>
+                <td class="commonBackColor">用車状況</td>
+                <td class="commonBackColor">便名</td>
+                <td class="commonBackColor">スケジュール內容</td>
+                <td class="commonBackColor">ホテル</td>
+                <td class="commonBackColor">ホテルTEL</td>
+            </tr>
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>備考欄：</td>
+                <td colspan="5" class="comTextAlign">04/28日接机+0天+05/04日东京成田国际机场送机，订房号：HP20190428A1</td>
+            </tr>
+            <tr>
+                <td colspan="6" class="comTextAlign">*迎えや送りは必要・不要となることは、必ず標記してください。</td>
+            </tr>
+            <tr>
+                <td colspan="6" class="comTextAlign">*直接バス會社へ送付するので、必ず日本語でご記入ください。</td>
+            </tr>
+        </table>
+    </div>
+</template>

src/router/config.js

@@ -1320,6 +1320,14 @@ export default {
                                 title: '添加修改车控页面'
                             },
                         },
+                        {
+                            path: '/busHandBook',   //首配依赖书
+                            name: 'busHandBook',
+                            component: resolve => require(['@/components/busManagement/busHandBook'], resolve),
+                            meta: {
+                                title: '手配依赖书'
+                            },
+                        },
                         { //车控供应商
                             path: '/busSuplier',
                             name: 'busSuplier',