Skip to content

S
SuperMan
Commit e39e955d authored by 沈良进's avatar 沈良进
Browse files
Options

save'

parent 3c42d1ef
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 63 deletions
src/components/TravelManager/TravelTeam/priceGroup.vue
View file @ e39e955d
......@@ -625,7 +625,7 @@
<div style="margin-top:5px;">{{fItem.AlName}}</div>
</td>
<td>
<div>{{fItem.FlightDate}} {{fItem.Departure_time}}</div>
<div>{{fItem.FlightDate.slice(0,10)}} {{fItem.Departure_time}}</div>
<div style="margin-top:5px;">
<span v-if="fItem.DIATA">({{fItem.DIATA}})</span>
{{fItem.dName}}
......@@ -892,6 +892,10 @@
<div class="mb bold"><span class="item-title">经济舱: </span><span>{{item.YSeat}}</span></div>
<div class="mb bold"><span class="item-title">商务舱: </span><span>{{item.CSeat}}</span></div>
<div class="mb bold"><span class="item-title">头等舱: </span><span>{{item.FSeat}}</span></div>
<!-- <div class="mb bold"><span class="item-title">经济舱:</span><span>{{item.YSeat}} <span class="item-title ml">剩余:</span>{{item.SurplusYSeatNum}}</span></div>
<div class="mb bold"><span class="item-title">商务舱:</span><span> {{item.CSeat}} <span class="item-title ml">剩余:</span>{{item.SurplusCSeatNum}}</span></div>
<div class="mb bold"><span class="item-title">头等舱:</span><span> {{item.FSeat}} <span class="item-title ml">剩余:</span>{{item.SurplusFSeatNum}}</span></div> -->
</div>
</div>
<div class="el-col w_10">
......@@ -929,7 +933,7 @@
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination>
<div class="buy-box" v-show="isShowTeamOrder">
<orderForm @success="reSearchPage" @close="closeForm" :PTCID="teamInfo.TCID" :POrderId="0" :PBranchId="0" :PProductType="2">
<orderForm @success="reSearchPage" @close="closeForm" :PTCID="teamInfo.TCID" :POrderId="0" :PBranchId="0" :PProductType="2" :showCity="false">
</orderForm>
</div>
</div>
......
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @ e39e955d
......@@ -175,7 +175,7 @@
<div style="margin-top:5px;">{{fItem.AlName}}</div>
</td>
<td>
<div>{{fItem.FlightDate}} {{fItem.Departure_time}}</div>
<div>{{fItem.FlightDate.slice(0,10)}} {{fItem.Departure_time}}</div>
<div style="margin-top:5px;">
<span v-if="fItem.DIATA">({{fItem.DIATA}})</span>
{{fItem.dName}}
......
src/components/orderCommon/order-form.vue
View file @ e39e955d
......@@ -85,7 +85,7 @@
<el-input v-model="addMsg.IndustryCategory"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="4" v-if="showCity">
<!--出发城市-->
<el-form-item :label="$t('system.table_goCity')" prop="DepartureCityId">
<el-select v-model="addMsg.DepartureCityId" :disabled="
......@@ -113,7 +113,7 @@
type="date" @change="getUnionTravelPrice(priceObj, 1)"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="4" v-if="showCity">
<!--返回城市-->
<el-form-item :label="$t('salesModule.BackCity')" prop="ReturnArriveCityId">
<el-select v-model="addMsg.ReturnArriveCityId" :disabled="
......@@ -141,7 +141,7 @@
</el-col>
<el-col :span="4">
<el-form-item :label="$t('salesModule.TeamPrice')" prop="TC_Price">
<el-input v-if="addMsg.GroupType != 4" v-model="addMsg.TC_Price" :disabled="true" @input="getTotalPrice()">
<el-input v-if="addMsg.GroupType != 4" v-model="addMsg.TC_Price" @input="getTotalPrice()">
</el-input>
<el-input v-else v-model="SingleDMCPricex" :disabled="true" @input="getTotalPrice()"></el-input>
</el-form-item>
......@@ -365,7 +365,7 @@
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getTotalPrice();getHouseNo()'></el-input>
</el-form-item>-->
</el-col>
<el-col :span="4">
<el-col :span="4" v-if="showCity">
<el-form-item :label="$t('salesModule.ScenicRefund')">
<el-select filterable multiple class="multiple_input" v-model="addMsg.ScenicRefundArr"
:placeholder="$t('pub.pleaseSel')" @change="ScenicRefundMethods">
......@@ -374,7 +374,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="4" v-if="showCity">
<el-form-item :label="$t('salesModule.MsgMoney')">
<el-select filterable v-model="addMsg.IsShowMessagesMoney" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('system.table_isShows')" value="1"></el-option>
......@@ -457,6 +457,10 @@
export default {
//团期编号，订单编号(新增传0),下单人选择的公司
props: {
showCity: {
type: Boolean,
default: true,
},
PTCID: {
type: Number,
default: 0, //团期编号(必须传)
......@@ -502,60 +506,61 @@
Unit_PriceList: [], //成交单价下拉数据
LessMoney: 0,
addMsg: {
GroupTypeNeedHouse: "0",
OrderId: "0",
OneSex: "0",
TCID: "0",
CustomerType: "",
GroupType: "",
IndustryCategory: "",
ContactName: "",
ContactMobile: "",
CustomerId: "",
DepartureCityId: "",
ReturnArriveCityId: "",
IsIntermodal: "2",
IsReturnIntermodal: "2",
Unit_Price: "0",
TC_Price: "0",
ManNum: "0",
ChirdNum: "0",
ChirdNoNeedBedNum: "0",
ChirdNeedBedNum: "0",
BabyNum: "0",
OldPeopleNum: "0",
SingleRoomNum: "0",
PreferPrice: 0,
YSeatNum: "0",
ESeatNum: "0",
FSeatNum: "0",
Commission: "0",
ClientSource: "",
BrandId: "",
TradeWay: "2",
PlatformAccount: "",
PlatformOrder: "",
GuestNum: 0,
IsChildrenTour: "0",
IsBirdDiscount: "0",
PredictRoomNum: "0",
BigRoomNum: "0",
TripleRoomNum: "0",
TradeDate: "",
CostType: "",
Remarks: "",
VisaNum: "0",
SafeNum: "0",
AirticketNum: "0",
ScenicRefundArr: [],
GoCityTime: "",
BackCityTime: "",
CommissionSharePeople: "-1",
CommissionShareMoney: "0",
OrderForm: "1",
SonControlID: "-1",
IsShowMessagesMoney: "2",
QuotationUrl: "", //单团附件
price: 0,
GroupTypeNeedHouse: 0,
OrderId: 0,
OneSex: 0,
TCID: 0,
CustomerType: "",
GroupType: "",
IndustryCategory: "",
ContactName: "",
ContactMobile: "",
CustomerId: "",
DepartureCityId: 0,
ReturnArriveCityId: "",
IsIntermodal: "2",
IsReturnIntermodal: "2",
Unit_Price: 0,
TC_Price: 0,
ManNum: 0, // 成人数量
ChirdNum: 0, // 小孩数量
ChirdNoNeedBedNum: 0,
ChirdNeedBedNum: 0,
BabyNum: 0,
OldPeopleNum: 0,
SingleRoomNum: 0,
PreferPrice: 0,
YSeatNum: 0,
ESeatNum: 0,
FSeatNum: 0,
Commission: 0,
ClientSource: 0,
BrandId: 0,
TradeWay: "2",
PlatformAccount: "",
PlatformOrder: "",
GuestNum: 0,
IsChildrenTour: 0,
IsBirdDiscount: 0,
PredictRoomNum: 0,
BigRoomNum: 0,
TripleRoomNum: 0,
TradeDate: "",
CostType: "",
Remarks: "",
VisaNum: 0,
SafeNum: 0,
AirticketNum: 0,
ScenicRefundArr: [],
GoCityTime: "",
BackCityTime: "",
CommissionSharePeople: 0,
CommissionShareMoney: 0,
OrderForm: "1",
SonControlID: "-1",
IsShowMessagesMoney: "2",
QuotationUrl: "", //单团附件
},
uploadLloading: false,
rules: {
......@@ -1474,7 +1479,7 @@
this.addMsg.IsChildrenTour = this.priceObj.IsSupportChildren;
this.addMsg.IsBirdDiscount = this.priceObj.IsBirdDiscount;
this.apipost(
"sellorder_post_SetOrderInfo_02",
"sellorder_post_SetTravelTeamOrderForB2B",
this.addMsg,
(res) => {
if (res.data.resultCode == 1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment