Skip to content

S
SuperMan
Commit 25d8b4ff authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent c7570731
Show whitespace changes
Inline Side-by-side
Showing with 259 additions and 282 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 25d8b4ff
...@@ -2499,6 +2499,8 @@ ...@@ -2499,6 +2499,8 @@
Remarks: "", Remarks: "",
//1-可以修改，0-不能修改【默认可以修改】 //1-可以修改，0-不能修改【默认可以修改】
isOrder: "1", isOrder: "1",
UnionRemark: "", //新联运备注
IsIntermodal: 0, //是否联运
}, },
IsUnion: 2, IsUnion: 2,
IsChargeLossOrders: 0, IsChargeLossOrders: 0,
...@@ -3476,6 +3478,8 @@ ...@@ -3476,6 +3478,8 @@
this.remarksMsg.Remarks = obj.remarks; this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks; this.remarksMsg.OldRemarks = obj.remarks;
this.remarksMsg.isOrder = obj.isOrder; this.remarksMsg.isOrder = obj.isOrder;
this.remarksMsg.UnionRemark = obj.unionRemark;
this.remarksMsg.IsIntermodal = obj.isIntermodal;
this.isShowLayerRemarks = true; this.isShowLayerRemarks = true;
} }
}, },
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 25d8b4ff
...@@ -3270,6 +3270,8 @@ ...@@ -3270,6 +3270,8 @@
Remarks: "", Remarks: "",
//1-可以修改，0-不能修改【默认可以修改】 //1-可以修改，0-不能修改【默认可以修改】
isOrder: 1, isOrder: 1,
UnionRemark: "", //新联运备注
IsIntermodal: 0, //是否联运
}, },
IsChargeLossOrders: 0, IsChargeLossOrders: 0,
Unit_PriceList: [], //成交单价下拉数据 Unit_PriceList: [], //成交单价下拉数据
...@@ -4623,6 +4625,8 @@ ...@@ -4623,6 +4625,8 @@
this.remarksMsg.OrderId = obj.orderId; this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks; this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks; this.remarksMsg.OldRemarks = obj.remarks;
this.remarksMsg.UnionRemark = obj.unionRemark;
this.remarksMsg.IsIntermodal = obj.isIntermodal;
this.isShowLayerRemarks = true; this.isShowLayerRemarks = true;
} }
}, },
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ 25d8b4ff
...@@ -790,6 +790,7 @@ ...@@ -790,6 +790,7 @@
margin: 5px; margin: 5px;
text-align: center; text-align: center;
} }
.passengerSaleList_table { .passengerSaleList_table {
width: 100%; width: 100%;
color: #333; color: #333;
...@@ -997,8 +998,7 @@ ...@@ -997,8 +998,7 @@
</el-form> </el-form>
</div> </div>
<!-- 其他类型的修改信息2 --> <!-- 其他类型的修改信息2 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-if="isShowLayer" <div class="productQuerybottomLayer ownScrollbarStyle" v-if="isShowLayer" :style="{ height: ScreenHeight }">
:style="{ height: ScreenHeight }">
<p>修改 <p>修改
<span class="fr"> <span class="fr">
<input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmit()" /> <input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmit()" />
...@@ -1066,7 +1066,8 @@ ...@@ -1066,7 +1066,8 @@
</el-form-item> </el-form-item>
<el-form-item v-show="addMsg.GroupType != 4"> <el-form-item v-show="addMsg.GroupType != 4">
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p> <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p> <p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管
</p>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
...@@ -1095,7 +1096,8 @@ ...@@ -1095,7 +1096,8 @@
prop="ChirdNoNeedBedNum"> prop="ChirdNoNeedBedNum">
<el-input v-model='addMsg.ChirdNum' :disabled="addMsg.GroupType==='4'" <el-input v-model='addMsg.ChirdNum' :disabled="addMsg.GroupType==='4'"
@keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')" @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童人数");' @change="getNumGuest"></el-input> @input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童人数");'
@change="getNumGuest"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if='IsChildrenTour==1'> <el-col :span="4" v-if='IsChildrenTour==1'>
...@@ -1264,7 +1266,7 @@ ...@@ -1264,7 +1266,7 @@
<el-row :gutter="20" style="margin-bottom: 20px;"> <el-row :gutter="20" style="margin-bottom: 20px;">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="房客信息" prop=""> <el-form-item label="房客信息" prop="">
<table class="passengerSaleList_table" border="0" cellspacing="0" cellpadding="0" > <table class="passengerSaleList_table" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<tr> <tr>
<th width="20%" style="min-width: 260px;">姓名</th> <th width="20%" style="min-width: 260px;">姓名</th>
...@@ -1279,65 +1281,38 @@ ...@@ -1279,65 +1281,38 @@
<tr v-for="(item,index) in addMsg.GuestList" :key="index"> <tr v-for="(item,index) in addMsg.GuestList" :key="index">
<td width="20%" style="min-width: 260px;"> <td width="20%" style="min-width: 260px;">
<div style="display: flex;flex-direction: row;"> <div style="display: flex;flex-direction: row;">
<el-form-item <el-form-item style="width: 50%;" :label="`姓 ${index+1} `" :prop="`GuestList.${index}.SurName`"
style="width: 50%;" :rules="rules.SurName" label-width="50px" label-position="left">
:label="`姓 ${index+1} `" <el-input size="small" v-model='item.SurName' placeholder="请输入姓" style="width: 100%;"
:prop="`GuestList.${index}.SurName`" @input="Transformation(item.SurName,'SurName',index)"></el-input>
:rules="rules.SurName"
label-width="50px"
label-position="left">
<el-input size="small" v-model='item.SurName' placeholder="请输入姓" style="width: 100%;" @input="Transformation(item.SurName,'SurName',index)"></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item style="width: 50%;" :label="`名 ${index+1} `" :prop="`GuestList.${index}.Name`"
style="width: 50%;" :rules="rules.Name" label-width="50px" label-position="left">
:label="`名 ${index+1} `" <el-input size="small" v-model='item.Name' placeholder="请输入名" style="width: 100%;"
:prop="`GuestList.${index}.Name`" @input="Transformation(item.Name,'Name',index)"></el-input>
:rules="rules.Name"
label-width="50px"
label-position="left">
<el-input size="small" v-model='item.Name' placeholder="请输入名" style="width: 100%;" @input="Transformation(item.Name,'Name',index)"></el-input>
</el-form-item> </el-form-item>
</div> </div>
</td> </td>
<td width="20%" style="min-width: 220px;"> <td width="20%" style="min-width: 220px;">
<el-form-item <el-form-item :label="`性别 ${index+1} `" :prop="`GuestList.${index}.Sex`" :rules="rules.Sex"
:label="`性别 ${index+1} `" label-width="70px" label-position="left">
:prop="`GuestList.${index}.Sex`"
:rules="rules.Sex"
label-width="70px"
label-position="left">
<el-select v-model="item.Sex" placeholder="请选择性别" style="width: 100%;"> <el-select v-model="item.Sex" placeholder="请选择性别" style="width: 100%;">
<el-option <el-option v-for="item in optionsList" :key="item.Id" :label="item.Name" :value="item.Id">
v-for="item in optionsList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</td> </td>
<td width="20%" style="min-width: 220px;"> <td width="20%" style="min-width: 220px;">
<el-form-item <el-form-item :label="`出生日期 ${index+1} `" :prop="`GuestList.${index}.Birthday`"
:label="`出生日期 ${index+1} `" :rules="rules.Birthday" label-width="100px" label-position="left">
:prop="`GuestList.${index}.Birthday`" <el-date-picker v-model="item.Birthday" type="date" value-format="yyyy-MM-dd"
:rules="rules.Birthday"
label-width="100px"
label-position="left">
<el-date-picker
v-model="item.Birthday"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择出生日期"> placeholder="选择出生日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</td> </td>
<td width="20%" style="min-width: 220px;"> <td width="20%" style="min-width: 220px;">
<el-form-item <el-form-item :label="`国籍 ${index+1} `" :prop="`GuestList.${index}.Nationality`"
:label="`国籍 ${index+1} `" :rules="rules.PassportNo" label-width="80px" label-position="left">
:prop="`GuestList.${index}.Nationality`"
:rules="rules.PassportNo"
label-width="80px"
label-position="left">
<el-select v-model="item.Nationality" filterable size=mini class="w230"> <el-select v-model="item.Nationality" filterable size=mini class="w230">
<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-option>
...@@ -1345,23 +1320,17 @@ ...@@ -1345,23 +1320,17 @@
</el-form-item> </el-form-item>
</td> </td>
<td width="20%" style="min-width: 220px;"> <td width="20%" style="min-width: 220px;">
<el-form-item <el-form-item :label="`护照号 ${index+1} `" :prop="`GuestList.${index}.PassportNo`"
:label="`护照号 ${index+1} `" :rules="rules.PassportNo" label-width="80px" label-position="left">
:prop="`GuestList.${index}.PassportNo`" <el-input size="small" v-model='item.PassportNo' placeholder="请输入护照号" style="width: 100%;">
:rules="rules.PassportNo" </el-input>
label-width="80px"
label-position="left">
<el-input size="small" v-model='item.PassportNo' placeholder="请输入护照号" style="width: 100%;"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td width="20%" style="min-width: 220px;"> <td width="20%" style="min-width: 220px;">
<el-form-item <el-form-item :label="`手机号 ${index+1} `" :prop="`GuestList.${index}.MobilePhone`"
:label="`手机号 ${index+1} `" :rules="rules.MobilePhone" label-width="80px" label-position="left">
:prop="`GuestList.${index}.MobilePhone`" <el-input size="small" type="Number" v-model='item.MobilePhone' placeholder="请输入手机号"
:rules="rules.MobilePhone" style="width: 100%;"></el-input>
label-width="80px"
label-position="left">
<el-input size="small" type="Number" v-model='item.MobilePhone' placeholder="请输入手机号" style="width: 100%;"></el-input>
</el-form-item> </el-form-item>
</td> </td>
</tr> </tr>
...@@ -1376,7 +1345,8 @@ ...@@ -1376,7 +1345,8 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="集合地" prop="GatherAddress"> <el-form-item label="集合地" prop="GatherAddress">
<el-input type='textarea' size="small" v-model='addMsg.GatherAddress' placeholder="请输入集合地" style="width: 100%;"></el-input> <el-input type='textarea' size="small" v-model='addMsg.GatherAddress' placeholder="请输入集合地"
style="width: 100%;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -1548,7 +1518,8 @@ ...@@ -1548,7 +1518,8 @@
<p>下单时间：{{item.createDate}}</p> <p>下单时间：{{item.createDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p> <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<template v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder"> <template v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}} {{item.commissionCurrency}}</p> <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}
{{item.commissionCurrency}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p> <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
</template> </template>
</td> </td>
...@@ -1732,8 +1703,8 @@ ...@@ -1732,8 +1703,8 @@
</div> </div>
<div v-if="isEditOrderCreate==1||IsSupperOrderEdit" @click="getSalerInfo(item)">修改业务员</div> <div v-if="isEditOrderCreate==1||IsSupperOrderEdit" @click="getSalerInfo(item)">修改业务员</div>
<!--v-if="item.isGuestOk=='1'&&item.outNotice==1"--> <!--v-if="item.isGuestOk=='1'&&item.outNotice==1"-->
<div @click="toTrip(item)">出团通知书<span <div @click="toTrip(item)">出团通知书<span v-if="item.outNotice==1">(OK)</span><span
v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div> v-else>(暂定)</span></div>
<div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div> <div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
<div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')" <div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')"
@click='getHouse(item)'>修改房型</div> @click='getHouse(item)'>修改房型</div>
...@@ -2238,8 +2209,7 @@ ...@@ -2238,8 +2209,7 @@
</el-dialog> </el-dialog>
<!-- 申请优惠--> <!-- 申请优惠-->
<div class="productQuerybottomLayer ownScrollbarStyle" v-if="SpecialOffer" <div class="productQuerybottomLayer ownScrollbarStyle" v-if="SpecialOffer" style="height: 150px;min-height:200px;">
style="height: 150px;min-height:200px;">
<p>申请优惠 <p>申请优惠
<span class="fr"> <span class="fr">
<input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmitRemarks()" /> <input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmitRemarks()" />
...@@ -2394,7 +2364,9 @@ ...@@ -2394,7 +2364,9 @@
OldRemarks: "", OldRemarks: "",
Remarks: "", Remarks: "",
//1-可以修改，0-不能修改【默认可以修改】 //1-可以修改，0-不能修改【默认可以修改】
isOrder: 1 isOrder: 1,
UnionRemark: "", //新联运备注
IsIntermodal: 0, //是否联运
}, },
IsChargeLossOrders: 0, IsChargeLossOrders: 0,
Unit_PriceList: [], //成交单价下拉数据 Unit_PriceList: [], //成交单价下拉数据
...@@ -2452,8 +2424,7 @@ ...@@ -2452,8 +2424,7 @@
GuestList: [], GuestList: [],
GatherAddress: "" GatherAddress: ""
}, },
GuestList: [ GuestList: [{
{
SurName: '', SurName: '',
Name: '', Name: '',
Sex: '', Sex: '',
...@@ -2464,9 +2435,9 @@ ...@@ -2464,9 +2435,9 @@
Nationality: '', Nationality: '',
PassportNo: '', PassportNo: '',
Remarks: '', Remarks: '',
MobilePhone: ''} MobilePhone: ''
], }],
GuestObj:{ GuestObj: {
SurName: '', SurName: '',
Name: '', Name: '',
Sex: '', Sex: '',
...@@ -2528,50 +2499,37 @@ ...@@ -2528,50 +2499,37 @@
message: "请输入联系人电话", message: "请输入联系人电话",
trigger: "blur" trigger: "blur"
}], }],
SurName: [ SurName: [{
{
required: true, required: true,
message: '请输入姓', message: '请输入姓',
trigger: 'blur' trigger: 'blur'
}, }, ],
], Name: [{
Name: [
{
required: true, required: true,
message: '请输入名', message: '请输入名',
trigger: 'blur' trigger: 'blur'
}, }, ],
], Sex: [{
Sex: [
{
required: true, required: true,
message: '请选择性别', message: '请选择性别',
trigger: 'change' trigger: 'change'
}, }, ],
], Birthday: [{
Birthday: [
{
required: true, required: true,
message: '请选择出生日期', message: '请选择出生日期',
trigger: 'blur' trigger: 'blur'
}, }, ],
], Nationality: [{
Nationality: [
{
required: true, required: true,
message: '请选择国籍', message: '请选择国籍',
trigger: 'change' trigger: 'change'
}, }, ],
], PassportNo: [{
PassportNo: [
{
required: true, required: true,
message: '请输入护照号', message: '请输入护照号',
trigger: 'blur' trigger: 'blur'
}, }, ],
], MobilePhone: [{
MobilePhone: [
{
required: true, required: true,
message: '请输入联系人电话', message: '请输入联系人电话',
trigger: 'blur' trigger: 'blur'
...@@ -2581,13 +2539,11 @@ ...@@ -2581,13 +2539,11 @@
message: '请输入正确的手机' message: '请输入正确的手机'
} }
], ],
GatherAddress: [ GatherAddress: [{
{
required: true, required: true,
message: '请输入集合地', message: '请输入集合地',
trigger: 'blur' trigger: 'blur'
}, }, ],
],
}, },
rules2: { rules2: {
CustomerType: [{ CustomerType: [{
...@@ -2757,13 +2713,18 @@ ...@@ -2757,13 +2713,18 @@
tcnum: '', tcnum: '',
isOrder: '', isOrder: '',
}, },
optionsList: [ optionsList: [{
{Name:'男',Id:1}, Name: '男',
{Name:'女',Id:2}, Id: 1
},
{
Name: '女',
Id: 2
},
], ],
TotalNumber: 0, TotalNumber: 0,
isGuest: 0, isGuest: 0,
countryList: [],//国籍 countryList: [], //国籍
}; };
}, },
...@@ -3113,7 +3074,6 @@ ...@@ -3113,7 +3074,6 @@
err => {} err => {}
); );
}, },
deleteItem(obj) { deleteItem(obj) {
if (obj.isCanClear == 1) { if (obj.isCanClear == 1) {
this.Error('OP已确认订单，如需取消请联系当团OP！'); this.Error('OP已确认订单，如需取消请联系当团OP！');
...@@ -3358,7 +3318,7 @@ ...@@ -3358,7 +3318,7 @@
this.addMsg.GatherAddress = x.GatherAddress this.addMsg.GatherAddress = x.GatherAddress
this.addMsg = x; this.addMsg = x;
this.addObj = res.data.data.modelPrice; this.addObj = res.data.data.modelPrice;
if(this.addObj){ if (this.addObj) {
this.addObj.OrderId = x.OrderId; this.addObj.OrderId = x.OrderId;
this.addObj.OpSetLossMoney = x.OpSetLossMoney; this.addObj.OpSetLossMoney = x.OpSetLossMoney;
} }
...@@ -3375,7 +3335,7 @@ ...@@ -3375,7 +3335,7 @@
this.addMsg.TradeWay = x.TradeWay.toString(); this.addMsg.TradeWay = x.TradeWay.toString();
this.addMsg.PredictRoomNum = x.PredictRoomNum; this.addMsg.PredictRoomNum = x.PredictRoomNum;
this.addMsg.IsIntermodal = x.IsIntermodal ? x.IsIntermodal.toString() : 2; this.addMsg.IsIntermodal = x.IsIntermodal ? x.IsIntermodal.toString() : 2;
this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal?x.IsReturnIntermodal.toString():''; this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal ? x.IsReturnIntermodal.toString() : '';
this.addMsg.ChirdNum = x.ChirdNum.toString(); this.addMsg.ChirdNum = x.ChirdNum.toString();
this.addMsg.ChirdNeedBedNum = 0; this.addMsg.ChirdNeedBedNum = 0;
this.addMsg.ChirdNoNeedBedNum = 0; this.addMsg.ChirdNoNeedBedNum = 0;
...@@ -3383,7 +3343,7 @@ ...@@ -3383,7 +3343,7 @@
this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString(); this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
this.addMsg.OrderForm = x.OrderForm this.addMsg.OrderForm = x.OrderForm
this.addMsg.allName = x.ContactName this.addMsg.allName = x.ContactName
if(x.IsChildrenTour){ if (x.IsChildrenTour) {
this.IsChildrenTour = this.addObj.IsSupportChildren = x.IsChildrenTour; this.IsChildrenTour = this.addObj.IsSupportChildren = x.IsChildrenTour;
} }
...@@ -3395,11 +3355,11 @@ ...@@ -3395,11 +3355,11 @@
this.Unit_Price = x.Unit_Price this.Unit_Price = x.Unit_Price
} else { } else {
this.HightUnitPrice = '2' this.HightUnitPrice = '2'
if(this.addObj&&this.addObj.SingleDMCPrice){ if (this.addObj && this.addObj.SingleDMCPrice) {
this.Unit_Price = this.addObj.SingleDMCPrice this.Unit_Price = this.addObj.SingleDMCPrice
} }
} }
if(res.data.data.modelPrice&&res.data.data.modelPrice.GoAddPrice){ if (res.data.data.modelPrice && res.data.data.modelPrice.GoAddPrice) {
this.stratPrice = res.data.data.modelPrice.GoAddPrice; this.stratPrice = res.data.data.modelPrice.GoAddPrice;
} }
...@@ -3409,7 +3369,7 @@ ...@@ -3409,7 +3369,7 @@
} else { } else {
this.stratPriceShow = true; this.stratPriceShow = true;
} }
if(res.data.data.modelPrice&&res.data.data.modelPrice.BackAddPrice){ if (res.data.data.modelPrice && res.data.data.modelPrice.BackAddPrice) {
this.returnPrice = res.data.data.modelPrice.BackAddPrice; this.returnPrice = res.data.data.modelPrice.BackAddPrice;
} }
...@@ -3430,10 +3390,10 @@ ...@@ -3430,10 +3390,10 @@
this.isShowLayer2 = true; this.isShowLayer2 = true;
} }
this.getNumber() this.getNumber()
if(x.GuestList.length>0){ if (x.GuestList.length > 0) {
let GuestList = JSON.parse(JSON.stringify(x.GuestList)) let GuestList = JSON.parse(JSON.stringify(x.GuestList))
this.addMsg.GuestList = [] this.addMsg.GuestList = []
GuestList.forEach((items)=>{ GuestList.forEach((items) => {
let Datas = { let Datas = {
SurName: items.SurName, SurName: items.SurName,
Name: items.Name, Name: items.Name,
...@@ -3441,7 +3401,7 @@ ...@@ -3441,7 +3401,7 @@
ESurName: items.ESurName, ESurName: items.ESurName,
EName: items.EName, EName: items.EName,
Birthday: items.Birthday, Birthday: items.Birthday,
Nationality: items.Nationality?items.Nationality:2, Nationality: items.Nationality ? items.Nationality : 2,
PassportNo: items.PassportNo, PassportNo: items.PassportNo,
Remarks: items.Remarks, Remarks: items.Remarks,
MobilePhone: items.MobilePhone, MobilePhone: items.MobilePhone,
...@@ -3451,7 +3411,7 @@ ...@@ -3451,7 +3411,7 @@
}) })
this.isGuest = 1 this.isGuest = 1
this.getNumGuest() this.getNumGuest()
}else{ } else {
this.addMsg.GuestList = [] this.addMsg.GuestList = []
this.isGuest = 0 this.isGuest = 0
this.getNumGuest() this.getNumGuest()
...@@ -3601,15 +3561,6 @@ ...@@ -3601,15 +3561,6 @@
}) })
.then(() => { .then(() => {
return return
this.isShowLayerRemarks = true;
this.isShowLayer = false;
this.isShowLayer2 = false;
this.$refs["addMsg"].resetFields();
this.clearMsg();
this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
}) })
.catch(() => { .catch(() => {
this.$message.info("已取消！"); this.$message.info("已取消！");
...@@ -3618,12 +3569,14 @@ ...@@ -3618,12 +3569,14 @@
this.isShowLayerRemarks = true; this.isShowLayerRemarks = true;
this.isShowLayer = false; this.isShowLayer = false;
this.isShowLayer2 = false; this.isShowLayer2 = false;
this.$refs["addMsg"].resetFields(); //this.$refs["addMsg"].resetFields();
this.clearMsg(); this.clearMsg();
this.remarksMsg.OrderId = obj.orderId; this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks; this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks; this.remarksMsg.OldRemarks = obj.remarks;
this.remarksMsg.UnionRemark = obj.unionRemark;
this.remarksMsg.IsIntermodal = obj.isIntermodal;
} }
//HK 新加 //HK 新加
...@@ -3770,7 +3723,7 @@ ...@@ -3770,7 +3723,7 @@
} }
} }
if (this.addMsg.GroupType != 5) { if (this.addMsg.GroupType != 5) {
if (this.addObj&&this.addObj.IsBirdDiscount && this.addObj.IsBirdDiscount == 1) { if (this.addObj && this.addObj.IsBirdDiscount && this.addObj.IsBirdDiscount == 1) {
//早鸟优惠 //早鸟优惠
//this.addMsg.Unit_Price //成交单价 //this.addMsg.Unit_Price //成交单价
//BabyPrice 婴儿价 //BabyPrice 婴儿价
...@@ -3965,7 +3918,7 @@ ...@@ -3965,7 +3918,7 @@
}, },
submitForm(addMsg) { submitForm(addMsg) {
//提交创建、修改表单 //提交创建、修改表单
if(this.TotalNumber==0){ if (this.TotalNumber == 0) {
this.$message.error('总人数不能小于1人') this.$message.error('总人数不能小于1人')
return return
} }
...@@ -4219,22 +4172,22 @@ ...@@ -4219,22 +4172,22 @@
err => {} err => {}
); );
}, },
getNumGuest(){ getNumGuest() {
let num = 0 let num = 0
if(this.addMsg.GuestList.length==0){ if (this.addMsg.GuestList.length == 0) {
for(let i = 0;i<this.TotalNumber;i++){ for (let i = 0; i < this.TotalNumber; i++) {
this.addMsg.GuestList.push(JSON.parse(JSON.stringify(this.GuestObj))) this.addMsg.GuestList.push(JSON.parse(JSON.stringify(this.GuestObj)))
} }
}else if(this.addMsg.GuestList.length<this.TotalNumber){ } else if (this.addMsg.GuestList.length < this.TotalNumber) {
num = this.TotalNumber-this.addMsg.GuestList.length num = this.TotalNumber - this.addMsg.GuestList.length
for(let i = 0;i<num;i++){ for (let i = 0; i < num; i++) {
this.addMsg.GuestList.push(JSON.parse(JSON.stringify(this.GuestObj))) this.addMsg.GuestList.push(JSON.parse(JSON.stringify(this.GuestObj)))
} }
}else if(this.addMsg.GuestList.length>this.TotalNumber){ } else if (this.addMsg.GuestList.length > this.TotalNumber) {
num = this.addMsg.GuestList.length-this.TotalNumber num = this.addMsg.GuestList.length - this.TotalNumber
for(let i = 0;i<num;i++){ for (let i = 0; i < num; i++) {
let x = this.addMsg.GuestList.length-1 let x = this.addMsg.GuestList.length - 1
this.addMsg.GuestList.splice(x,1) this.addMsg.GuestList.splice(x, 1)
// if(this.isGuest==0){ // if(this.isGuest==0){
// this.addMsg.GuestList.splice(i,1) // this.addMsg.GuestList.splice(i,1)
// }else{ // }else{
...@@ -4244,7 +4197,7 @@ ...@@ -4244,7 +4197,7 @@
} }
} }
}, },
Transformation(val, type,index) { Transformation(val, type, index) {
let text = this.pinyin(val, { let text = this.pinyin(val, {
style: this.pinyin.STYLE_NORMAL style: this.pinyin.STYLE_NORMAL
}); });
...@@ -4298,7 +4251,7 @@ ...@@ -4298,7 +4251,7 @@
let obj = this.khmdList.find( let obj = this.khmdList.find(
item => item.customerId == this.addMsg.CustomerId item => item.customerId == this.addMsg.CustomerId
); );
if(obj){ if (obj) {
this.customerId = obj.customerId; this.customerId = obj.customerId;
this.createByInfo = obj.createByInfo; this.createByInfo = obj.createByInfo;
this.addMsg.ContactName = obj.customerName + "(" + obj.contact + ")"; this.addMsg.ContactName = obj.customerName + "(" + obj.contact + ")";
...@@ -4432,6 +4385,7 @@ ...@@ -4432,6 +4385,7 @@
"sellorder_post_GetOneDayTCNUMOrderList", "sellorder_post_GetOneDayTCNUMOrderList",
this.tuanMsg, this.tuanMsg,
res => { res => {
console.log("res",res.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.loading = false; this.loading = false;
this.total = res.data.data.count; this.total = res.data.data.count;
...@@ -4439,7 +4393,8 @@ ...@@ -4439,7 +4393,8 @@
this.isUpdateOrder = res.data.data.pageData.isUpdateOrder this.isUpdateOrder = res.data.data.pageData.isUpdateOrder
this.IsUpdateOrderMoney = res.data.data.pageData.isUpdateOrderMoney this.IsUpdateOrderMoney = res.data.data.pageData.isUpdateOrderMoney
this.isUpdateOrderCommission = res.data.data.pageData.isUpdateOrderCommission this.isUpdateOrderCommission = res.data.data.pageData.isUpdateOrderCommission
this.cancelRtData = res.data.data.pageData.cancelRtData.length>0&&res.data.data.pageData.cancelRtData[0].list ? res.data.data.pageData.cancelRtData[0] this.cancelRtData = res.data.data.pageData.cancelRtData.length > 0 && res.data.data.pageData
.cancelRtData[0].list ? res.data.data.pageData.cancelRtData[0]
.list : ''; .list : '';
this.seat.YSeat = res.data.data.pageData.ySeatNum this.seat.YSeat = res.data.data.pageData.ySeatNum
this.seat.CSeat = res.data.data.pageData.eSeatNum this.seat.CSeat = res.data.data.pageData.eSeatNum
...@@ -4790,7 +4745,7 @@ ...@@ -4790,7 +4745,7 @@
this.getFylx(); this.getFylx();
this.getTuanInfo(); this.getTuanInfo();
this.canEditUnitPrice(); this.canEditUnitPrice();
this.getCountry()//国籍 this.getCountry() //国籍
} }
}; };
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ 25d8b4ff
...@@ -769,8 +769,7 @@ ...@@ -769,8 +769,7 @@
<template> <template>
<div class="flexOne groupts" style="min-width: 1200px;"> <div class="flexOne groupts" style="min-width: 1200px;">
<!-- 修改信息 --> <!-- 修改信息 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-if="isShowLayer" <div class="productQuerybottomLayer ownScrollbarStyle" v-if="isShowLayer" :style="{ height: ScreenHeight }">
:style="{ height: ScreenHeight }">
<p>{{$t('pub.updateMsg')}} <p>{{$t('pub.updateMsg')}}
<span class="fr"> <span class="fr">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmit()" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmit()" />
...@@ -1467,7 +1466,8 @@ ...@@ -1467,7 +1466,8 @@
<p style="min-width: 180px;">{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p> <p style="min-width: 180px;">{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
<p>{{$t('restaurant.res_oderTime')}}：{{item.createDate}}</p> <p>{{$t('restaurant.res_oderTime')}}：{{item.createDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p> <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='(item.commissionMoney&&item.commissionMoney>0)||(item.opcommission&&item.opcommission>0)' style="color:red"> <p v-if='(item.commissionMoney&&item.commissionMoney>0)||(item.opcommission&&item.opcommission>0)'
style="color:red">
<template v-if="item.commissionMoney&&item.commissionMoney>0"> <template v-if="item.commissionMoney&&item.commissionMoney>0">
<span style="float: left;">销售{{$t('salesModule.Commission')}}：</span> <span style="float: left;">销售{{$t('salesModule.Commission')}}：</span>
<commissionDialog :objNew="item" :OP="0"></commissionDialog> <commissionDialog :objNew="item" :OP="0"></commissionDialog>
...@@ -1911,7 +1911,9 @@ ...@@ -1911,7 +1911,9 @@
OldRemarks: '', OldRemarks: '',
Remarks: '', Remarks: '',
//1-可以修改，0-不能修改【默认可以修改】 //1-可以修改，0-不能修改【默认可以修改】
isOrder: '1' isOrder: '1',
UnionRemark: "", //新联运备注
IsIntermodal: 0, //是否联运
}, },
IsUnion: 2, IsUnion: 2,
IsChargeLossOrders: 0, IsChargeLossOrders: 0,
...@@ -2792,14 +2794,7 @@ ...@@ -2792,14 +2794,7 @@
}) })
.then(() => { .then(() => {
return return
this.isShowLayerRemarks = true
this.isShowLayer = false
this.$refs['addMsg'].resetFields()
this.clearMsg()
this.remarksMsg.OrderId = obj.orderId
this.remarksMsg.Remarks = obj.remarks
this.remarksMsg.OldRemarks = obj.remarks
this.remarksMsg.isOrder = obj.isOrder
}) })
.catch(() => { .catch(() => {
this.$message.info("已取消！"); this.$message.info("已取消！");
...@@ -2809,10 +2804,12 @@ ...@@ -2809,10 +2804,12 @@
this.isShowLayer = false this.isShowLayer = false
this.$refs['addMsg'].resetFields() this.$refs['addMsg'].resetFields()
this.clearMsg() this.clearMsg()
this.remarksMsg.OrderId = obj.orderId this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks this.remarksMsg.OldRemarks = obj.remarks;
this.remarksMsg.isOrder = obj.isOrder this.remarksMsg.isOrder = obj.isOrder;
this.remarksMsg.UnionRemark = obj.unionRemark;
this.remarksMsg.IsIntermodal = obj.isIntermodal;
} }
}, },
getDetail(obj) { getDetail(obj) {
...@@ -4089,9 +4086,9 @@ ...@@ -4089,9 +4086,9 @@
this.userId = this.getLocalStorage().EmployeeId this.userId = this.getLocalStorage().EmployeeId
if (this.$route.query.id) { if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id this.msg.tempOrderId = this.$route.query.id
}else if(this.$route.query.OrderId){ } else if (this.$route.query.OrderId) {
this.msg.tempOrderId = this.$route.query.OrderId this.msg.tempOrderId = this.$route.query.OrderId
}else if(this.$route.query.crmOrderObj){ } else if (this.$route.query.crmOrderObj) {
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj) let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.tempOrderId = crmOrderObj.OrderId this.msg.tempOrderId = crmOrderObj.OrderId
} }
......
src/components/orderCommon/order-remark.vue
View file @ 25d8b4ff
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</style> </style>
<!--订单备注--> <!--订单备注-->
<template> <template>
<div class="commonOrderRemarkForm" style="height:150px;"> <div class="commonOrderRemarkForm" style="height:250px;">
<p class="title"> <p class="title">
修改备注 修改备注
<span class="fr" v-if="postMsg.isOrder == 1" style="margin-right: 0px"> <span class="fr" v-if="postMsg.isOrder == 1" style="margin-right: 0px">
...@@ -47,6 +47,20 @@ ...@@ -47,6 +47,20 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20">
<el-col :span="3">
<el-form-item label="联运信息">
<el-checkbox v-model="postMsg.IsIntermodal" :true-label="1" :false-label="0">
</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="21">
<el-form-item label="联运备注">
<el-input v-model="postMsg.UnionRemark" type="textarea" maxlength="500">
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</div> </div>
</template> </template>
...@@ -64,9 +78,10 @@ ...@@ -64,9 +78,10 @@
}, },
postMsg: { postMsg: {
OrderId: "0", OrderId: "0",
OldRemarks: "",
Remarks: "", Remarks: "",
isOrder: 1, //1-可以修改，0-不能修改【默认可以修改】 isOrder: 1, //1-可以修改，0-不能修改【默认可以修改】
UnionRemark: "", //新联运备注
IsIntermodal: 0, //是否联运
}, },
}; };
}, },
...@@ -115,10 +130,12 @@ ...@@ -115,10 +130,12 @@
remarksMsg: { remarksMsg: {
immediate: true, immediate: true,
handler(newVal) { handler(newVal) {
console.log("remarksMsg", this.remarksMsg);
this.postMsg.OrderId = this.remarksMsg.OrderId; this.postMsg.OrderId = this.remarksMsg.OrderId;
this.postMsg.OldRemarks = this.remarksMsg.OldRemarks;
this.postMsg.Remarks = this.remarksMsg.Remarks; this.postMsg.Remarks = this.remarksMsg.Remarks;
this.postMsg.isOrder = this.remarksMsg.isOrder; this.postMsg.isOrder = this.remarksMsg.isOrder;
this.postMsg.UnionRemark = this.remarksMsg.UnionRemark;
this.postMsg.IsIntermodal = this.remarksMsg.IsIntermodal;
}, },
deep: true deep: true
}, },
......
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