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/busManagement/busHandBook.vue

 <style>
-  .busManagerTalbe {
+.busManagerTalbe {
   font-size: 12px;
   border-collapse: collapse;
   background-color: #fff;
   border: 1px solid #ccc;
-
-  }
-  .busManagerTalbe tr {
+}
+.busManagerTalbe tr {
   text-align: center;
   height: 40px;
-  }
-  .busManagerTalbe tr td{
-    padding:0 5px;
+}
+.busManagerTalbe tr td {
+  padding: 0 5px;
   background-color: #fff;
   border: 1px solid #ccc;
-  }
-  .commonBackColor {
-    background-color: #E6E6E6!important;
+}
+.commonBackColor {
+  background-color: #e6e6e6 !important;
   color: #333;
-  }
+}
 
-  .comTextAlign {
+.comTextAlign {
   text-align: left;
   padding-left: 20px;
-  }
+}
 
-  .addHandBook{
+.addHandBook {
   margin-right: 5px;
   color: seagreen;
   cursor: pointer;
   visibility: hidden;
-  }
-  .addHandBookDIS{
-    visibility: visible!important;
-  }
-  .disClick {
+}
+.addHandBookDIS {
+  visibility: visible !important;
+}
+.disClick {
   background-color: #d1d1d1;
   color: #fff;
   border: 1px solid #d1d1d1;
-  }
+}
 
-  .disClick:hover {
+.disClick:hover {
   background-color: #d1d1d1 !important;
   cursor: default !important;
   box-shadow: none !important;
-  }
+}
 </style>
 <template>
   <div>
-    <table border="0" cellspacing="1" cellpadding="0" class="busManagerTalbe" style="width: 100%;" v-loading='loading'>
+    <table
+      border="0"
+      cellspacing="1"
+      cellpadding="0"
+      class="busManagerTalbe"
+      style="width: 100%;"
+      v-loading="loading"
+    >
       <tr>
         <td colspan="6">印象ｼﾞｬﾊﾟﾝバス手配依頼書</td>
       </tr>
@@ -92,10 +98,22 @@
         <td class="commonBackColor" width="400">ホテル</td>
         <td class="commonBackColor" width="300">ホテルTEL</td>
       </tr>
-      <tr v-for="(subItem,index) in DataObj.Details_Extends">
+      <tr v-for="(subItem, index) in DataObj.Details_Extends">
         <td>
-          <i class="iconfont icon-bumenguanli-tianjia addHandBook" :class="{'addHandBookDIS':index==0||index==DataObj.Details_Extends.length-1}" @click="addHand(index)"></i>         
-          <el-date-picker v-model='subItem.UseDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+          <i
+            class="iconfont icon-bumenguanli-tianjia addHandBook"
+            :class="{
+              addHandBookDIS:
+                index == 0 || index == DataObj.Details_Extends.length - 1
+            }"
+            @click="addHand(index)"
+          ></i>
+          <el-date-picker
+            v-model="subItem.UseDate"
+            class="w135"
+            value-format="yyyy-MM-dd"
+            type="date"
+          ></el-date-picker>
         </td>
         <td>
           <el-input type="text" v-model="subItem.BusType" />
@@ -104,13 +122,28 @@
           <el-input type="text" v-model="subItem.FlightNum" />
         </td>
         <td>
-          <el-input type="textarea" resize="none" style="padding:5px 0;" v-model="subItem.BusContent" />
+          <el-input
+            type="textarea"
+            resize="none"
+            style="padding:5px 0;"
+            v-model="subItem.BusContent"
+          />
         </td>
         <td>
-          <el-input type="textarea" resize="none" style="padding:5px 0;" v-model="subItem.HotelName" />
+          <el-input
+            type="textarea"
+            resize="none"
+            style="padding:5px 0;"
+            v-model="subItem.HotelName"
+          />
         </td>
         <td>
-          <el-input type="textarea" resize="none" style="padding:5px 0;" v-model="subItem.HotelTel" />
+          <el-input
+            type="textarea"
+            resize="none"
+            style="padding:5px 0;"
+            v-model="subItem.HotelTel"
+          />
         </td>
       </tr>
       <tr>
@@ -120,17 +153,57 @@
         </td>
       </tr>
       <tr>
-        <td colspan="6" class="comTextAlign">*迎えや送りは必要・不要となることは、必ず標記してください。</td>
+        <td colspan="6" class="comTextAlign">
+          *迎えや送りは必要・不要となることは、必ず標記してください。
+        </td>
       </tr>
       <tr>
-        <td colspan="6" class="comTextAlign">*直接バス會社へ送付するので、必ず日本語でご記入ください。</td>
+        <td colspan="6" class="comTextAlign">
+          *直接バス會社へ送付するので、必ず日本語でご記入ください。
+        </td>
       </tr>
       <tfoot>
         <tr>
           <td colspan="6">
-            <input type="button" class="normalBtn" :class="{'disClick':isSave}" @click="SaveData()" value="保存" />
-            <input type="button" class="normalBtn" :class="{'disClick':isSave}" @click="DownLoadFile()"
-              value="下载" />
+            <input
+              type="button"
+              class="normalBtn"
+              :class="{ disClick: isSave }"
+              @click="SaveData()"
+              value="保存"
+            />&nbsp;
+            <input
+              type="button"
+              class="normalBtn"
+              :class="{ disClick: isSave }"
+              @click="DownLoadFile()"
+              value="下载"
+            />
+            &nbsp;
+            <template v-if="BusObj.BusId > 0">
+              <template v-if="BusObj.OrderState == 0">
+                <span style="color:red;">未确认手配</span>
+                <input
+                  type="button"
+                  class="normalBtn"
+                  @click="SureBus(1)"
+                  value="确认手配"
+                />
+              </template>
+              <template v-if="BusObj.OrderState == 1">
+                <span style="color:green;">已确认手配</span>
+                <input
+                  type="button"
+                  class="normalBtn"
+                  @click="SureBus(0)"
+                  value="暂定手配"
+                />
+              </template>
+            </template>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="6" style="height:25px;">
           </td>
         </tr>
       </tfoot>
@@ -139,7 +212,7 @@
 </template>
 
 <script>
-  export default {
+export default {
   data() {
     return {
       loading: false,
@@ -155,11 +228,33 @@
         Remarks: "",
         Details_Extends: []
       },
+      BusObj: {
+        BusId: 0,
+        OrderState: 1 //0暂定，1-OK
+      },
       isSave: false,
       TCIDS: ""
-      }
+    };
   },
   methods: {
+    //确认手配
+    SureBus(type) {
+      this.loading = true;
+      this.BusObj.OrderState=type;
+      this.apipost(
+        "bus_post_SetBusService",
+        this.BusObj,
+        res => {
+          this.loading = false;
+          if (res.data.resultCode == 1) {
+            this.GetData();
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        err => {}
+      );
+    },
     DownLoadFile(item) {
       if (!this.isSave) {
         this.isSave = true;
@@ -168,8 +263,7 @@
         };
         this.loading = true;
         var fileName = "バス手配依頼書" + this.DataObj.TeamNum + ".xls";
-          this.GetLocalFile("bus_get_DownLoadBusConfig", msg, fileName,
-            res => {
+        this.GetLocalFile("bus_get_DownLoadBusConfig", msg, fileName, res => {
           this.loading = false;
           this.isSave = false;
         });
@@ -177,22 +271,32 @@
     },
     GetData() {
       this.loading = true;
-        this.apipost('bus_Get_GetBusDownLoadData', {
+      this.apipost(
+        "bus_Get_GetBusDownLoadData",
+        {
           TCIDs: this.TCIDS
-        }, res => {
+        },
+        res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
-            this.DataObj = res.data.data;
+            this.DataObj = res.data.data.model;
+            this.BusObj.BusId = res.data.data.BusId;
+            this.BusObj.OrderState = res.data.data.OrderState;
           } else {
             this.Error(res.data.message);
           }
-        }, err => {})
+        },
+        err => {}
+      );
     },
     SaveData() {
       if (!this.isSave) {
         this.isSave = true;
         this.DataObj.TCIDS = this.TCIDS;
-          this.apipost('bus_Post_SaveBusDownLoadData', this.DataObj, res => {
+        this.apipost(
+          "bus_Post_SaveBusDownLoadData",
+          this.DataObj,
+          res => {
             if (res.data.resultCode == 1) {
               this.Success("操作成功");
               this.GetData();
@@ -200,30 +304,32 @@
               this.Error(res.data.message);
             }
             this.isSave = false;
-          }, err => {})
+          },
+          err => {}
+        );
       }
     },
     //添加
-      addHand(index){
+    addHand(index) {
       var obj = {
-          BusContent:'',
-          BusType:'',
-          FlightNum:'',
-          HotelName:'',
-          HotelTel:'',
-          Id:0,
-          MainId:0,
-          UseDate:''
-        }
+        BusContent: "",
+        BusType: "",
+        FlightNum: "",
+        HotelName: "",
+        HotelTel: "",
+        Id: 0,
+        MainId: 0,
+        UseDate: ""
+      };
       var date = new Date();
       var year = date.getFullYear();
       var month = date.getMonth() + 1;
       var day = date.getDate();
-        var UseDate = year+'-'+month+"-"+day;
-        obj.UseDate = UseDate
-        if(index==0){
-          this.DataObj.Details_Extends.unshift(obj)
-        }else{
+      var UseDate = year + "-" + month + "-" + day;
+      obj.UseDate = UseDate;
+      if (index == 0) {
+        this.DataObj.Details_Extends.unshift(obj);
+      } else {
         this.DataObj.Details_Extends.push(obj);
       }
     }
@@ -231,7 +337,6 @@
   mounted() {
     this.TCIDS = this.$route.query.TCID;
     this.GetData();
-    },
   }
-
+};
 </script>

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',