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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -1401,10 +1401,6 @@
         });
       },
       goUrl(_orderSource, _type) {
-        // console.log(this.list.BusList[0],_type,'=====')
-        // console.log(this.list.HotelOrderListReport,'OrderID=====')
-        // console.log(this.list.DiningList,'=====')
-        // console.log(this.list.ScenicList,'=====')
         if(_orderSource==8){
           this.AddOutDetail()
           return
@@ -2189,7 +2185,6 @@
           TCID: this.$route.query.id
         }, res => {
           if (res.data.resultCode == 1) {
-            // console.log(res.data.data,'成本财务单据')
             res.data.data.forEach(item=>{
               if(item.EduCommissionEmp==null||item.EduCommissionEmp==""){
                 this.getOrderList('',item,2,item.OrderSource)

src/components/SalesModule/groupTourOrder.vue

@@ -2501,6 +2501,7 @@
           isOrder: "1",
           UnionRemark: "", //新联运备注
           IsIntermodal: 0, //是否联运
+          TeamType: 0, //团队类型(0-常规，1-小包团，2-当地游)
         },
         IsUnion: 2,
         IsChargeLossOrders: 0,
@@ -3480,6 +3481,7 @@
           this.remarksMsg.isOrder = obj.isOrder;
           this.remarksMsg.UnionRemark = obj.unionRemark;
           this.remarksMsg.IsIntermodal = obj.isIntermodal;
+          this.remarksMsg.TeamType = obj.teamType;
           this.isShowLayerRemarks = true;
         }
       },

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -3272,6 +3272,7 @@
           isOrder: 1,
           UnionRemark: "", //新联运备注
           IsIntermodal: 0, //是否联运
+          TeamType:0,//团队类型(0-常规，1-小包团，2-当地游)
         },
         IsChargeLossOrders: 0,
         Unit_PriceList: [], //成交单价下拉数据
@@ -4627,6 +4628,7 @@
           this.remarksMsg.OldRemarks = obj.remarks;
           this.remarksMsg.UnionRemark = obj.unionRemark;
           this.remarksMsg.IsIntermodal = obj.isIntermodal;
+             this.remarksMsg.TeamType = obj.teamType;
           this.isShowLayerRemarks = true;
         }
       },

src/components/SalesModule/groupTourOrderByTuanOne.vue

@@ -2367,6 +2367,7 @@
           isOrder: 1,
           UnionRemark: "", //新联运备注
           IsIntermodal: 0, //是否联运
+          TeamType: 0, //团队类型(0-常规，1-小包团，2-当地游)
         },
         IsChargeLossOrders: 0,
         Unit_PriceList: [], //成交单价下拉数据
@@ -3577,8 +3578,8 @@
           this.remarksMsg.OldRemarks = obj.remarks;
           this.remarksMsg.UnionRemark = obj.unionRemark;
           this.remarksMsg.IsIntermodal = obj.isIntermodal;
+          this.remarksMsg.TeamType = obj.teamType;
         }
-
         //HK 新加
         if (this.IsSupperOrderEdit || this.IsLookOrder) {
           //todo
@@ -4385,7 +4386,6 @@
           "sellorder_post_GetOneDayTCNUMOrderList",
           this.tuanMsg,
           res => {
-            console.log("res",res.data);
             if (res.data.resultCode == 1) {
               this.loading = false;
               this.total = res.data.data.count;

src/components/SalesModule/groupTourOrderOne.vue

@@ -1914,6 +1914,7 @@
           isOrder: '1',
           UnionRemark: "", //新联运备注
           IsIntermodal: 0, //是否联运
+          TeamType: 0, //团队类型(0-常规，1-小包团，2-当地游)
         },
         IsUnion: 2,
         IsChargeLossOrders: 0,
@@ -2810,6 +2811,7 @@
           this.remarksMsg.isOrder = obj.isOrder;
           this.remarksMsg.UnionRemark = obj.unionRemark;
           this.remarksMsg.IsIntermodal = obj.isIntermodal;
+          this.remarksMsg.TeamType = obj.teamType;
         }
       },
       getDetail(obj) {

src/components/Ticketing/TicketTransport.vue

@@ -28,7 +28,7 @@
   }
 
   .DT_rightList .DT_Table {
-    width: 1400px;
+    width: 1600px;
     border-collapse: collapse;
   }
 
@@ -70,9 +70,9 @@
 <template>
   <div class="clearfix">
     <div class="DT_rightList">
-      <div class="TMTitle"><i></i>联运设置</div>
+      <div class="TMTitle"><i></i>票务联运配置</div>
       <!--保存-->
-      <input type='button' class="normalBtn" @click="SaveUnion()" value="保存"></input>
+      <input type='button' class="normalBtn" @click="SaveUnion()" value="保存" />
       <table class="singeRowTable DT_Table" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
         <thead>
           <tr>
@@ -85,7 +85,12 @@
             <th width="150">
               订单信息
             </th>
-
+            <th width="150">
+              销售人员
+            </th>
+            <th width="150">
+              旅客名单
+            </th>
             <th width="100">
               航段
             </th>
@@ -98,7 +103,7 @@
             <th width="200">
               航班
             </th>
-            <th width="100">
+            <th width="120">
               是否住宿
             </th>
             <th width="110">
@@ -110,10 +115,13 @@
             <th width="500">
               票务备注
             </th>
+            <th width="120">
+              确认状态
+            </th>
           </tr>
         </thead>
         <template v-if="UnionList&&UnionList.length>0">
-          <tbody v-for="(item,index) in UnionList" :key="index">
+          <tbody v-for="(item,index) in UnionList" :key="index" style="padding-top:10px;">
             <tr>
               <td rowspan="2">
                 <el-select class="w120" filterable v-model="item.UnionBranchId" :disabled="true">
@@ -134,6 +142,12 @@
               <td rowspan="2">
                 {{item.OrderId}}
               </td>
+              <td rowspan="2">
+                {{item.OrderCreateByName}}
+              </td>
+              <td rowspan="2">
+                {{item.GuestNames}} 
+              </td>
               <td>
                 去程
               </td>
@@ -177,6 +191,12 @@
                 <el-input type="textarea" v-model="item.Notes" placeholder="请填写票务备注">
                 </el-input>
               </td>
+              <td rowspan="2">
+                <el-select placeholder="请选择" v-model="item.IsSure">
+                  <el-option :key="0" :value="0" label="待定"></el-option>
+                  <el-option :key="1" :value="1" label="确认"></el-option>
+                </el-select>
+              </td>
             </tr>
             <tr>
               <td>返程</td>
@@ -210,7 +230,7 @@
               </td>
             </tr>
             <tr>
-              <td colspan="11" style="text-align:left;font-weight:bold;color:red;">
+              <td colspan="14" style="text-align:left;font-weight:bold;color:red;">
                 订单备注:{{item.Remarks}} <br />
                 联运备注:{{item.UnionRemark}}
               </td>
@@ -219,7 +239,7 @@
         </template>
         <tbody v-else>
           <tr>
-            <td colspan="11">
+            <td colspan="14">
               暂无配置联运信息
             </td>
           </tr>
@@ -294,7 +314,7 @@
         this.UnionList = [];
         this.loading = true;
         this.apipost(
-          "AirTicket_get_GetNewUnionTicketListByTCID", {
+          "AirTicket_get_GetUnionTicketListByTCIDNew", {
             TCID: this.TCID
           },
           res => {
@@ -377,7 +397,7 @@
           SaveData: this.UnionList,
           TCID: this.TCID
         };
-        this.apipost("AirTicket_get_SetNewUnionTicket", msg, res => {
+        this.apipost("AirTicket_get_SetUnionTicketV3", msg, res => {
           if (res.data.resultCode == 1) {
             this.Success("设置联运成功!");
             this.ArrList = [];

src/components/orderCommon/order-remark.vue

@@ -47,7 +47,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <el-row :gutter="20" v-if="postMsg.TeamType!=2">
         <el-col :span="3">
           <el-form-item label="联运信息">
             <el-checkbox v-model="postMsg.IsIntermodal" :true-label="1" :false-label="0">
@@ -82,6 +82,7 @@
           isOrder: 1, //1-可以修改，0-不能修改【默认可以修改】
           UnionRemark: "", //新联运备注
           IsIntermodal: 0, //是否联运
+          TeamType:0,//团队类型(0-常规，1-小包团，2-当地游)
         },
       };
     },
@@ -130,12 +131,12 @@
       remarksMsg: {
         immediate: true,
         handler(newVal) {
-          console.log("remarksMsg", this.remarksMsg);
           this.postMsg.OrderId = this.remarksMsg.OrderId;
           this.postMsg.Remarks = this.remarksMsg.Remarks;
           this.postMsg.isOrder = this.remarksMsg.isOrder;
           this.postMsg.UnionRemark = this.remarksMsg.UnionRemark;
           this.postMsg.IsIntermodal = this.remarksMsg.IsIntermodal;
+          this.postMsg.TeamType=this.remarksMsg.TeamType;
         },
         deep: true
       },

src/components/orderCommon/order-transform.vue

@@ -230,7 +230,6 @@
       transOrderPropObj: {
         immediate: true,
         handler(newVal) {
-          console.log("transOrderPropObj", newVal);
           this.transOrderMsg.OrderId = this.transOrderPropObj.OrderId;
           this.transOrderMsg.CreateByName = this.transOrderPropObj.CreateByName;
           this.transOrderMsg.OldTCID = this.transOrderPropObj.OldTCID;