1

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2347,6 +2347,7 @@
                   ">
                   <span v-for="childItem in item.guestList" style="color: blue">
                     {{childItem.userName}}
+                    <span :style="childItem.isBed==1?'color:#d332e5':'color:#67c23a' ">（{{childItem.isBed==1?'占床':'不占床'}}） </span>
                     <span style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span>
                     <span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span>
                     <span style="cursor:pointer;"

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2129,8 +2129,9 @@
               <span class="RL-remarkTitle" v-if="item.GuestList.length > 0">{{ $t("salesModule.MD") }}:</span>
               <p class="RL-redType RL-remarkCon" v-if="item.GuestList.length > 0">
                 <span style="color: blue !important" v-for="(childItem,childIndex) in item.GuestList" :key="childIndex"
-                  @click="goToPassenger(childItem, 2)">{{ childItem.userName }}<span
-                    style="color:#f56c6c">{{childItem.VisaType==1?'(个签)':''}}</span>
+                  @click="goToPassenger(childItem, 2)">{{ childItem.userName }}
+                  <span :style="childItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{childItem.IsBed==1?'占床':'不占床'}}） </span>
+                  <span style="color:#f56c6c">{{childItem.VisaType==1?'(个签)':''}}</span>
                   <span style="color:#f56c6c">{{childItem.TicketOutTypeStr}}
                   </span>
                 </span>
@@ -2676,6 +2677,7 @@
                   <template v-for="(fourthItem,fourthIndex) in childItem.GuestList">
                     <span style="color: blue !important" :key="fourthIndex"
                       @click="goToPassenger2(msg.TCID, fourthItem.OrderId, 2)">{{ fourthItem.userName }}
+                      <span :style="fourthItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{fourthItem.IsBed==1?'占床':'不占床'}}） </span>
                       <span style="color:#f56c6c">{{fourthItem.VisaType==1?'(个签)':''}}
                       </span>
                       <span v-if="fourthItem.TicketOutType==1" style="color:#409EFF;">{{fourthItem.TicketOutTypeStr}}

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -93,7 +93,7 @@
               <td width="300">
                 {{postConfig.Title}}
               </td>
-              <td width="80" class="txtRightCost">团队类型</td>
+              <td width="80" class="txtRightCost">出团类型</td>
               <td width="300">
                 <template v-if="postConfig.TeamType==1">
                   <span style="color:red;font-weight:bold;">{{postConfig.TeamTypeName}}</span>
@@ -102,9 +102,9 @@
                   {{postConfig.TeamTypeName}}
                 </template>
               </td>
-              <td width="80" class="txtRightCost">行程天数</td>
+              <td width="80" class="txtRightCost">团队类型</td>
               <td>
-                {{postConfig.DayNum}}
+                {{postConfig.PriceTeamTypeName}}
               </td>
             </tr>
             <tr>
@@ -113,9 +113,13 @@
             </tr>
             <tr>
               <td width="80" class="txtRightCost">出团公司</td>
-              <td colspan="3">
+              <td >
                 {{postConfig.OutBranchName}}
               </td>
+              <td width="80" class="txtRightCost">行程天数</td>
+              <td>
+                {{postConfig.DayNum}}
+              </td>
               <td width="80" class="txtRightCost">出发日期</td>
               <td>
                 {{postConfig.OutDateTime}}
@@ -546,7 +550,7 @@
               </template>
             </td>
             <td colspan="3">
-              当前团队类型: <template v-if="postConfig.TeamTypeName=='小包团'">
+              当前出团类型: <template v-if="postConfig.TeamTypeName=='小包团'">
                 <span style="color:red;font-weight:bold;">{{postConfig.TeamTypeName}}</span>
               </template>
               <template v-else>
@@ -554,7 +558,7 @@
               </template>
             </td>
             <td colspan="4">
-              <el-form-item label="更改团队类型">
+              <el-form-item label="更改出团类型">
                 <el-select class="multiple_input" v-model="postConfig.TeamType">
                   <el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
                   </el-option>

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -458,6 +458,7 @@
               <template v-else>
                 {{postConfig.TeamTypeName}}
               </template>
+              <template v-if="postConfig.PriceTeamTypeName&&postConfig.PriceTeamTypeName.length>0">/{{postConfig.PriceTeamTypeName}}</template>
             </td>
           </tr>
 

src/components/TravelManager/TravelNewQuotation/CostNewPriceMun.vue

@@ -97,6 +97,18 @@
                   <el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
                   </el-option>
                 </el-select>
+              
+              </td>
+              <td width="80" class="txtRightCost">团队类型</td>
+              <td>
+                
+                  <el-select class="multiple_input" v-model="postConfig.PriceTeamType">
+                  <el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
+                  <template v-for="item in TeamListArr">
+                    <el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==4||item.Id==9" :key="item.Id" :label="item.Name" :value="item.Id">
+                          </el-option>
+                        </template>
+                </el-select>
               </td>
               <td width="80" class="txtRightCost">线路</td>
               <td>
@@ -107,34 +119,24 @@
                   </el-option>
                 </el-select>
               </td>
-              <td width="60" class="txtRightCost">系列</td>
-              <td>
-                <el-select class="w300" v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" filterable>
-                  <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
-                  <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
-                  </el-option>
-                </el-select>
-              </td>
             </tr>
             <tr>
               <td colspan="6" style="height:20px;">
               </td>
             </tr>
             <tr>
-              <td width="80" class="txtRightCost">团队标题</td>
+              
+              <td width="80" class="txtRightCost">系列</td>
               <td colspan="3">
-                <el-input v-model="postConfig.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }" resize="none"
-                  placeholder="请填写团队标题" maxlength="200"></el-input>
+                <el-select style="width:100%;" v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" filterable>
+                  <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+                  <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
+                  </el-option>
+                </el-select>
               </td>
-              <td width="80" class="txtRightCost">行程天数</td>
+               <td width="80" class="txtRightCost">客户名称</td>
               <td>
-                <el-input class="w240 LowNum" v-model="postConfig.DayNum"
-                  @keyup.native="checkInteger(postConfig,'DayNum');createDayTripPrice()" maxlength="2">
-                  <template slot="append">天</template>
-                </el-input>
-                <el-input class="w120 LowNum" v-model="postConfig.NightNum" style="display:none;"
-                  @keyup.native="checkInteger(postConfig,'NightNum')" maxlength="2">
-                  <template slot="append">晚</template>
+                <el-input v-model="postConfig.CustomerName" type="text" placeholder="客户名称" maxlength="200">
                 </el-input>
               </td>
             </tr>
@@ -142,6 +144,8 @@
               <td colspan="6" style="height:20px;">
               </td>
             </tr>
+           
+           
             <tr>
               <td width="80" class="txtRightCost">出团公司</td>
               <td>
@@ -155,12 +159,30 @@
                 <el-date-picker type="date" v-model="postConfig.OutDateTime" value-format="yyyy-MM-dd" placeholder>
                 </el-date-picker>
               </td>
-              <td width="80" class="txtRightCost">客户名称</td>
+              <td width="80" class="txtRightCost">行程天数</td>
               <td>
-                <el-input v-model="postConfig.CustomerName" type="text" placeholder="客户名称" maxlength="200">
+                <el-input class="w240 LowNum" v-model="postConfig.DayNum"
+                  @keyup.native="checkInteger(postConfig,'DayNum');createDayTripPrice()" maxlength="2">
+                  <template slot="append">天</template>
+                </el-input>
+                <el-input class="w120 LowNum" v-model="postConfig.NightNum" style="display:none;"
+                  @keyup.native="checkInteger(postConfig,'NightNum')" maxlength="2">
+                  <template slot="append">晚</template>
                 </el-input>
               </td>
             </tr>
+            <tr>
+              <td colspan="6" style="height:20px;">
+              </td>
+            </tr>
+            <tr>
+              <td width="80" class="txtRightCost">团队标题</td>
+              <td colspan="5">
+                <el-input v-model="postConfig.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }" resize="none"
+                  placeholder="请填写团队标题" maxlength="200"></el-input>
+              </td>
+             
+            </tr>
           </table>
         </div>
         <br />
@@ -205,7 +227,8 @@
           },
           OtherPrice: {},
           teamPrice: {},
-          CostNumberList: []
+          CostNumberList: [],
+          TeamListArr:[]
         },
         orderList: [],
         queryMsg: {
@@ -329,6 +352,16 @@
           }
         });
       },
+       //获取团队类型
+    getPriceTeamList() {
+      this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
+        if (res.data.resultCode == 1) {
+          this.TeamListArr = res.data.data;
+        } else {
+          this.Error(res.data.message);
+        }
+      }, err => {});
+    },
       createDayTripPrice() {
         for (let i = 0; i < this.orderList.length; i++) {
           this.orderList[i].dayCostPrice = this.createDayTripPriceItem([...this.orderList[i].dayCostPrice]);
@@ -455,6 +488,7 @@
       this.getAllCurrency();
       this.getCompanyList();
       this.getTeamList();
+      this.getPriceTeamList();
       this.getLineTeamList();
       if (!this.OfferArray.length) {
         this.createOrderList();

src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue

@@ -75,6 +75,8 @@
           ManagerAduitStatus: 0, //欧洲线审核状态(1-通过，2-驳回)
           OPName: "", //主OP
           AssistantList: [], //助理OP
+          PriceTeamType: 0, //团队类型,
+          PriceTeamTypeName: "", //团队类型,
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
@@ -286,6 +288,8 @@
               this.postData.OutBranchName = tempData.OutBranchName;
               this.postData.TeamTypeName = tempData.TeamTypeName;
               this.postData.TeamType = tempData.TeamType;
+              this.postData.PriceTeamTypeName = tempData.PriceTeamTypeName;
+              this.postData.PriceTeamType = tempData.PriceTeamType;
               if (tempData.OfferArray) {
                 tempData.OfferArray.forEach(item => {
                   this.OfferArray.push(item)

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -56,7 +56,8 @@
           StartCityId: 0,
           ReturnArriveCityId: 0, //返回抵达城市
           CustomerName: "", //客户名称
-          TeamType: 0, //团队类型
+          TeamType: 0, //出团类型
+          PriceTeamType:0,//团队类型
           TravelState: 1, //团控状态(1-草稿，2-待审核,3-审核通过,4-审核拒绝,5已撤销)
           OutBranchId: "", //出团公司
           OutDateTime: "", //出发时间
@@ -205,6 +206,7 @@
           item.currencyNumberList = item.CostCurrencyList;
           item.OtherPrice.CurrencyNumberList = item.CostCurrencyList;
           item.TeamType = this.postData.TeamType;
+          item.PriceTeamType = this.postData.PriceTeamType;
           item.OutBranchId = this.postData.OutBranchId;
           item.TravelState = this.postData.TravelState;
           item.OutDateTime = this.postData.OutDateTime;
@@ -305,6 +307,7 @@
                 this.postData.OutBranchId = Number(tempData.OutBranchId);
               }
               this.postData.TeamType = tempData.TeamType;
+              this.postData.PriceTeamType = tempData.PriceTeamType;
               this.postData.TravelState = tempData.TravelState;
               this.LineList = tempData.LineList;
               if (tempData.OfferArray && tempData.OfferArray.length > 0) {

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -130,8 +130,9 @@
                   <i style="color:red;font-weight:bold;">{{item.TeamTypeName}}</i>
                 </template>
                 <template v-else>
-                  {{item.TeamTypeName}}
+                  {{item.TeamTypeName}} 
                 </template>
+                <template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template>
               </div>
             </div>
           </div>

src/components/TravelManager/TravelNewQuotation/priceDialog.vue

@@ -182,6 +182,8 @@
           ManagerAduitStatus: 0, //欧洲线审核状态(1-通过，2-驳回)
           OPName: "", //主OP
           AssistantList: [], //助理OP
+          PriceTeamType: 0, //团队类型,
+          PriceTeamTypeName: "", //团队类型,
         },
         dayCostPriceList: [], //报价列表
 
@@ -312,6 +314,8 @@
               this.postData.OutBranchId = tempData.OutBranchId;
               this.postData.OutDateTime = tempData.OutDateTime;
               this.postData.TeamTypeName = tempData.TeamTypeName;
+              this.postData. PriceTeamType=tempData.PriceTeamType, //团队类型,
+              this.postData. PriceTeamTypeName=tempData.PriceTeamTypeName, //团队类型,
               this.LineList = tempData.LineList;
               if (tempData.OfferArray && tempData.OfferArray.length > 0) {
                 var offerObj = tempData.OfferArray[0];