1 机票增加 团票/散票

src/components/Ticketing/TicketManager.vue

@@ -1374,15 +1374,25 @@
             </el-select>
           </span>
         </li>
-        <li>
+        <!-- <li>
           <span>
             <em>机票类型</em>
             <el-select v-model="msg.SellType" filterable :placeholder="$t('system.ph_in')" class="w120">
               <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
-              <el-option label="团队机票" :value="0"></el-option>
+              <el-option label="团队使用" :value="0"></el-option>
               <el-option label="单卖机票" :value="1"></el-option>
             </el-select>
           </span>
+        </li> -->
+        <li>
+          <span>
+            <em>团票/散票</em>
+            <el-select v-model="msg.TravelTicketType" filterable :placeholder="$t('system.ph_in')" class="w120">
+              <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+              <el-option label="团票" :value="1"></el-option>
+              <el-option label="散票" :value="2"></el-option>
+            </el-select>
+          </span>
         </li>
         <li>
           <span>
@@ -1960,6 +1970,9 @@
               <span
                 v-if="Number(item.B2BPrice)<Number(item.CostPrice) || Number(item.B2BPrice)==Number(item.CostPrice) || Number(item.B2CPrice)<Number(item.CostPrice)|| Number(item.B2CPrice)==Number(item.CostPrice)"
                 style="margin-left:10px;color:red">小程序价格未维护</span>
+                <span v-if="item.TravelTicketType && item.TravelTicketType>0" style="margin-left:20px;color:deepskyblue">
+                  {{item.TravelTicketType==1?'团票':item.TravelTicketType==2?'散票':''}}
+              </span>
             </el-row>
             <el-row :gutter="0">
               <el-col :span="1">
@@ -2257,15 +2270,23 @@
               maxlength="2"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="3">
+          <el-form-item label="团票/散票">
+            <el-select v-model="addMsg.TravelTicketType" :placeholder="$t('system.ph_in')" class="multiple_input">
+              <el-option label="团票" :value="1"></el-option>
+              <el-option label="散票" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
           <el-form-item label="机票类型">
             <el-select v-model="addMsg.SellType" :placeholder="$t('system.ph_in')" class="multiple_input">
-              <el-option label="团队机票" :value="0"></el-option>
+              <el-option label="团队使用" :value="0"></el-option>
               <el-option label="单卖机票" :value="1"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4">
           <el-form-item label="可售机票数量(同业/直客)">
             <el-input v-model="addMsg.B2BSellNum" placeholder="可售机票数量(同业/直客)"
               @keyup.native="checkInteger(addMsg,'B2BSellNum')" maxlength="2"></el-input>
@@ -2419,11 +2440,19 @@
         <el-col :span="5">
           <el-form-item label="机票类型">
             <el-select v-model="addMsg.SellType" :placeholder="$t('system.ph_in')" class="multiple_input">
-              <el-option label="团队机票" :value="0"></el-option>
+              <el-option label="团队使用" :value="0"></el-option>
               <el-option label="单卖机票" :value="1"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="5">
+          <el-form-item label="团票/散票">
+            <el-select v-model="addMsg.TravelTicketType" :placeholder="$t('system.ph_in')" class="multiple_input">
+              <el-option label="团票" :value="1"></el-option>
+              <el-option label="散票" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="5">
           <el-form-item label="备注">
             <el-input v-model="addMsg.Remark" placeholder="备注" type="textarea" :rows="2"></el-input>
@@ -2796,9 +2825,10 @@
           TicketType: 0, //定金类型(1定，2定等)
           IsLimit: 1,
           Departure_city: 0, //出发地
-          SellType: -1, //售卖机票类型：0-团队机票，1-单卖机票
+          SellType: -1, //售卖机票类型：0-团队使用，1-单卖机票
           IsSelectInvoicing: '0', //是否未维护开票金额1-未维护，2-已维护
           IsNoTCID: 0, //1未绑定团期  2有机损的取消团期
+          TravelTicketType: 0, //团票/散票类型：1-团队，2-散票
         },
         maintenanceList: [{
             Name: '不限',
@@ -2837,6 +2867,7 @@
           SellType: 0, //售卖机票类型：0-团队机票，1-单卖机票
           Remark: "", //备注信息
           B2BSellNum: 0, //可售机票数量
+          TravelTicketType: 1,// 团票/散票： 1团票  2散票
         },
         //去程
         addGoFlight: {