新增公司支付类型

src/components/Hotel/roomReservationsDetails.vue

@@ -116,7 +116,7 @@
               <td v-if="childIndex==0" :rowspan="5">
                 <div class="w150">
                   <!--:disabled="subItem.OPState==1"-->
-                  <el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"  
+                  <el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
                     @visible-change='getHotelList(subItem)' @change='sendValue(subItem)'>
                     <el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
                       :key='itemHotel.ID'>
@@ -204,9 +204,19 @@
                         <el-option label='签单' :value='2'></el-option>
                         <el-option label='实物抵扣' :value='5'></el-option>
                         <el-option label='预付' :value='4'></el-option>
+                        <el-option label='公司合团支付' :value='6'></el-option>
                       </el-select>
                     </td>
                   </tr>
+                  <tr v-show="subItem.PayStyle==6">
+                    <td colspan="2" style="height:5px;"></td>
+                  </tr>
+                  <tr v-show="subItem.PayStyle==6">
+                    <td width="70" style="text-align:right;">付款团号：</td>
+                    <td>
+                      <el-input class='w135' v-model='subItem.PayTypeTCNUM'></el-input>
+                    </td>
+                  </tr>
                   <tr>
                     <td colspan="2" style="height:5px;"></td>
                   </tr>
@@ -230,7 +240,7 @@
               <!-- 操作 -->
               <td v-if="childIndex==0" :rowspan="5">
                 <!--v-if="subItem.OPState!=1"-->
-                <template >
+                <template>
                   <el-tooltip class="item" effect="dark" content="保存" placement="top-start">
                     <el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
                   </el-tooltip>
@@ -307,8 +317,8 @@
         subItem.HotelId = 0;
         subItem.HotelName = "";
         subItem.OrderID = 0;
-        subItem.OrderDetailsList.forEach(childItem=>{
-          childItem.OrderDetailsId=0;
+        subItem.OrderDetailsList.forEach(childItem => {
+          childItem.OrderDetailsId = 0;
         });
         item.HotelOrderList.push(subItem);
       },

src/components/busManagement/BusInfo.vue

@@ -265,16 +265,22 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="付款方式" min-width="150">
+          <el-table-column label="付款方式" min-width="150" >
             <template slot-scope="scope">
               <el-select class='sel' v-model='scope.row.PayType' :placeholder="$t('pub.pleaseSel')">
                 <el-option label='请选择' :value='0'></el-option>
                 <el-option label='现付' :value='1'></el-option>
                 <el-option label='公司结算' :value='2'></el-option>
                 <el-option label='预付' :value='3'></el-option>
+                <el-option label='合团公司支付' :value='4'></el-option>
               </el-select>
             </template>
           </el-table-column>
+          <el-table-column label="合团支付团号" min-width="150" >
+            <template slot-scope="scope">
+               <el-input class='w120' type="text" v-model='scope.row.PayTypeTCNUM'  v-show="scope.row.PayType==4"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column label="定团号" min-width="230">
             <template slot-scope="scope">
               <div :class="{'BusTyleFirst':scope.$index==0}">
@@ -318,6 +324,7 @@
                   <el-option label='现付' :value='1'></el-option>
                   <el-option label='公司结算' :value='2'></el-option>
                   <el-option label='预付' :value='3'></el-option>
+                  <el-option label='合团公司支付' :value='4'></el-option>
                 </el-select>
               </div>
             </template>
@@ -717,8 +724,6 @@
         newPlanData.PayType = oldPlanData.PayType;
         newPlanData.BookGroup = oldPlanData.BookGroup;
         newPlanData.HighSpeedPayType = oldPlanData.HighSpeedPayType;
-        // newPlanData.HighSpeedPrice = oldPlanData.HighSpeedPrice;
-        // newPlanData.CostPrice = oldPlanData.CostPrice;
       }
     },
     mounted() {