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

src/components/Hotel/roomReservationsDetails.vue

@@ -127,8 +127,8 @@
                   <tr>
                     <td width="70" style="text-align:center;" colspan="2">
                       <span style="color:green">{{subItem.NewHotelName}}</span>
-                      <el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop"
-                        v-if="subItem.OPState!=1">
+                       <!-- v-if="subItem.OPState!=1" -->
+                      <el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
                         <comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList"
                           :UseDate="item.UseTimeStr">
                         </comCheckHotel>
@@ -138,9 +138,9 @@
                           酒店选择
                         </el-button>
                       </el-popover>
-                      <template v-else>
+                      <!-- <template v-else>
                         <br /> <span class="Hotel_red">OP-指定，不能更换酒店.</span>
-                      </template>
+                      </template> -->
                     </td>
                   </tr>
                   <tr>

src/components/Ticketing/TicketManager.vue

@@ -1549,19 +1549,6 @@
                       </div>
                     </li>
                     <!--尾款-->
-                    <!-- <li v-if="item.FinalPayment!=''&&item.FirstDeposit==''&&item.SecondDeposit==''&&item.ThirdDeposit==''&&item.FourthDeposit==''">
-                      <div @click="goFinacePage(item,5)" :class="getClass(item.FinalPaymentStatus)">
-                        <el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
-                          <span>尾</span>
-                        </el-tooltip>
-                      </div>
-                      <div class="FinaDetailContent">
-                        <span v-if="item.FinalAuditList!=null" v-for="childItem in item.FinalAuditList">
-                          <span class="FinaceDanList"
-                            @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
-                        </span>
-                      </div>
-                    </li> -->
                     <li v-else-if="item.FinalPayment!=''">
                       <div @click="goCustomList('PassengerList',item, 5,'旅客名单')"
                         :class="getClass(item.FinalPaymentStatus)">
@@ -1947,6 +1934,11 @@
               </el-option>
             </el-select>
           </el-form-item>
+        </el-col>
+         <el-col :span="5">
+          <el-form-item label="行程天数(国际段)" >
+             <el-input v-model="addMsg.DayNum" placeholder="行程天数" @keyup.native="checkInteger(addMsg,'DayNum')" maxlength="2"></el-input>
+          </el-form-item>
         </el-col>
         <div class="top-btn">
           <button class="cancelBtn" type="button" @click="addShow=false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}
@@ -2082,6 +2074,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="5">
+          <el-form-item label="行程天数(国际段)" >
+             <el-input v-model="addMsg.DayNum" placeholder="行程天数" @keyup.native="checkInteger(addMsg,'DayNum')" maxlength="2"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="24">
           <div class="commandLine">
             <span>
@@ -2257,7 +2254,8 @@
           FourthDeposit: "",
           FinalPayment: "",
           flightList: [],
-          LineId: 0
+          LineId: 0,//线路编号
+          DayNum:0,//行程天数
         },
         //去程
         addGoFlight: {
@@ -3026,9 +3024,6 @@
           undefined) {
           this.addMsg.AirLineID = newList.flightList[0].AirLineID;
         }
-        // if (!this.addMsg.AirLineID) {
-        //   this.addMsg.AirLineID = 0;
-        // }
         if (this.isSubmit) {
           this.isSubmit = false;
           this.apipost(
@@ -3126,6 +3121,7 @@
         this.TicketOrderList = [];
         this.openplatString = [];
         this.changeAirLineID = "";
+        this.addMsg.DayNum=0;
       },
       //弹出框取消 初始化谈框内表单
       resetForm(formName) {

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -726,7 +726,8 @@
                   <el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary"
                     style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_registrationList')}}
                   </el-button>
-                  <el-dropdown trigger="click" style="margin-bottom:5px;" v-if="CurrentUserInfo.RB_Branch_id==0||CurrentUserInfo.RB_Branch_id==1216||CurrentUserInfo.RB_Branch_id==49">
+                  <!-- v-if="CurrentUserInfo.RB_Branch_id==0||CurrentUserInfo.RB_Branch_id==1216||CurrentUserInfo.RB_Branch_id==49"-->
+                  <el-dropdown trigger="click" style="margin-bottom:5px;">
                     <span class="el-dropdown-link">{{$t('pub.updateMsg')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -181,7 +181,7 @@
   }
 
   ._TravelPricePopover .jiDiv {
-    width: 650px;
+    width: 750px;
     max-height: 400px;
     overflow: auto;
   }
@@ -440,8 +440,8 @@
                     <el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule"
                       :false-label="UnCheckedVaule">支持儿童出游
                     </el-checkbox>
-                    <el-checkbox style="display:none;" v-model="priceData.IsBookTeam" :true-label="CheckedVaule" v-if="PostConfig.LineId==14"
-                      :false-label="UnCheckedVaule">订团
+                    <el-checkbox style="display:none;" v-model="priceData.IsBookTeam" :true-label="CheckedVaule"
+                      v-if="PostConfig.LineId==14" :false-label="UnCheckedVaule">订团
                     </el-checkbox>
                     <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
                       :false-label="UnCheckedLessPrice">可少价
@@ -693,9 +693,11 @@
                           <table width="100%" border="0" cellspacing="0" cellpadding="0">
                             <tr>
                               <td class="_color_666">选择</td>
+                              <td class="_color_666">机票编号/票务</td>
                               <td class="_color_666">航班号/航空公司/航段</td>
                               <td class="_color_666">时间</td>
                               <td class="_color_666">PNR</td>
+                              <td class="_color_666">行程天数</td>
                               <td class="_color_666">机票数量/使用数量</td>
                               <td class="_color_666">绑定机位数</td>
                             </tr>
@@ -703,6 +705,9 @@
                               <td>
                                 <el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox>
                               </td>
+                              <td>
+                                {{fitem.AirticketId}}/{{fitem.TicketByName}}
+                              </td>
                               <td>
                                 <span class="TP_Airticktid"
                                   @click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span> /
@@ -710,9 +715,10 @@
                               </td>
                               <td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>
                               <td>{{fitem.PNR}}</td>
+                              <td>{{fitem.DayNum}}</td>
                               <td>{{fitem.TicketNum}} / {{fitem.UseAmount}}</td>
                               <td>
-                                <el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)"
+                                <el-input class="w69" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)"
                                   v-model="fitem.BindNum"></el-input>
                               </td>
                             </tr>
@@ -859,10 +865,12 @@
               <span v-if="childItem.UseCount>0 && subItem.SubList.length==1">
                 <span style="color:red;white-space:nowrap;cursor:pointer;" @click="DeleteStock(subItem)">删除</span>
               </span>
-              <span  >
+              <span>
                 <el-popover width="700" trigger="click" popper-class="DMC_HotelPop">
-                    <commonPHInfo :name='"comPriceHotelInfo"+subIndex+childIndex' :ref='"comPriceHotelInfo"+subIndex+childIndex' ></commonPHInfo>
-                    <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;" @click="GetHotelUsePriceList(childItem.HotelId,subItem.UseDay,subIndex,childIndex)">库存情况</span>
+                  <commonPHInfo :name='"comPriceHotelInfo"+subIndex+childIndex'
+                    :ref='"comPriceHotelInfo"+subIndex+childIndex'></commonPHInfo>
+                  <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;"
+                    @click="GetHotelUsePriceList(childItem.HotelId,subItem.UseDay,subIndex,childIndex)">库存情况</span>
                 </el-popover>
               </span>
             </td>
@@ -1016,8 +1024,7 @@
     },
     methods: {
       //调用子组件方法
-      GetHotelUsePriceList(HotelId,UseDay,index,hotelSubIndex)
-      {
+      GetHotelUsePriceList(HotelId, UseDay, index, hotelSubIndex) {
         let str = `comPriceHotelInfo${index}${hotelSubIndex}`;
         this.$refs[str][0].getHotelPriceList(HotelId, UseDay);
       },
@@ -1463,6 +1470,12 @@
       },
       //选中航班选择框
       getSelect(item) {
+
+        // if (this.PostConfig.LineId == 14 && item.DayNum != this.PostConfig.DayNum) {
+        //   this.Error("团期行程天数和机票的行程天数不一致!请重新选择!");
+        //   return;
+        // }
+
         item.IsSelected = !item.IsSelected;
         this.FinfoList = [];
         this.selectFilghtList.forEach(x => {
@@ -1750,7 +1763,7 @@
     },
     components: {
       TravelPriceFlightList: TravelPriceFlightList,
-      commonPHInfo:commonPHlInfo
+      commonPHInfo: commonPHlInfo
     }
   };
 

src/components/systemManagement/lineManagement.vue

 <style>
-.lineManagement .query_box {
+  .lineManagement .query_box {
     font-size: 12px;
     padding: 29px 0;
     padding-right: 30px;
     display: flex;
     justify-content: space-between;
-}
+  }
 
-.lineManagement .el-switch.is-checked .el-switch__core {
+  .lineManagement .el-switch.is-checked .el-switch__core {
     border-color: #4bca81;
     background-color: #4bca81;
-}
+  }
 
-.lineManagement .addCompany {
+  .lineManagement .addCompany {
     width: 440px;
     max-height: 600px;
-}
+  }
 
-.lineManagement .addCompany .el-dialog__body {
+  .lineManagement .addCompany .el-dialog__body {
     height: 486px;
     overflow: auto;
-}
+  }
 
-.lineManagement .query_box div label {
+  .lineManagement .query_box div label {
     display: inline-block;
     min-width: 80px;
     text-align: right;
     font-style: normal;
     margin: 0 20px 0 0;
-}
+  }
 
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
+  input::-webkit-outer-spin-button,
+  input::-webkit-inner-spin-button {
     -webkit-appearance: none;
-}
+  }
 
-input[type="number"] {
+  input[type="number"] {
     -moz-appearance: textfield;
-}
+  }
 
-.lineManagement .lineType {
+  .lineManagement .lineType {
     width: 51px;
     height: 24px;
     display: inline-block;
@@ -48,14 +48,15 @@ input[type="number"] {
     border-radius: 4px;
     background-color: #ff9c00;
     color: #ffffff;
-}
-.lineManagement .LMTable tr {
+  }
+
+  .lineManagement .LMTable tr {
     height: 70px;
     text-align: center !important;
     background-color: #fff;
-}
+  }
 
-.comPanyNum {
+  .comPanyNum {
     font-size: 14px;
     color: #333333;
     display: inline-block;
@@ -63,147 +64,151 @@ input[type="number"] {
     cursor: pointer;
     margin-bottom: 5px;
     text-decoration: underline;
-}
+  }
 
-.comPanyNum:hover {
+  .comPanyNum:hover {
     color: #e95252;
-}
-.Linezhicai {
+  }
+
+  .Linezhicai {
     color: #47bf8c;
-}
+  }
 
-.partCompany {
+  .partCompany {
     padding: 0;
     box-shadow: 0px 1px 3px 0px #dedede;
-}
+  }
 
-.partCompany .popper__arrow::after {
+  .partCompany .popper__arrow::after {
     border-bottom-color: #ededed !important;
-}
+  }
 
-.partCompany table {
+  .partCompany table {
     padding: 10px 0 0 20px;
     background-color: #ededed;
     border-collapse: collapse;
     border: 1px solid #d2d2d2;
     font-size: 12px;
-}
+  }
 
-.partCompany table th {
+  .partCompany table th {
     background-color: #ededed;
     padding: 5px;
-}
+  }
 
-.partCompany table td {
+  .partCompany table td {
     background-color: #ffffff;
     padding: 9px 15px;
     color: #333333;
     border: 1px solid #d2d2d2;
-}
+  }
 
-.partCompany table td._d_name {
+  .partCompany table td._d_name {
     background-color: #ededed;
-}
+  }
 
-.partCompany table ._color_666 {
+  .partCompany table ._color_666 {
     color: #666666;
-}
+  }
 
-.partCompany table tr._color_666 th {
+  .partCompany table tr._color_666 th {
     padding: 9px 15px;
-}
+  }
 
-.lineManagement .LineName {
+  .lineManagement .LineName {
     display: inline-block;
     width: 120px;
     margin: 0 0 0 20px;
     text-align: left;
-}
+  }
 
-.lineManagement .LM_Back {
+  .lineManagement .LM_Back {
     background-color: #f2f2f2;
-}
+  }
 
-.redType {
+  .redType {
     color: #e95252;
-}
-.lineManagement .tbDiv {
+  }
+
+  .lineManagement .tbDiv {
     overflow-y: auto;
-}
+  }
 
-.departListDiv {
+  .departListDiv {
     width: 100%;
     height: 200px;
     overflow-y: auto;
-}
+  }
 
-.lineManagement .tbDiv::-webkit-scrollbar {
+  .lineManagement .tbDiv::-webkit-scrollbar {
     width: 4px;
     height: 8px;
-}
+  }
 
-.lineManagement .tbDiv::-webkit-scrollbar-track {
+  .lineManagement .tbDiv::-webkit-scrollbar-track {
     -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
     border-radius: 4px;
     background: #ededed;
-}
+  }
 
-.lineManagement .tbDiv::-webkit-scrollbar-thumb {
+  .lineManagement .tbDiv::-webkit-scrollbar-thumb {
     border-radius: 4px;
     -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
     background: #c9c9c9;
-}
+  }
 
-.departListDiv::-webkit-scrollbar {
+  .departListDiv::-webkit-scrollbar {
     width: 4px;
     height: 8px;
-}
+  }
 
-.departListDiv::-webkit-scrollbar-track {
+  .departListDiv::-webkit-scrollbar-track {
     -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
     border-radius: 4px;
     background: #ededed;
-}
+  }
 
-.departListDiv::-webkit-scrollbar-thumb {
+  .departListDiv::-webkit-scrollbar-thumb {
     border-radius: 4px;
     -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
     background: #c9c9c9;
-}
-.LMTable {
+  }
+
+  .LMTable {
     width: 100%;
     font-size: 12px;
-}
-.lineManagement .LMTable tr th {
+  }
+
+  .lineManagement .LMTable tr th {
     border-bottom: 1px solid #d1d1d1;
-}
+  }
 
-.lineManagement .tbDiv .LMTable td {
+  .lineManagement .tbDiv .LMTable td {
     border-bottom: 1px solid #d1d1d1;
     border-right: 1px solid #d1d1d1;
     position: relative;
     text-align: center;
     padding: 5px;
     min-width: 250px;
-}
+  }
 
-.lineManagement .tbDiv table {
+  .lineManagement .tbDiv table {
     padding-right: 80px;
     margin-top: 10px;
     border-top: 1px solid #d1d1d1;
     border-left: 1px solid #d1d1d1;
     border-right: 1px solid #d1d1d1;
-}
+  }
 
-.upFentan {
+  .upFentan {
     text-decoration: underline;
     cursor: pointer;
     position: absolute;
     right: 13px;
     top: 32%;
-}
+  }
 
-.subCountryList {
+  .subCountryList {
     width: 150px;
     text-align: left;
     display: inline-block;
@@ -212,27 +217,31 @@ input[type="number"] {
     white-space: nowrap;
     position: relative;
     top: 3px;
-}
-.lineManagement ._addLineTB tr {
+  }
+
+  .lineManagement ._addLineTB tr {
     height: 40px !important;
-}
-.saveCompanyBtn {
+  }
+
+  .saveCompanyBtn {
     margin-top: 20px;
-}
+  }
 
-.setItem {
+  .setItem {
     cursor: pointer;
     text-decoration: underline;
     position: absolute;
     right: 13px;
     top: 32%;
-}
-.lineManagement ._LMComdiv {
+  }
+
+  .lineManagement ._LMComdiv {
     float: left;
     width: 32%;
     text-align: left;
-}
-.lineManagement .LineRank {
+  }
+
+  .lineManagement .LineRank {
     width: 24px;
     height: 24px;
     background-color: #2aaef2;
@@ -241,31 +250,36 @@ input[type="number"] {
     line-height: 24px;
     color: #fff;
     margin: 0 auto 5px;
-}
-.lineManagement .joinDepart {
+  }
+
+  .lineManagement .joinDepart {
     display: inline-block;
     margin-right: 50px;
     text-align: left;
     float: left;
     width: 180px;
-}
-.lineManagement .LM_Rank {
+  }
+
+  .lineManagement .LM_Rank {
     text-align: center;
-}
-.lineManagement ._LowDisMoney {
+  }
+
+  .lineManagement ._LowDisMoney {
     width: 200px;
     float: left;
     text-align: left;
     margin: 0 0 0 20px;
-}
-.lineManagement .LM_Btcontent {
+  }
+
+  .lineManagement .LM_Btcontent {
     position: absolute;
-  right:100px;
-  top:10px;
+    right: 100px;
+    top: 10px;
     text-align: right;
     margin-left: 20px;
-}
-.lineManagement .LM_ul li {
+  }
+
+  .lineManagement .LM_ul li {
     /*height: 78px;*/
     margin: 20px 0 0px 0px;
     transition: linear all 0.5s;
@@ -275,15 +289,18 @@ input[type="number"] {
     overflow: hidden;
     position: relative;
     padding: 10px 0;
-}
-.lineManagement .el-button-group .el-button {
+  }
+
+  .lineManagement .el-button-group .el-button {
     padding: 5px;
-}
-.lineManagement .LM_ul > li:hover {
+  }
+
+  .lineManagement .LM_ul>li:hover {
     box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
     transition: all linear 0.5s;
-}
-.lineManagement .TFimgList {
+  }
+
+  .lineManagement .TFimgList {
     float: left;
     width: 170px;
     height: 100px;
@@ -291,12 +308,14 @@ input[type="number"] {
     position: relative;
     margin: 0 10px 10px 0;
     overflow: hidden;
-}
-.lineManagement .TFimgList img{
+  }
+
+  .lineManagement .TFimgList img {
     width: 100%;
     height: 100%;
-}
-.lineManagement .TFIMGzhe {
+  }
+
+  .lineManagement .TFIMGzhe {
     width: 100%;
     height: 100%;
     background: rgba(0, 0, 0, 0.4);
@@ -306,10 +325,12 @@ input[type="number"] {
     line-height: 115px;
     border-radius: 4px;
     display: none;
-}
-.lineManagement .TFimgList:hover .TFIMGzhe {
+  }
+
+  .lineManagement .TFimgList:hover .TFIMGzhe {
     display: block;
-}
+  }
+
 </style>
 <template>
   <div class="flexOne lineManagement">
@@ -318,25 +339,29 @@ input[type="number"] {
         <li>
           <span>
             <em>{{$t('system.query_lineName')}}</em>
-                        <el-input v-model="msg.lineName" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList" class="w210"></el-input>
+            <el-input v-model="msg.lineName" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList"
+              class="w210"></el-input>
           </span>
         </li>
         <li>
           <span>
             <em>{{$t('Operation.Op_ShortName')}}</em>
-                        <el-input v-model="msg.lineShortName" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList" class="w210"></el-input>
+            <el-input v-model="msg.lineShortName" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList"
+              class="w210"></el-input>
           </span>
         </li>
         <li>
           <span>
             <em>{{$t('system.ph_xianluCode')}}</em>
-                        <el-input v-model="msg.lineCode" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList" class="w210"></el-input>
+            <el-input v-model="msg.lineCode" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList"
+              class="w210"></el-input>
           </span>
         </li>
         <li>
-                  <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()"/>
+          <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
+            @click="resetPageIndex(),getList()" />
           <input type="button" class="normalBtn" :value="$t('pub.addBtn')"
-                        @click="clearInfo(),isShowDIv=true,isShowTwo=false,divTitle='新增线路'"/>
+            @click="clearInfo(),isShowDIv=true,isShowTwo=false,divTitle='新增线路'" />
         </li>
       </ul>
     </div>
@@ -380,10 +405,7 @@ input[type="number"] {
             </el-col>
             <el-col :span="5">
               <div class="_LMComdiv">
-                        <el-popover
-                          popper-class="partCompany"
-                          width="300"
-                          trigger="click">
+                <el-popover popper-class="partCompany" width="300" trigger="click">
                   <div class="departListDiv">
                     <table width="100%" border="0" cellspacing="0" cellpadding="0">
                       <tr class="_color_666">
@@ -396,15 +418,13 @@ input[type="number"] {
                       </tr>
                     </table>
                   </div>
-                          <span slot="reference" class="comPanyNum" @click="getLossCompany(item.lineID,1)">{{item.branchCount}}</span>
+                  <span slot="reference" class="comPanyNum"
+                    @click="getLossCompany(item.lineID,1)">{{item.branchCount}}</span>
                 </el-popover>
                 <div class="particCompany">{{$t('Operation.Op_partInCompany')}}</div>
               </div>
               <div class="_LMComdiv">
-                        <el-popover
-                          popper-class="partCompany"
-                          width="350"
-                          trigger="click">
+                <el-popover popper-class="partCompany" width="350" trigger="click">
                   <div class="departListDiv">
                     <table width="100%" border="0" cellspacing="0" cellpadding="0">
                       <tr class="_color_666">
@@ -417,7 +437,8 @@ input[type="number"] {
                       </tr>
                     </table>
                   </div>
-                          <span slot="reference" class="comPanyNum" @click="getLossCompany(item.lineID,2)">{{$t('pub.clickToView')}}</span>
+                  <span slot="reference" class="comPanyNum"
+                    @click="getLossCompany(item.lineID,2)">{{$t('pub.clickToView')}}</span>
                 </el-popover>
                 <div class="particCompany">{{$t('Operation.Op_belongDepartment')}}</div>
               </div>
@@ -425,13 +446,15 @@ input[type="number"] {
             <el-col :span="2">
               <div class="Linezhicai" :class="{'redType':item.isDirect=='0'}">{{item.isDirect=="0"?'非直采':'直采'}}</div>
               <div class="Linezhicai" :class="{'redType':item.isShow=='0'}">{{item.isShow=="0"?'不显示':'显示'}}</div>
-                  <div class="Linezhicai" :class="{'redType':item.is_PacketGroup=='0'}">{{item.is_PacketGroup =="0"?'不允许小包团':'允许小包团'}}</div>
+              <div class="Linezhicai" :class="{'redType':item.is_PacketGroup=='0'}">
+                {{item.is_PacketGroup =="0"?'不允许小包团':'允许小包团'}}</div>
             </el-col>
             <el-col :span="2">
               <div>
                 <el-button-group size='mini'>
                   <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
-                          <el-button type="primary" icon="el-icon-edit" @click="isShowDIv = true,divTitle='修改线路',updateData(index)"></el-button>
+                    <el-button type="primary" icon="el-icon-edit"
+                      @click="isShowDIv = true,divTitle='修改线路',updateData(index)"></el-button>
                   </el-tooltip>
                   <el-tooltip class="item" effect="dark" :content="$t('system.btn_CtrlSet')" placement="top-start">
                     <el-button type="success" icon="el-icon-setting" @click="getBranchList(item.lineID)"></el-button>
@@ -471,23 +494,21 @@ input[type="number"] {
           <el-col :span="5">
             <el-form-item :label="$t('Operation.Op_CombinedContry')" style="display:none;">
               <el-select v-model="lineCountryArr" class='multiple_input' multiple :placeholder="$t('pub.pleaseSel')">
-                  <el-option
-                    v-for="item in countryList"
-                    :key="item.ID"
-                    :label="item.Name"
-                    :value="item.ID">
+                <el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item :label="$t('Operation.Op_lowDeposit')" prop="lowDeposit">
-                <el-input v-model="addMsg.lowDeposit"  maxlength="10" @keyup.native="checkPrice(addMsg,'lowDeposit')"></el-input>
+              <el-input v-model="addMsg.lowDeposit" maxlength="10" @keyup.native="checkPrice(addMsg,'lowDeposit')">
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item :label="$t('Operation.Op_preferentialDays')">
-                <el-input v-model="addMsg.discountDayNum" maxlength="3" @keyup.native="checkInteger(addMsg,'discountDayNum')"></el-input>
+              <el-input v-model="addMsg.discountDayNum" maxlength="3"
+                @keyup.native="checkInteger(addMsg,'discountDayNum')"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
@@ -503,14 +524,14 @@ input[type="number"] {
           </el-col>
           <el-col :span="3">
             <el-form-item :label="$t('system.table_isShow')">
-                <el-switch v-model="addMsg.isShow" :active-value="isDefaultChecked"
-                          :inactive-value="isDefaultUnchecked"></el-switch>
+              <el-switch v-model="addMsg.isShow" :active-value="isDefaultChecked" :inactive-value="isDefaultUnchecked">
+              </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="3">
             <el-form-item :label="$t('Operation.Op_isShared')">
-                <el-switch v-model="addMsg.IsShare" :active-value="isDefaultChecked"
-                          :inactive-value="isDefaultUnchecked"></el-switch>
+              <el-switch v-model="addMsg.IsShare" :active-value="isDefaultChecked" :inactive-value="isDefaultUnchecked">
+              </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="2">
@@ -528,6 +549,12 @@ input[type="number"] {
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="5">
+            <el-form-item label="人头返佣">
+              <el-input v-model="addMsg.RebateMoney" maxlength="10" @keyup.native="checkPrice(addMsg,'RebateMoney')">
+              </el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="5">
             <el-form-item label="B2B线路背景图">
               <div class="TFimgList">
@@ -536,8 +563,7 @@ input[type="number"] {
                 <div class="TFIMGzhe">
                   <div class="TFreupload">
                     <el-upload :file-list="fileList" :http-request="uploadTest" :multiple="true" :limit="2"
-                                  :on-change="handleChange1"
-                                  accept="image/jpeg, image/gif, image/png, image/bmp"
+                      :on-change="handleChange1" accept="image/jpeg, image/gif, image/png, image/bmp"
                       :show-file-list="false" action="">
                       <i class="iconfont icon-Edit"></i>
                     </el-upload>
@@ -555,8 +581,7 @@ input[type="number"] {
                 <div class="TFIMGzhe">
                   <div class="TFreupload">
                     <el-upload :file-list="fileList2" :http-request="uploadTest2" :multiple="true" :limit="2"
-                                  :on-change="handleChange2"
-                                  accept="image/jpeg, image/gif, image/png, image/bmp"
+                      :on-change="handleChange2" accept="image/jpeg, image/gif, image/png, image/bmp"
                       :show-file-list="false" action="">
                       <i class="iconfont icon-Edit"></i>
                     </el-upload>
@@ -574,8 +599,7 @@ input[type="number"] {
                 <div class="TFIMGzhe">
                   <div class="TFreupload">
                     <el-upload :file-list="fileList3" :http-request="uploadTest3" :multiple="true" :limit="2"
-                                  :on-change="handleChange3"
-                                  accept="image/jpeg, image/gif, image/png, image/bmp"
+                      :on-change="handleChange3" accept="image/jpeg, image/gif, image/png, image/bmp"
                       :show-file-list="false" action="">
                       <i class="iconfont icon-Edit"></i>
                     </el-upload>
@@ -583,11 +607,11 @@ input[type="number"] {
                 </div>
               </div>
             </el-form-item>
-            
           </el-col>
+
           <div class="LM_Btcontent">
-              <input type="button" class="normalBtn" @click="submitForm('addMsg')" :value="$t('pub.saveBtn')"/>
-              <input type="button" class="hollowFixedBtn" @click="isShowDIv=false" :value="$t('pub.cancelBtn')"/>
+            <input type="button" class="normalBtn" @click="submitForm('addMsg')" :value="$t('pub.saveBtn')" />
+            <input type="button" class="hollowFixedBtn" @click="isShowDIv=false" :value="$t('pub.cancelBtn')" />
           </div>
         </el-form>
       </div>
@@ -603,7 +627,7 @@ input[type="number"] {
           <td v-for="item in getCompanyList" :key="item.subCode">
             <span v-if="!item.inputShow">{{item.lossAllocation}}</span>
             <input type="text" v-model="item.lossAllocation" @blur="setInput(item)"
-                   onkeyup="value=value.replace(/[^\d]/g,'')" class="w80" v-if="item.inputShow"/>
+              onkeyup="value=value.replace(/[^\d]/g,'')" class="w80" v-if="item.inputShow" />
             <span v-if="item.lossAllocation!=null">%</span>
             <span class="upFentan" v-if="item.lossAllocation>=0&&!item.showSet&&item.selectDepIdArr.length>0"
               @click="displayInput(item)">{{$t('pub.updateMsg')}}</span>
@@ -618,12 +642,8 @@ input[type="number"] {
           <td v-on:click='closeDepOption(item)' v-for="item in getCompanyList" :key="item.subCode">
             <span class="joinDepart" v-if="!item.seletShow">{{item.joinDepartment | getJoinDepName}}</span>
             <el-select v-model="item.selectDepIdArr" multiple class='w160 multiple_input' filterable
-                       @change="getSelected(item)"
-                       :placeholder="$t('pub.pleaseSel')" v-if="item.seletShow">
-              <el-option
-                v-for="item in item.departMentList"
-                :key="item.DepartmentID"
-                :label="item.DepartmentName"
+              @change="getSelected(item)" :placeholder="$t('pub.pleaseSel')" v-if="item.seletShow">
+              <el-option v-for="item in item.departMentList" :key="item.DepartmentID" :label="item.DepartmentName"
                 :value="item.DepartmentID">
               </el-option>
             </el-select>
@@ -640,12 +660,8 @@ input[type="number"] {
           <td v-for="item in getCompanyList" @click="closeOpTion()" :key="item.subCode">
             <span class="joinDepart" v-if="!item.seletOpShow">{{item.joinEmployee | getJoinEmpName}}</span>
             <el-select v-model="item.selectOpIdArr" multiple class='w160 multiple_input' filterable
-                       @change="getOPSelected(item)"
-                       :placeholder="$t('pub.pleaseSel')" v-if="item.seletOpShow">
-              <el-option
-                v-for="item in item.employeeList"
-                :key="item.EmployeeId"
-                :label="item.EmName"
+              @change="getOPSelected(item)" :placeholder="$t('pub.pleaseSel')" v-if="item.seletOpShow">
+              <el-option v-for="item in item.employeeList" :key="item.EmployeeId" :label="item.EmName"
                 :value="item.EmployeeId">
               </el-option>
             </el-select>
@@ -659,8 +675,8 @@ input[type="number"] {
         </tr>
 
       </table>
-      <input type="button" class="normalBtn" @click="isShowTwo=false" :value="$t('pub.cancelBtn')"/>
-      <input type="button" class="normalBtn saveCompanyBtn" @click="saveCompany()" :value="$t('pub.saveBtn')"/>
+      <input type="button" class="normalBtn" @click="isShowTwo=false" :value="$t('pub.cancelBtn')" />
+      <input type="button" class="normalBtn saveCompanyBtn" @click="saveCompany()" :value="$t('pub.saveBtn')" />
     </div>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
@@ -669,12 +685,12 @@ input[type="number"] {
 </template>
 
 <script>
-export default {
+  export default {
     data() {
       return {
-      fileList3:[],
-      fileList:[],
-      fileList2:[],
+        fileList3: [],
+        fileList: [],
+        fileList2: [],
         msg: {
           pageIndex: 1,
           pageSize: 6,
@@ -695,10 +711,11 @@ export default {
           lineShortName: "",
           IsShare: 0,
           Is_PacketGroup: 0,
-        LineDirection:2,
-        BackgroundImage:"",
-        BroadsideImage:'',
-        AppLineIcon:"",
+          LineDirection: 2,
+          BackgroundImage: "",
+          BroadsideImage: '',
+          AppLineIcon: "",
+          RebateMoney: 0, //人头返佣
         },
         departCompany: "",
         departDepartment: "",
@@ -719,22 +736,36 @@ export default {
         loading: true,
         rules: {
           //表单必填验证
-        lineName: [
-          { required: true, message: "请输入线路名", trigger: "blur" }
-        ],
-        lineCode: [
-          { required: true, message: "请填写线路代码", trigger: "blur" },
-          { pattern: /^[a-zA-Z]/, message: "请输入正确的字母" }
-        ],
-        lowDeposit: [
-          { required: true, message: "请填写最低金额", trigger: "blur" }
-        ],
-        lineShortName: [
-          { required: true, message: "请填线路简称", trigger: "change" }
+          lineName: [{
+            required: true,
+            message: "请输入线路名",
+            trigger: "blur"
+          }],
+          lineCode: [{
+              required: true,
+              message: "请填写线路代码",
+              trigger: "blur"
+            },
+            {
+              pattern: /^[a-zA-Z]/,
+              message: "请输入正确的字母"
+            }
           ],
-        LineDirection:[
-          { required: true, message: "请选择线路方向", trigger: "change" }
-        ]
+          lowDeposit: [{
+            required: true,
+            message: "请填写最低金额",
+            trigger: "blur"
+          }],
+          lineShortName: [{
+            required: true,
+            message: "请填线路简称",
+            trigger: "change"
+          }],
+          LineDirection: [{
+            required: true,
+            message: "请选择线路方向",
+            trigger: "change"
+          }]
         }
       };
     },
@@ -880,10 +911,11 @@ export default {
         this.addMsg.BackgroundImage = getInfo.backgroundImage;
         this.addMsg.BroadsideImage = getInfo.broadsideImage;
         this.addMsg.AppLineIcon = getInfo.appLineIcon;
+        this.addMsg.RebateMoney = getInfo.rebateMoney;
       },
       deletelist(lineID) {
         var that = this;
-      this.Confirm("是否删除此线路?", function() {
+        this.Confirm("是否删除此线路?", function () {
           let msg = {
             ID: lineID
           };
@@ -916,9 +948,9 @@ export default {
               x.seletShow = false;
               x.seletOpShow = false;
               x.departMentList = "";
-            x.employeeList=[];
+              x.employeeList = [];
               x.selectDepIdArr = [];
-            x.selectOpIdArr= [];
+              x.selectOpIdArr = [];
               if (x.lossAllocation == null && x.inputShow == false) {
                 x.showSet = true;
               } else {
@@ -929,9 +961,9 @@ export default {
               } else {
                 x.showSelectSet = false;
               }
-            if(x.joinEmployee.length==0 && x.seletOpShow==false){
+              if (x.joinEmployee.length == 0 && x.seletOpShow == false) {
                 x.showOpSet = true;
-            }else{
+              } else {
                 x.showOpSet = false;
               }
               if (x.joinDepartment.length > 0) {
@@ -1021,7 +1053,7 @@ export default {
           item.seletShow = false;
         }
       },
-    getOPSelected(item){
+      getOPSelected(item) {
         if (item.selectOpIdArr.length > 0) {
           let ckedJoinEmployee = [];
           item.selectOpIdArr.forEach(x => {
@@ -1083,7 +1115,7 @@ export default {
         this.getCompanyList = tempCompanyList;
       },
       //点击设置OP开始设置
-    clickedOpSet(item){
+      clickedOpSet(item) {
         var tempCompanyList = JSON.parse(JSON.stringify(this.getCompanyList));
         tempCompanyList.forEach(x => {
           if (x.rB_Branch_id == item.rB_Branch_id) {
@@ -1116,7 +1148,7 @@ export default {
           IsShare: 0,
           lineCountryList: [],
           Is_PacketGroup: 0,
-        LineDirection:2,
+          LineDirection: 2,
         };
         this.lineCountryArr = [];
       },
@@ -1143,7 +1175,7 @@ export default {
               lineBranchList.push(lineBranch);
             });
           }
-        if(x.joinEmployee.length>0){
+          if (x.joinEmployee.length > 0) {
             x.joinEmployee.forEach(y => {
               var opBranch = {
                 rB_Branch_id: x.rB_Branch_id,
@@ -1217,7 +1249,7 @@ export default {
           }
         });
       },
-    closeOpTion(){
+      closeOpTion() {
         this.getCompanyList.forEach(x => {
           x.seletOpShow = false;
           if (x.selectOpIdArr.length == 0) {
@@ -1231,7 +1263,7 @@ export default {
       this.getCountry();
     },
     filters: {
-    getJoinDepName: function(depList) {
+      getJoinDepName: function (depList) {
         let returnStr = "";
         if (depList.length > 0) {
           let depName = [];
@@ -1242,7 +1274,7 @@ export default {
         }
         return returnStr;
       },
-    getJoinEmpName:function(depList){
+      getJoinEmpName: function (depList) {
         let returnStr = "";
         if (depList.length > 0) {
           let depName = [];
@@ -1254,7 +1286,6 @@ export default {
         return returnStr;
       }
     }
-};
-</script>
-
+  };
 
+</script>