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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -112,6 +112,19 @@
         </td>
         <td>
           {{item.AirportPickUpStr}}
+          <template v-if="item.AirportPickUp==15 && item.MergeList && item.MergeList.length>0"
+            v-for="(subItem,subIndex) in item.MergeList">
+            <div :key="subIndex" style="color:blue;white-space:nowrap;cursor:pointer;text-decoration:underline;" @click="GoToLeader(subItem)">
+              套车团号：{{subItem.MTCNUM}}({{subItem.MTCID}})
+            </div>
+          </template>
+
+        <template v-if="item.MergePlanList && item.MergePlanList.length>0"
+            v-for="(subItem,subIndex) in item.MergePlanList">
+            <div :key="subIndex" style="color:blue;white-space:nowrap;cursor:pointer;text-decoration:underline;" @click="GoToLeader(subItem)">
+              被套车团号：{{subItem.MTCNUM}}({{subItem.TCIDs}})
+            </div>
+          </template>
         </td>
         <td>
           {{item.CostPrice >= 0 && item.CostPrice !== null ? moneyFormat(item.CostPrice) : ''}}
@@ -124,7 +137,7 @@
           <span v-else-if="item.PayType === 6">合团公司支付</span>
           <span v-else-if="item.PayType === 8">酒店接送</span>
           <span v-else></span>
-          <br/>
+          <br />
           <span v-show="item.PayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
         </td>
         <td>
@@ -228,7 +241,8 @@
               </template>
             </td>
             <td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">
-              <a target="_blank" v-if="subItem.ContractUrl!==''" :href="subItem.ContractUrl" style="text-decoration: underline; cursor: pointer;color:red">查看手配书</a>
+              <a target="_blank" v-if="subItem.ContractUrl!==''" :href="subItem.ContractUrl"
+                style="text-decoration: underline; cursor: pointer;color:red">查看手配书</a>
             </td>
             <td v-if="childIndex==0" :rowspan="6" style="text-align:left;color:red; ">
               {{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
@@ -367,12 +381,12 @@
               <span v-else-if="subItem.DMCPayType === 9">月结</span>
               <span v-else-if="subItem.DMCPayType === 11">刷卡</span>
               <span v-else-if="subItem.DMCPayType === 10">领队导游垫付</span>
-              <br/>
+              <br />
               <span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
             </td>
             <td v-if="childIndex==0" :rowspan="6">
               <span>{{subItem.SupplierName}}
-                <br/>
+                <br />
                 <template v-if="subItem.SupplierPayType !== 0">
                   <span v-if="subItem.SupplierPayType == 1">
                     现付
@@ -698,10 +712,9 @@
             <template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
               <input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn"
                 @click="goZhiDan(item, 2)" />
-              <template  v-if="item.hideZDBtn && ContractUrlCount == 0" >
+              <template v-if="item.hideZDBtn && ContractUrlCount == 0">
                 <el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
-                  <input type="button" value="制单" class="normalBtn"
-                    @click="goZhiDan(item,0,leadr,cur)" />
+                  <input type="button" value="制单" class="normalBtn" @click="goZhiDan(item,0,leadr,cur)" />
                 </el-tooltip>
               </template>
               <template v-else-if="ContractUrlCount !== 0 && index2==0">
@@ -801,9 +814,11 @@
 </template>
 
 <script>
-import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
-import { constants } from "os";
-export default {
+  import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
+  import {
+    constants
+  } from "os";
+  export default {
     data() {
       return {
         isUpdate: "false",
@@ -851,6 +866,20 @@ export default {
       commonHotelInfo
     },
     methods: {
+      GoToLeader(obj) {
+        this.$router.push({
+          name: 'leaderReimbursement',
+          query: {
+            "id": obj.TCIDs,
+            NewCombinationNum: obj.DMCNum,
+            isUpdate: true,
+            OutBranchId: 0,
+            blank: 'y',
+            tab: '用款计划',
+            lineId: 0
+          }
+        })
+      },
       // 20190815 新增领款单据重新生成自动带上计算后的金额
       goFncEditUrl(url, crId, frId) {
         let obj = {};
@@ -864,15 +893,15 @@ export default {
         if (crId == 1) {
           //人民币
           calcPrice =
-          parseInt(price / 1000) > 0
-            ? parseInt(price / 1000) * 1000
-            : parseInt(price);
+            parseInt(price / 1000) > 0 ?
+            parseInt(price / 1000) * 1000 :
+            parseInt(price);
         } else {
           // 其他
           calcPrice =
-          parseInt(price / 10000) > 0
-            ? parseInt(price / 10000) * 10000
-            : parseInt(price);
+            parseInt(price / 10000) > 0 ?
+            parseInt(price / 10000) * 10000 :
+            parseInt(price);
         }
         this.$router.push({
           name: url,
@@ -939,8 +968,7 @@ export default {
       financeinfo_post_GetList() {
         // 币种类型
         this.apipost(
-        "financeinfo_post_GetList",
-        {
+          "financeinfo_post_GetList", {
             Name: ""
           },
           res => {
@@ -949,8 +977,7 @@ export default {
               data.forEach(item => {
                 this.currencyTypeObj[item.ID] = item.Name;
               });
-          } else {
-          }
+            } else {}
           },
           err => {}
         );
@@ -979,8 +1006,7 @@ export default {
       },
       getzhuijiaList() {
         this.apipost(
-        "Financial_post_GetTravelFinanceReplenishList",
-        {
+          "Financial_post_GetTravelFinanceReplenishList", {
             TravelReplenish: this.$route.query.id
           },
           res => {
@@ -991,10 +1017,9 @@ export default {
           err => {}
         );
       },
-    getHangingAccountByTCIDList: function() {
+      getHangingAccountByTCIDList: function () {
         this.apipost(
-        "Financial_post_GetHangingAccountByTCIDList",
-        {
+          "Financial_post_GetHangingAccountByTCIDList", {
             TCIDs: this.$route.query.id
           },
           res => {
@@ -1005,7 +1030,7 @@ export default {
           err => {}
         );
       },
-    goFncUrl: function(path, id) {
+      goFncUrl: function (path, id) {
         this.$router.push({
           name: path,
           query: {
@@ -1014,7 +1039,7 @@ export default {
           }
         });
       },
-    goHotelDetail: function(id, num, TCNUM, path) {
+      goHotelDetail: function (id, num, TCNUM, path) {
         this.$router.push({
           name: path,
           query: {
@@ -1025,7 +1050,7 @@ export default {
           }
         });
       },
-    goZhiDan2: function(obj, type, leadr, cur) {
+      goZhiDan2: function (obj, type, leadr, cur) {
         let TCIDARR = [obj.TCIDS];
         let orderObj = {
           OrderID: 0,
@@ -1060,7 +1085,7 @@ export default {
           }
         });
       },
-    goZhiDan: function(obj, num, leadr, cur) {
+      goZhiDan: function (obj, num, leadr, cur) {
         if (!num) {
           let totailMoney = Number(leadr.LeaderGetPriceT) + Number(cur.yiLing);
           if (totailMoney > leadr.PlanPrice)
@@ -1071,8 +1096,7 @@ export default {
         if (this.list.hotelNoSureInfo !== "") {
           this.$confirm(
               `${this.list.hotelNoSureInfo},是否去制单？`,
-          this.$t("tips.tips"),
-          {
+              this.$t("tips.tips"), {
                 confirmButtonText: this.$t("pub.sureBtn"),
                 cancelButtonText: this.$t("pub.cancelBtn"),
                 type: "warning"
@@ -1262,8 +1286,7 @@ export default {
       getNav() {
         let _this = this;
         this.apipost(
-        "dmcstatistics_post_GetHotelStaticsByTCIDs",
-        {
+          "dmcstatistics_post_GetHotelStaticsByTCIDs", {
             TCIDs: this.$route.query.id
           },
           res => {
@@ -1349,8 +1372,7 @@ export default {
       },
       getTotalNav() {
         this.apipost(
-        "dmcstatistics_post_GetNewPlanTotalPrice_V2",
-        {
+          "dmcstatistics_post_GetNewPlanTotalPrice_V2", {
             TCIDs: this.$route.query.id
           },
           res => {
@@ -1405,67 +1427,68 @@ export default {
       this.getzhuijiaList();
       this.financeinfo_post_GetList();
     }
-};
+  };
+
 </script>
 
 <style>
-.leaderReimbursementTableNav {
+  .leaderReimbursementTableNav {
     background: #d6cece;
     width: 100%;
     margin: 20px 0;
-}
+  }
 
-.leaderReimbursementTableNav tr th {
+  .leaderReimbursementTableNav tr th {
     background: #e6e6e6;
     height: 40px;
     font-size: 12px;
     color: #333;
-}
+  }
 
-.leaderReimbursementTableNav tr {
+  .leaderReimbursementTableNav tr {
     background: #fff;
     text-align: center;
     height: 40px;
     font-size: 12px;
-}
+  }
 
-.leaderReimbursementTableNav tr td {
+  .leaderReimbursementTableNav tr td {
     background: #fff;
     text-align: center;
     height: 20px;
     font-size: 12px;
-}
+  }
 
-.leaderReimbursementTableNav ._go_detail p {
+  .leaderReimbursementTableNav ._go_detail p {
     cursor: pointer;
     line-height: 25px;
-}
+  }
 
-.leaderReimbursementTable {
+  .leaderReimbursementTable {
     width: 100%;
     margin: 20px 0;
     border-collapse: collapse;
-}
+  }
 
-.leaderReimbursementTable tr th {
+  .leaderReimbursementTable tr th {
     background: #e6e6e6;
     height: 40px;
     font-size: 13px;
     color: #333;
     border: 1px solid #ccc;
     text-align: center;
-}
+  }
 
-.leaderReimbursementTable tr td {
+  .leaderReimbursementTable tr td {
     border: 1px solid #ccc;
     line-height: 25px;
     height: 25px;
     font-size: 12px;
     background: #fff;
     text-align: center;
-}
+  }
 
-.leader2Btn {
+  .leader2Btn {
     color: #fff;
     padding: 0 15px;
     height: 30px;
@@ -1473,191 +1496,192 @@ export default {
     border: 1px solid #e95252;
     cursor: pointer;
     border-radius: 15px;
-}
+  }
 
-.Receipt_box {
+  .Receipt_box {
     padding: 15px;
     color: #c94052;
     width: 614px;
     background-color: rgba(242, 242, 242, 1);
     border: 1px solid rgba(228, 228, 228, 1);
-}
+  }
 
-.Receipt_box.color_blur {
+  .Receipt_box.color_blur {
     color: #106baf;
-}
+  }
 
-.Receipt_box.color_blur .rb_stit span {
+  .Receipt_box.color_blur .rb_stit span {
     display: inline-block;
     border-bottom: 2px solid #106baf;
     padding: 0 20px;
-}
+  }
 
-.rb_tit {
+  .rb_tit {
     font-size: 18px;
     text-align: center;
-}
+  }
 
-.rb_stit {
+  .rb_stit {
     font-size: 14px;
     text-align: center;
-}
+  }
 
-.rb_stit span {
+  .rb_stit span {
     display: inline-block;
     border-bottom: 2px solid #c94052;
     padding: 0 20px;
-}
+  }
 
-.rb_top_row {
+  .rb_top_row {
     display: flex;
     justify-content: space-between;
     font-size: 12px;
-}
+  }
 
-.rb_top_row span._r_name {
+  .rb_top_row span._r_name {
     color: #333333;
-}
+  }
 
-.rb_top_row span._r_bold {
+  .rb_top_row span._r_bold {
     font-weight: bold;
-}
+  }
 
-.rb_top_row ._r_time span {
+  .rb_top_row ._r_time span {
     color: #333333;
-}
+  }
 
-._r_mb5 {
+  ._r_mb5 {
     margin-bottom: 5px;
-}
+  }
 
-.Receipt_table {
+  .Receipt_table {
     width: 100%;
     font-size: 14px;
     text-align: center;
-}
+  }
 
-.Receipt_table .th {
+  .Receipt_table .th {
     font-weight: 200 !important;
-}
+  }
 
-._r_mt10 {
+  ._r_mt10 {
     margin-top: 10px;
-}
+  }
 
-._bg__ {
+  ._bg__ {
     display: inline-block;
     padding: 2px 8px;
     color: white;
     border-radius: 4px;
-}
+  }
 
-._bg_red {
+  ._bg_red {
     background-color: #e95252;
-}
+  }
 
-._bg_green {
+  ._bg_green {
     background-color: #2bb87c;
-}
+  }
 
-.text_d {
+  .text_d {
     text-decoration: underline;
     cursor: pointer;
-}
+  }
 
-.PingFangSC {
+  .PingFangSC {
     font-weight: bold;
-}
+  }
 
-.Bill_par {
+  .Bill_par {
     position: relative;
-}
+  }
 
-tr._item_list {
+  tr._item_list {
     border-bottom: 1px solid #e5e5e5;
     height: 78px;
-}
+  }
 
-tr._item_list td {
+  tr._item_list td {
     border-bottom: 1px solid #e5e5e5;
     padding: 10px;
-}
+  }
 
-/* tr._t_head th{border-top: 1px solid #e5e5e5;} */
-tr._item_list td:first-child {
+  /* tr._t_head th{border-top: 1px solid #e5e5e5;} */
+  tr._item_list td:first-child {
     border-left: 1px solid #e5e5e5;
-}
+  }
 
-tr._item_list td:last-child {
+  tr._item_list td:last-child {
     border-right: 1px solid #e5e5e5;
-}
+  }
 
-._head_img {
+  ._head_img {
     width: 28px;
     height: 28px;
     border-radius: 50%;
     vertical-align: middle;
-}
+  }
 
-._btn_group {
+  ._btn_group {
     font-size: 14px;
-}
+  }
 
-.icon-daiqueren {
+  .icon-daiqueren {
     color: #4bca81;
-}
+  }
 
-.icon-yiqueren {
+  .icon-yiqueren {
     color: #4bca81;
-}
+  }
 
-.icon-yiquxiao {
+  .icon-yiquxiao {
     color: #959595;
-}
+  }
 
-.icon-shenhebohui {
+  .icon-shenhebohui {
     color: #e95252;
-}
+  }
 
-.icon-icon-zancun {
+  .icon-icon-zancun {
     color: #ff9c01;
-}
+  }
 
-.singeRowTable tr:hover {
+  .singeRowTable tr:hover {
     background-color: white;
-}
+  }
 
-._TradeWayList {
+  ._TradeWayList {
     padding: 5px 10px;
     background-color: #eeeeee;
     border-radius: 4px;
     margin: 10px 0;
     width: 230px;
-}
+  }
 
-._bold {
+  ._bold {
     font-weight: bold;
-}
+  }
 
-._bank_name,
-._bank_type {
+  ._bank_name,
+  ._bank_type {
     display: inline-block;
     background-color: #333333;
     color: white;
     padding: 2px 4px;
     border-radius: 4px;
     margin-left: 10px;
-}
+  }
 
-._bank_name {
+  ._bank_name {
     margin-left: 10px;
-}
+  }
 
-._bank_type {
+  ._bank_type {
     background-color: #2aaef2;
-}
+  }
 
-._bank_type2 {
+  ._bank_type2 {
     background-color: #ff9c01;
-}
+  }
+
 </style>

src/components/TravelContractConfirm.vue

@@ -987,7 +987,7 @@
                                             <el-col :span="12">乙方签字（盖章）：</el-col>
                                             <el-col :span="12" style="position:relative;">
                                                 {{CtObj.TravelAgency_Name}}
-                                                <img class="signImg" style="position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt=""/>
+                                                <img class="signImg" v-if="CtObj.IsTravelAgencySignature==1" style="position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt=""/>
                                             </el-col>
                                         </el-row>
                                     </li>
@@ -1394,7 +1394,7 @@
                                     <li >
                                         <el-row>
                                             <el-col :span="12">出境社盖章：</el-col>
-                                            <el-col :span="12" style="position:relative;"><img class="signImg" style="position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt=""/></el-col>
+                                            <el-col :span="12" style="position:relative;"><img class="signImg" v-if="CtObj.IsTravelAgencySignature==1" style="position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt=""/></el-col>
                                         </el-row>
                                     </li>
                                     <li>
@@ -1534,7 +1534,7 @@
                                     <li style="position:relative;">
                                         <el-row>
                                             <el-col :span="12">旅行社：（盖章）</el-col>
-                                            <el-col :span="12"><img style="width:120px;position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt="" /></el-col>
+                                            <el-col :span="12"><img style="width:120px;position:absolute;right:0;" v-if="CtObj.IsTravelAgencySignature==1" src="../assets/img/dzht/zhang.png" alt="" /></el-col>
                                         </el-row>
                                     </li>
                                     <li>
@@ -1955,7 +1955,7 @@
                                         <el-col :span="12">乙方签字（盖章）：</el-col>
                                         <el-col :span="12" style="position:relative;">
                                             {{CtObj.TravelAgency_Name}}
-                                            <img class="signImg" style="position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt=""/>
+                                            <img class="signImg" style="position:absolute;right:0;" v-if="CtObj.IsTravelAgencySignature==1" src="../assets/img/dzht/zhang.png" alt=""/>
                                         </el-col>
                                     </el-row>
                                 </li>
@@ -3199,6 +3199,7 @@
           TripType: 0, //行程类型(0-简易行程，1-标准行程)
           Tourists_Sign:'',
           CreateTimeStr:"",
+          IsTravelAgencySignature:0  //判断是否盖章
         },
       };
     },
@@ -3351,6 +3352,7 @@
               this.CtObj.PickUpTotalPrice = tempObj.PickUpTotalPrice;
               this.CtObj.VisaTotalPrice = tempObj.VisaTotalPrice;
               this.CtObj.Tourists_Sign= tempObj.Tourists_Sign;
+              this.CtObj.IsTravelAgencySignature = tempObj.IsTravelAgencySignature;
               this.CtObj.TicketAndHotelTotalPrice =
                 tempObj.TicketAndHotelTotalPrice;
               if (

src/components/TravelContractDetail.vue

@@ -576,7 +576,7 @@
                                     </td>
                                     <td>
                                         <span>{{dataList.company}}</span>
-                                        <img class="esealDiv" src='../assets/img/dzht/zhang.png' alt=""/>
+                                        <img class="esealDiv" v-if="isShowZhang==1" src='../assets/img/dzht/zhang.png' alt=""/>
                                     </td>
                                 </tr>
                                 <tr>
@@ -874,7 +874,8 @@
         returnArriveCityName:'',
         tripList:[],
         //交通
-        trifficList:[]
+        trifficList:[],
+        isShowZhang:0,
       };
     },
     methods: {
@@ -957,6 +958,21 @@
       getDayAddOne(day,num){
           return moment(day).add(num,'days').format('YYYY-MM-DD')
       },
+      //获取是否显示公司章
+      getShow(ID){
+          if(ID!=null&&ID!=undefined){
+            let msg = {
+                ID:ID
+            }
+            this.apipost("travelcontract_post_GetContractService",msg,res => {
+                if (res.data.resultCode === 1) {
+                    this.isShowZhang=res.data.data.IsTravelAgencySignature;
+                } else {
+                    this.Error(res.data.message);
+                }
+            });
+          }
+      },
       //获取大写
       getTotalNum(num) {
         switch (num) {
@@ -1415,7 +1431,9 @@
       this.msg.TCID = this.$route.query.TCID;
       this.msg.orderID = this.$route.query.orderID;
       this.msg.guestId = this.$route.query.guestId;
+      let TID = this.$route.query.ID;
       this.getList();
+      this.getShow(this.TID);
       this.GetTrip(0,this.msg.TCID);
     }
   };

src/components/TravelContractView.vue

@@ -785,7 +785,7 @@
                       <td>受托方（旅行社）签章:</td>
                       <td style="position:relative;">
                         <font>{{CtObj.TravelAgency_Name}}</font>
-                          <img src="../assets/img/dzht/zhang.png" alt=""
+                          <img src="../assets/img/dzht/zhang.png" v-if="CtObj.IsTravelAgencySignature==1" alt=""
                             style="width:120px;heigth:120px;position:absolute;top:0;" />
                       </td>
                     </tr>
@@ -1265,7 +1265,7 @@
                     </td>
                     <td style="width:15%">出境社盖章：</td>
                     <td style="width:35%;position:relative;">
-                      <img src="../assets/img/dzht/zhang.png" alt=""
+                      <img src="../assets/img/dzht/zhang.png" v-if="CtObj.IsTravelAgencySignature==1" alt=""
                         style="width:120px;heigth:120px;position:absolute;top:0;" />
                     </td>
                   </tr>
@@ -1712,7 +1712,7 @@
                       <td>乙方签字（盖章）</td>
                       <td style="position:relative;">
                         <font>{{CtObj.TravelAgency_Name}}</font>
-                        <img src="../assets/img/dzht/zhang.png" alt="" style="width:120px;heigth:120px;position:absolute;top:0;" />
+                        <img src="../assets/img/dzht/zhang.png" v-if="CtObj.IsTravelAgencySignature==1" alt="" style="width:120px;heigth:120px;position:absolute;top:0;" />
                       </td>
                     </tr>
                     <tr>
@@ -2034,6 +2034,7 @@
           TripType: 0, //行程类型(0-简易行程，1-标准行程)
           Tourists_Sign: '',
           CreateTimeStr: "",
+          IsTravelAgencySignature:0   //是否盖章
         },
       };
     },
@@ -2176,6 +2177,7 @@
               this.CtObj.PickUpTotalPrice = tempObj.PickUpTotalPrice;
               this.CtObj.VisaTotalPrice = tempObj.VisaTotalPrice;
               this.CtObj.Tourists_Sign = tempObj.Tourists_Sign;
+              this.CtObj.IsTravelAgencySignature = tempObj.IsTravelAgencySignature;
               this.CtObj.TicketAndHotelTotalPrice =
                 tempObj.TicketAndHotelTotalPrice;
               if (

src/components/administrative/ContractManage.vue

@@ -3,32 +3,35 @@
     background-color: #fff !important;
     color: #e95252 !important;
     border-color: #e95252 !important;
-}
+  }
 
-.ContractManage .query-box .el-button--primary:focus,
+  .ContractManage .query-box .el-button--primary:focus,
   .query-box .el-button--primary:hover {
     background-color: #fff !important;
     color: #e95252 !important;
     border-color: #e95252 !important;
-}
+  }
 
-.ContractManage .query-box .el-button {
+  .ContractManage .query-box .el-button {
     border-radius: 16px;
     height: 30px;
     position: relative;
-    top:5px;
-}
+    top: 5px;
+  }
 
-.ContractManage .query-box .el-button i {
+  .ContractManage .query-box .el-button i {
     color: #e95252;
-}
-.ContractManage .query-box .el-button span {
+  }
+
+  .ContractManage .query-box .el-button span {
     position: relative;
     top: -3px;
-}
-.ContractManage .el-button+.el-button{
-  margin-left:0!important;
-}
+  }
+
+  .ContractManage .el-button+.el-button {
+    margin-left: 0 !important;
+  }
+
 </style>
 
 <template>
@@ -109,7 +112,7 @@
               resetPageIndex();
             " />
           <el-dropdown @command="getImport">
-              <el-button type="primary" @click="goContract('onedayTripContract', 0, '一日游合同')" > 一日游合同
+            <el-button type="primary" @click="goContract('onedayTripContract', 0, '一日游合同')"> 一日游合同
               <i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
@@ -133,6 +136,7 @@
         <th width="100">合同状态</th>
         <th width="100">创建人</th>
         <th width="120">创建时间</th>
+        <th width="120">是否盖章</th>
         <th width="130">操作</th>
       </tr>
       <tr v-for="(item, index) in dataList" :key="index">
@@ -150,7 +154,11 @@
           </template>
         </td>
         <td>{{ item.T_ContractNum }}</td>
-        <td>{{ item.Tourists_Name }}</td>
+        <td style="text-align:left">
+          <span v-if="item.Tourists_Sign!=''" style="color:green;">【已签字】</span>
+          <span v-else style="color:red;">【未签字】</span>
+          {{ item.Tourists_Name }}
+        </td>
         <td>{{ item.TravelAgency_Name }}</td>
         <td>{{ item.TravelAgency_DealMan }}</td>
         <td>{{ item.C_TCNUM }}</td>
@@ -158,8 +166,11 @@
         <td>{{ item.StatusStr }}</td>
         <td>{{ item.CreateByName }}</td>
         <td>{{ item.CreateTimeStr }}</td>
+        <td> <span v-if="item.IsTravelAgencySignature==0">未盖章</span>
+          <span v-if="item.IsTravelAgencySignature==1" style="color:green;">已盖章</span></td>
         <td>
-          <el-tooltip class="item" effect="dark" content="修改" placement="top-start" v-if="item.Status==0||item.Status==3">
+          <el-tooltip class="item" effect="dark" content="修改" placement="top-start"
+            v-if="item.Status==0||item.Status==3">
             <template v-if="item.CType == 3">
               <el-button type="primary" icon="el-icon-edit" circle
                 @click="goContract('onedayTripContract', item.ID, '一日游合同')"></el-button>
@@ -186,14 +197,16 @@
             <el-button type="info" icon="el-icon-upload2" circle @click="SubmitContract(item)"></el-button>
           </el-tooltip>
           <el-tooltip class="item" v-if="item.Status==2" effect="dark" content="复制链接发送给客户">
-            <el-button type="info" icon="iconfont icon-copy-l" circle @click="CopyUrl(item)" style="padding:4px;background-color:#9266f9;border-color:#9266f9;"></el-button>
+            <el-button type="info" icon="iconfont icon-copy-l" circle @click="CopyUrl(item)"
+              style="padding:4px;background-color:#9266f9;border-color:#9266f9;"></el-button>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" content="取消" placement="top-start" v-if="item.Status==0">
             <el-button type="danger" icon="el-icon-close" circle @click="DeleteContract(item)"></el-button>
           </el-tooltip>
 
           <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
-            <el-button type="danger" icon="iconfont icon-chakan" circle @click="ViewContract(item)" style="padding:4px;"></el-button>
+            <el-button type="danger" icon="iconfont icon-chakan" circle @click="ViewContract(item)"
+              style="padding:4px;"></el-button>
           </el-tooltip>
         </td>
       </tr>
@@ -291,21 +304,21 @@
         });
       },
       //复制URL
-      CopyUrl(item){
+      CopyUrl(item) {
         var oInput = document.createElement('input');
         oInput.value = item.Url;
         document.body.appendChild(oInput);
         oInput.select(); // 选择对象
         document.execCommand("Copy"); // 执行浏览器复制命令
         oInput.className = 'oInput';
-        oInput.style.display='none';
+        oInput.style.display = 'none';
         this.Info("复制成功!");
       },
       //跳转
       getImport(command) {
-          if(command==1){
+        if (command == 1) {
           this.goContract('DomesticTravelcontract', 0, '境内旅游合同');
-          }else if(command==2){
+        } else if (command == 2) {
           this.goContract('SingleContract', 0, '单项委托合同');
         }
       },
@@ -376,15 +389,14 @@
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.dataList = res.data.data.pageData;
-              this.dataList.forEach(x=>{
-                  let Url="";
-                  if(this.isOnline()){
-                      Url= window.location.hostname+'/#/TravelContractConfirm?ContractId='+x.ID;
-                  }
-                  else{
-                      Url= window.location.hostname+":8080/"+'#/TravelContractConfirm?ContractId='+x.ID;
+              this.dataList.forEach(x => {
+                let Url = "";
+                if (this.isOnline()) {
+                  Url = window.location.hostname + '/#/TravelContractConfirm?ContractId=' + x.ID;
+                } else {
+                  Url = window.location.hostname + ":8080/" + '#/TravelContractConfirm?ContractId=' + x.ID;
                 }
-                  x.Url=Url;
+                x.Url = Url;
               })
               this.total = res.data.data.count;
             } else {
@@ -402,8 +414,7 @@
         this.msg.pageIndex = val;
         this.getList();
       },
-      ViewContract(item)
-      {
+      ViewContract(item) {
         this.$router.push({
           name: "TravelContractView",
           query: {

src/components/administrative/ElectronicAudit.vue

@@ -102,7 +102,7 @@
               </span>
             </li>
             <li>
-              <input type="button" class="hollowFixedBtn" value="查询" @click="getList()" />
+              <input type="button" class="hollowFixedBtn" value="查询" @click="getListOutTract(),resetOutPage()" />
             </li>
           </ul>
         </div>
@@ -116,27 +116,32 @@
               <th>出发日期</th>
               <th>返回日期</th>
               <th>状态</th>
+              <th>是否盖章</th>
               <th width="200">操作</th>
             </tr>
             <tr v-for="item in dataListOut">
-              <td>{{item.contractNum}}</td>
-              <td>{{item.orderId}}</td>
-              <td>{{item.tcid}}</td>
-              <td>{{item.productName}}</td>
+              <td>{{item.ContractNum}}</td>
+              <td>{{item.OrderId}}</td>
+              <td>{{item.TCID}}</td>
+              <td>{{item.ProductName}}</td>
               <td>
-                <template v-if="item.startDate!=null">
-                  {{getDate(item.startDate)}}
+                <template v-if="item.StartDate!=null">
+                  {{getDate(item.StartDate)}}
                 </template>
               </td>
               <td>
-                <template v-if="item.returnDate!=null">
-                  {{getDate(item.returnDate)}}
+                <template v-if="item.ReturnDate!=null">
+                  {{getDate(item.ReturnDate)}}
                 </template>
               </td>
               <td>
-                <span v-if="item.auditContract==3" style="color:red;">已驳回</span>
-                <span v-if="item.auditContract==1" style="color:blue;">待审核</span>
-                <span v-if="item.auditContract==2" style="color:green;">审核通过</span>
+                <span v-if="item.AuditContract==3" style="color:red;">已驳回</span>
+                <span v-if="item.AuditContract==1" style="color:blue;">待审核</span>
+                <span v-if="item.AuditContract==2" style="color:green;">审核通过</span>
+              </td>
+              <td>
+                <span v-if="item.IsTravelAgencySignature==0">未盖章</span>
+                <span v-if="item.IsTravelAgencySignature==1" style="color:green;">已盖章</span>
               </td>
               <td>
                 <el-row>
@@ -144,9 +149,14 @@
                     <el-button type="primary" icon="iconfont icon-shenpi" @click="AuditElec(item,2)" circle></el-button>
                   </el-tooltip>
                   <el-tooltip class="item" effect="dark" content="驳回" placement="top-start">
-                    <el-button type="danger" v-if="item.auditContract!=3" icon="iconfont icon-shenhebohui"
+                    <el-button type="danger" v-if="item.AuditContract!=3" icon="iconfont icon-shenhebohui"
                       @click="AuditElec(item,3)" circle></el-button>
                   </el-tooltip>
+                  <el-tooltip class="item" effect="dark" v-if="item.IsTravelAgencySignature==0" content="盖章" placement="top-start">
+                    <el-button type="success" icon="iconfont icon-gaizhang" circle @click="OutGaiZhang(item.Id)"
+                      style="padding:4px;"></el-button>
+                  </el-tooltip>
+
                   <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
                     <el-button type="danger" icon="iconfont icon-chakan" @click="goToDetail(item)" circle></el-button>
                   </el-tooltip>
@@ -158,6 +168,9 @@
             <i class="iconfont icon-kong" style="font-size:100px;"></i>
             <p>{{$t("active.ld_noData")}}</p>
           </div>
+          <el-pagination background @current-change="handleOutChange" :current-page.sync="currentPage2"
+            layout="total,prev, pager, next, jumper" :page-size="msgOut.PageSize" :total="total2">
+          </el-pagination>
         </div>
       </div>
     </template>
@@ -252,6 +265,7 @@
             <th width="100">合同状态</th>
             <th width="100">创建人</th>
             <th width="120">创建时间</th>
+            <th width="80">是否盖章</th>
             <th width="130">操作</th>
           </tr>
           <tr v-for="(item, index) in dataList" :key="index">
@@ -281,6 +295,10 @@
             </td>
             <td>{{ item.CreateByName }}</td>
             <td>{{ item.CreateTimeStr }}</td>
+            <td>
+                <span v-if="item.IsTravelAgencySignature==0">未盖章</span>
+                <span v-if="item.IsTravelAgencySignature==1" style="color:green;">已盖章</span>
+            </td>
             <td>
               <el-tooltip class="item" effect="dark" content="审核通过" placement="top-start" v-if="item.Status==1">
                 <el-button type="primary" icon="iconfont icon-shenpi" circle @click="SubmitContract(item,2)"></el-button>
@@ -289,6 +307,10 @@
                 <el-button type="info" icon="iconfont icon-shenhebohui" circle @click="SubmitContract(item,3)">
                 </el-button>
               </el-tooltip>
+              <el-tooltip class="item" effect="dark" v-if="item.IsTravelAgencySignature==0" content="盖章" placement="top-start">
+                <el-button type="success" icon="iconfont icon-gaizhang" circle @click="GaiZhang(item.ID)"
+                  style="padding:4px;"></el-button>
+              </el-tooltip>
               <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
                 <el-button type="danger" icon="iconfont icon-chakan" circle @click="ViewContract(item)"
                   style="padding:4px;"></el-button>
@@ -296,7 +318,7 @@
             </td>
           </tr>
         </table>
-        <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+        <el-pagination background @current-change="handleOutChange" :current-page.sync="currentPage"
           layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
         </el-pagination>
       </div>
@@ -316,7 +338,9 @@
           Tcid: '',
           StartDate: '',
           ReturnDate: '',
-          AuditContract: ''
+          AuditContract: '',
+          PageIndex:1,
+          PageSize:15
         },
         dataListOut: [],
         loadingOut: false,
@@ -340,7 +364,9 @@
         activeName: '1',
         //ContractMange参数
         total: 0,
+        total2: 0,
         currentPage: 1,
+        currentPage2: 1,
         dataList: [],
         loading: false, //页面加载
         msg: {
@@ -396,38 +422,30 @@
         this.$router.push({
           name: 'TravelContractDetail',
           query: {
-            TCID: item.tcid,
-            guestId: item.guestId,
-            orderID: item.orderId,
+            TCID: item.TCID,
+            guestId: item.GuestId,
+            orderID: item.OrderId,
+            ID: item.Id,
             blank: "y",
           }
         });
       },
       getListOutTract() {
         this.loadingOut = true;
-        //travelcontract_post_GetContractPageListService
         this.apipost("travelcontract_post_GetContractPageListService",this.msgOut,res => {
           this.loadingOut = false;
-          console.log(res,'ressss');
           if (res.data.resultCode === 1) {
+            console.log(res,'ressss');
             this.dataListOut = res.data.data.pageData;
+            this.total2=res.data.data.count;
           } else {
             this.Error(res.data.message);
           }
         });
-
-        // this.apiJavaPost("/api/contract/auditContract", this.msgOut, res => {
-        //   this.loadingOut = false;
-        //   if (res.data.resultCode === 1) {
-        //     this.dataListOut = res.data.data;
-        //   } else {
-        //     this.Error(res.data.message);
-        //   }
-        // }, null);
       },
       //审核通过或者驳回
       AuditElec(item, type) {
-        item.auditContract = type;
+        item.AuditContract = type;
         this.apiJavaPost("/api/contract/dosaveOrUpdate", item, res => {
           if (res.data.resultCode === 1) {
             this.Success(res.data.message);
@@ -497,10 +515,19 @@
         this.msg.pageIndex = 1;
         this.currentPage = 1;
       },
+      resetOutPage() {
+        this.msgOut.PageIndex = 1;
+        this.currentPage2 = 1;
+      },
+
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
         this.getList();
       },
+      handleOutChange(val){
+        this.msgOut.PageIndex = val;
+        this.getListOutTract();
+      },
       ViewContract(item) {
         this.$router.push({
           name: "TravelContractView",
@@ -511,6 +538,36 @@
           }
         });
       },
+      //其他合同盖章
+      GaiZhang(ID){
+        let msg={
+          ID:ID,
+          Status:1
+        }
+        this.apipost("travelcontract_post_UpdateTravelContractSignatureService",msg,res => {
+          if (res.data.resultCode === 1) {
+            this.Success(res.data.message);
+            this.getList();
+          } else {
+            this.Error(res.data.message);
+          }
+        });
+      },
+      //出境合同盖章
+      OutGaiZhang(ID){
+        let msg={
+          ID:ID,
+          Status:1
+        }
+        this.apipost("travelcontract_post_UpdateContractSignatureService",msg,res => {
+          if (res.data.resultCode === 1) {
+            this.Success(res.data.message);
+            this.getListOutTract();
+          } else {
+            this.Error(res.data.message);
+          }
+        });
+      },
     },
     mounted() {
       this.getListOutTract();

src/components/busManagement/BusInfo.vue

@@ -174,7 +174,7 @@
         <th>{{$t('visa.v_tuanhao')}}</th>
         <th>{{$t('visa.v_hangban')}}</th>
       </tr>
-      <tr v-for="item in CommonList">
+      <tr v-for="(item,index) in CommonList" :key="index">
         <td>{{item.InOut}}</td>
         <td>{{item.GuestNum}}</td>
         <td>{{item.TotalSeat}}</td>
@@ -184,7 +184,7 @@
           <p class="busInfoP" @click="goUrlT('TravelControlList',item.TCNUM,'团控列表')">{{item.TCNUM}}</p>
         </td>
         <td>
-          <div v-for="subItem in item.FlightList">
+          <div v-for="(subItem,subIndex) in item.FlightList" :key="subIndex">
             <span style="height:25px; line-height:25px;">
               <a style="color: #ff0066;font-weight: bold;">{{subItem.Flight_number}}</a> {{subItem.FlightDateStr}}
               {{subItem.Departure_time}} {{subItem.dName}} {{subItem.TicketArrivalTime}} {{subItem.aName}}
@@ -204,8 +204,8 @@
           </td>
           <td>{{$t('ground.huisongfei')}}</td>
           <td colspan="4" align="left" style="padding-left:5px;">
-            <el-input v-model="PostData.BackFee" @keyup.native="checkPrice(PostData,'BackFee')" :placeholder="$t('ground.shuruhsf')"
-              maxlength="10" class='w135'></el-input>
+            <el-input v-model="PostData.BackFee" @keyup.native="checkPrice(PostData,'BackFee')"
+              :placeholder="$t('ground.shuruhsf')" maxlength="10" class='w135'></el-input>
           </td>
         </tr>
       </tfoot>
@@ -213,16 +213,16 @@
     <div style="width: 100%; overflow-x: auto;margin-top:20px;" class="ownScrollbarStyle">
       <el-form :rules="rules">
         <el-table :data="PlanTableData" style="width:100%" border v-loading='loading'>
-          <el-table-column fixed :label="$t('pub.date')" prop="UseTimeStr" min-width="110"></el-table-column>
+          <el-table-column fixed :label="$t('pub.date')" prop="UseTimeStr" min-width="100"></el-table-column>
           <el-table-column fixed :label="$t('hotel.hotel_name')" prop="HotelName" min-width="200"></el-table-column>
-          <el-table-column fixed :label="$t('sm.yongchejihua')" min-width="185">
+          <el-table-column fixed :label="$t('sm.yongchejihua')" min-width="180">
             <template slot-scope="scope">
               <!-- {{scope.$index+1}}  -->
-              <div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM">
+              <div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="subIndex">
                 <em>
                   <!--接机送机-->
-                  <el-select class="w120" :placeholder="$t('pub.pleaseSel')" v-model="subItem.AirportPickUp" :disabled="forbidInput"
-                    @change="getBusPrice(subItem)">
+                  <el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subItem.AirportPickUp"
+                    :disabled="forbidInput" @change="getBusPrice(subItem)">
                     <el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
                     <el-option v-for="childitem in BusAirportPickUpList" :key="childitem.Id" :label="childitem.Name"
                       :value="childitem.Id">
@@ -239,6 +239,33 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column label="套团团号" min-width="230">
+            <template slot-scope="scope">
+              <div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="subIndex">
+                <template v-if="subItem.AirportPickUp==15">
+                  <div v-for="(childItem,childIndex) in subItem.MergeList" :key="childIndex">
+                    <em>
+                      <!--@change="GetTravelPrice(subItem)"-->
+                      <el-select filterable style="margin-bottom:5px;" class="w170" :placeholder="$t('pub.pleaseSel')" v-model="childItem.MTCID"
+                        @visible-change="GetPriceList(subItem)" @change="GetPriceChange(subItem,childItem)">
+                        <el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
+                        <el-option v-for="pItem in subItem.PriceList" :key="pItem.TCID" :label="pItem.TCNUM"
+                          :value="pItem.TCID"></el-option>
+                      </el-select>
+                    </em>
+                    <span style="display:inline-block;margin-left:5px;">
+                      <a @click="DeleteMergeSubItem(subItem.MergeList,childIndex)"
+                        style="color:blue;cursor:pointer">{{$t('system.table_delete')}}</a>
+                    </span>
+                  </div>
+                  <span style="display:inline-block;margin-left:5px;">
+                    <a @click="AddMergeSubItem(subItem.MergeList)"
+                      style="color:blue;cursor:pointer">{{$t('fnc.tianjia')}}</a>
+                  </span>
+                </template>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column :label="$t('ground.sijiName')" min-width="120">
             <template slot-scope="scope">
               <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
@@ -274,8 +301,8 @@
           <el-table-column :label="$t('ground.busType')" min-width="150">
             <template slot-scope="scope">
               <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
-                <el-select filterable :placeholder="$t('pub.pleaseSel')" v-model="subItem.BusType" :disabled="forbidInput"
-                  @change='getBusPrice(subItem)'>
+                <el-select filterable :placeholder="$t('pub.pleaseSel')" v-model="subItem.BusType"
+                  :disabled="forbidInput" @change='getBusPrice(subItem)'>
                   <el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
                   <el-option v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id">
                   </el-option>
@@ -283,7 +310,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('fnc.fkfangshi')" min-width="150">
+          <el-table-column :label="$t('fnc.fkfangshi')" min-width="130">
             <template slot-scope="scope">
               <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-select class='sel' v-model='subItem.PayType' :disabled="isShowBtn==1||IsEditBus==0?true:false"
@@ -299,27 +326,20 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('ground.htzfth')" min-width="150">
-            <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
-                <el-input class='w120' type="text" v-model='subItem.PayTypeTCNUM' v-show="subItem.PayType==6">
-                </el-input>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :label="$t('ground.dingtuanhao')" min-width="215">
+
+          <el-table-column :label="$t('ground.dingtuanhao')" min-width="180">
             <template slot-scope="scope">
               <div class="comBTM" v-for="(subItem,subIndex) in scope.row.BusPlanOrderList">
                 <template v-if="scope.$index==0&&subIndex==0">
                   <i class="iconfont icon-tongshang" style="opacity:0;filter:alpha(opacity=0); "></i>
-                  <el-input class='w150' type="text" v-model="subItem.BookGroup"></el-input>
+                  <el-input class='w135' type="text" v-model="subItem.BookGroup"></el-input>
                 </template>
                 <template v-else>
                   <el-tooltip class="item" effect="dark" :content="$t('ground.tongshang')" placement="top">
                     <i class="iconfont icon-tongshang" style="cursor:pointer;"
                       @click="getBeforeInfo(scope.$index,subIndex),getBusPrice(subItem)"></i>
                   </el-tooltip>
-                  <el-input class='w150' type="text" v-model="subItem.BookGroup"></el-input>
+                  <el-input class='w135' type="text" v-model="subItem.BookGroup"></el-input>
                 </template>
               </div>
             </template>
@@ -332,7 +352,8 @@
                   <span class="subName" :class="{'spanCked':childItem.AccommodationType==subItem.Id}"
                     @click="AccommodationCLick(subItem.Id,childItem)">{{subItem.Name}}</span>
                   <span v-if="subItem.Id==1 && childItem.AccommodationType==1">
-                    <el-input style="margin-top:13px;" v-model="childItem.AccommodationRemark" :placeholder="$t('ground.qsrwsdz')">
+                    <el-input style="margin-top:13px;" v-model="childItem.AccommodationRemark"
+                      :placeholder="$t('ground.qsrwsdz')">
                     </el-input>
                   </span>
                 </span>
@@ -346,11 +367,12 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('ground.gsfeiyong')" min-width="140">
+          <el-table-column :label="$t('ground.gsfeiyong')" min-width="120">
             <template slot-scope="scope">
               <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.HighSpeedPrice" @keyup.native="checkPrice(subItem,'HighSpeedPrice')"
-                  :placeholder="$t('ground.qsrfyong')" :disabled="isShowBtn==1||IsEditBus==0?true:false" class='w135'></el-input>
+                  :placeholder="$t('ground.qsrfyong')" :disabled="isShowBtn==1||IsEditBus==0?true:false" class='w100'>
+                </el-input>
               </div>
             </template>
           </el-table-column>
@@ -358,7 +380,7 @@
             <template slot-scope="scope">
               <div>
                 <div v-for="(subItem,index) in scope.row.BusPlanOrderList" class="comBTM">
-                  <el-select class='sel w135' v-model='subItem.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')"
+                  <el-select class='sel w120' v-model='subItem.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')"
                     @change="PayTypeChange(subItem)" :disabled="isShowBtn==1||IsEditBus==0?true:false">
                     <el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
                     <el-option :label="$t('ground.xianfu')" :value='1'></el-option>
@@ -372,7 +394,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('ground.UsePCount')" min-width="100">
+          <el-table-column :label="$t('ground.UsePCount')" min-width="80">
             <template slot-scope="scope">
               <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.UseNum" @keyup.native="checkPrice(subItem,'UseNum')"
@@ -380,11 +402,12 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('ground.cbenjia')" min-width="140">
+          <el-table-column :label="$t('ground.cbenjia')" min-width="120">
             <template slot-scope="scope">
               <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.CostPrice" :disabled="isShowBtn==1||IsEditBus==0?true:false"
-                  @keyup.native="checkPrice(subItem,'CostPrice')" :placeholder="$t('ground.qingshurcbj')" class="w135"></el-input>
+                  @keyup.native="checkPrice(subItem,'CostPrice')" :placeholder="$t('ground.qingshurcbj')" class="w100">
+                </el-input>
               </div>
             </template>
           </el-table-column>
@@ -395,14 +418,14 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('ground.park')" min-width="100">
+          <el-table-column :label="$t('ground.park')" min-width="70">
             <template slot-scope="scope">
               <div v-for="subItem in scope.row.BusPlanOrderList" class="park_List comBTM">
                 {{subItem.IsHavearking=='0'?'无':'有'}}
               </div>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('ground.xiaoji')" min-width="100">
+          <el-table-column :label="$t('ground.xiaoji')" min-width="80">
             <template slot-scope="scope">
               <div v-for="subItem in scope.row.BusPlanOrderList" class="park_List comBTM">
                 {{subItem.CostPrice*(Number(subItem.TransferNum)+1) + Number(subItem.HighSpeedPrice)}}
@@ -552,6 +575,44 @@
       };
     },
     methods: {
+      //获取团期列表
+      GetPriceList(obj) {
+        this.apipost(
+          "bus_get_GetBusTravelPriceList", {
+            StartDate: this.parametersData.StartDate ,
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+              obj.PriceList = res.data.data;
+            }
+          },
+          null
+        );
+      },
+      GetPriceChange(obj,childItem)
+      {
+        var pObj = obj.PriceList.find(qitem => {
+          return qitem.TCID === childItem.MTCID;
+        });
+        if(pObj)
+        {
+           childItem.MTCNUM=pObj.TCNUM;
+        }
+      },
+      //删除拼团
+      DeleteMergeSubItem(list, index) {
+        list.splice(index, 1);
+      },
+      //添加拼团
+      AddMergeSubItem(list) {
+        list.push({
+          ID: 0,
+          PlanId: 0,
+          MTCID: 0,
+          MTCNUM: ""
+        });
+      },
+
       PayTypeChange(obj) {
         if (obj.PayType == 7) {
           obj.CostPrice = 0;
@@ -613,7 +674,7 @@
         }
       },
       AddSubItem(item) {
-        let msg = Object.assign({}, item.BusPlanOrderList[0]);
+        let msg = JSON.parse(JSON.stringify(item.BusPlanOrderList[0]));
         msg.Id = 0;
         item.BusPlanOrderList.push(msg);
       },

src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue

@@ -76,7 +76,7 @@
       <span class="TMTitle">
         <i></i>{{$t('sm.jichushezhi')}} <span class="TC_tcnum">{{TCNUM}}</span>
       </span>
-      <span class="TC_OneKeyUp" @click.stop="travelUploadFile">{{$t('sm.yijiansc')}}</span>
+      <span class="TC_OneKeyUp" @click.stop="travelUploadFile" style="display:none;">{{$t('sm.yijiansc')}}</span>
       <span class="foldList" @click="fold" v-if="isFold==''">{{$t('sm.djzd')}}</span>
       <span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
       <div class="Travel_Nav">