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

src/components/SalesModule/planeTicketInquiry.vue

@@ -1183,6 +1183,11 @@
 						   <el-input v-model='addMsg.OldPeopleNum' :disabled="addMsg.GroupType==='4'"  @keyup.native="checkInteger(addMsg,'OldPeopleNum')"  @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
 						</el-form-item>
 					</el-col>
+          <el-col :span="4">
+						<el-form-item label="签证数量" prop="VisaNum">
+						   <el-input v-model='addMsg.VisaNum'  @keyup.native="checkInteger(addMsg,'VisaNum')" @input='getTotalPrice();'></el-input>
+						</el-form-item>
+					</el-col>
 					<!-- <el-col :span="4">
 						<el-form-item label="单地接数量" prop="AirticketNum">
 						   <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"    @input='getNumber();getTotalPrice();getHouseNo()'></el-input>

src/components/SalesModule/planeTourOrder.vue

@@ -647,6 +647,11 @@
 						   <el-input v-model='addMsg.OldPeopleNum'   @keyup.native="checkInteger(addMsg,'OldPeopleNum')"  @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
 						</el-form-item>
 					</el-col>
+          <el-col :span="4">
+						<el-form-item label="签证数量" prop="VisaNum">
+						   <el-input v-model='addMsg.VisaNum'  @keyup.native="checkInteger(addMsg,'VisaNum')"    @input='getTotalPrice();'></el-input>
+						</el-form-item>
+					</el-col>
 					<!-- <el-col :span="4">
 						<el-form-item label="单地接数量" prop="AirticketNum">
 						   <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"    @input='getNumber();getTotalPrice();getHouseNo()'></el-input>
@@ -669,11 +674,7 @@
 						   <el-input v-model='addMsg.TripleRoomNum'  @keyup.native="checkInteger(addMsg,'TripleRoomNum')"    @input='yzBigBed1();getTotalPrice()'></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :span="4">
-						<el-form-item label="签证数量" prop="VisaNum">
-						   <el-input v-model='addMsg.VisaNum'  @keyup.native="checkInteger(addMsg,'VisaNum')"    @input='getTotalPrice();yzVisaNum()'></el-input>
-						</el-form-item>
-					</el-col>
+					
 					<el-col :span="4">
 						<el-form-item label="保险数量" prop="SaleNum">
 						   <el-input v-model='addMsg.SafeNum'  @keyup.native="checkInteger(addMsg,'SafeNum')"    @input='getTotalPrice();yzSafeNum()'></el-input>

src/components/dmc/manager/groundOperation.vue

@@ -201,6 +201,7 @@
           <th>{{ $t("ground.chepaihao") }}</th>
           <th>{{ $t("ground.sijiName") }}</th>
           <th>{{ $t("ground.sijiPhone") }}</th>
+          <th>司机住宿</th>
           <th>{{ $t("pub.pubRemark") }}</th>
         </tr>
         <tr v-for="item in DMCStaticsCommon.BusList">
@@ -209,6 +210,7 @@
           <td>{{ item.BusNum }}</td>
           <td>{{ item.DriverName }}</td>
           <td>{{ item.DriverTel }}</td>
+          <td>{{ item.AccommodationTypeStr }}</td>
           <td width="300">{{ item.Remarks }}</td>
         </tr>
       </table>

src/components/dmc/manager/groundOperation2.vue

@@ -453,15 +453,14 @@ export default {
         msg,
         res => {
           this.loading2 = false;
-          console.log("res.data",res.data.data);
           if (res.data.resultCode == 1) {
-            // this.BaseInfo = res.data.data.BaseInfo;
-            // this.PrincipalList = res.data.data.PrincipalList;
-            // this.JourneyTitle = res.data.data.JourneyTitle;
-            // this.guestList = res.data.data.guestList;
-            // this.DMCStaticsCommon = res.data.data.DMCStaticsCommon;
-            // this.shopList = res.data.data.shopList;
-            // this.PostConfig = res.data.data.DMCStaticsCommon.LeaderApply;
+            this.BaseInfo = res.data.data.BaseInfo;
+            this.PrincipalList = res.data.data.PrincipalList;
+            this.JourneyTitle = res.data.data.JourneyTitle;
+            this.guestList = res.data.data.guestList;
+            this.DMCStaticsCommon = res.data.data.DMCStaticsCommon;
+            this.shopList = res.data.data.shopList;
+            this.PostConfig = res.data.data.DMCStaticsCommon.LeaderApply;
           } else {
             this.Error(res.data.message);
           }

src/router/config.js

@@ -4241,6 +4241,22 @@ export default {
                 title: '单项合同'
             },
         },
+        {
+            path: '/DomesticTravelcontract', //境内合同
+            name: 'DomesticTravelcontract',
+            component: resolve => require(['@/components/DomesticTravelcontract'], resolve),
+            meta: {
+                title: '单项合同'
+            },
+        },
+        {
+            path: '/onedayTripContract', //一日游合同
+            name: 'onedayTripContract',
+            component: resolve => require(['@/components/onedayTripContract'], resolve),
+            meta: {
+                title: '一日游合同'
+            },
+        },
         {
             path: '/TravelContractDetail', //新电子合同详情
             name: 'TravelContractDetail',