Commit 9293ba0e authored by 吴春's avatar 吴春

提交行李数量

parent 1de644fb
...@@ -953,6 +953,7 @@ ...@@ -953,6 +953,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
&nbsp; &nbsp;
</el-col> </el-col>
...@@ -1220,6 +1221,11 @@ ...@@ -1220,6 +1221,11 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="4" >
<el-form-item label="行李数量" prop="LuggageNum">
<el-input v-model="addMsg.LuggageNum"></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="所属平台" prop="BrandId" v-show="addMsg.ClientSource==1"> <el-form-item label="所属平台" prop="BrandId" v-show="addMsg.ClientSource==1">
...@@ -1757,6 +1763,7 @@ ...@@ -1757,6 +1763,7 @@
<span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span> <span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
</span> </span>
<span style="display: block">房间信息:{{item.orderGuestHouseStr}}</span> <span style="display: block">房间信息:{{item.orderGuestHouseStr}}</span>
<p>行李数量:{{item.luggageNum}}</p>
<span v-if="item.tipMoney" style="color:red">(小费:{{item.tipMoney}})</span> <span v-if="item.tipMoney" style="color:red">(小费:{{item.tipMoney}})</span>
</td> </td>
</tr> </tr>
...@@ -2423,7 +2430,8 @@ ...@@ -2423,7 +2430,8 @@
CommissionSharePeople: "-1", CommissionSharePeople: "-1",
CommissionShareMoney: "0", CommissionShareMoney: "0",
GuestList: [], GuestList: [],
GatherAddress: "" GatherAddress: "",
LuggageNum:'',
}, },
GuestList: [{ GuestList: [{
SurName: '', SurName: '',
...@@ -2470,6 +2478,11 @@ ...@@ -2470,6 +2478,11 @@
message: "请选择出发城市", message: "请选择出发城市",
trigger: "change" trigger: "change"
}], }],
LuggageNum: [{
required: true,
message: '请输入行李数量',
trigger: 'blur'
}],
ReturnArriveCityId: [{ ReturnArriveCityId: [{
required: true, required: true,
message: "请选择返回城市", message: "请选择返回城市",
......
...@@ -969,7 +969,11 @@ ...@@ -969,7 +969,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" >
<el-form-item label="行李数量" prop="LuggageNum">
<el-input v-model="addMsg.LuggageNum"></el-input>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('salesModule.SSPT')" prop="BrandId" v-show="addMsg.ClientSource==1"> <el-form-item :label="$t('salesModule.SSPT')" prop="BrandId" v-show="addMsg.ClientSource==1">
<el-select v-model='addMsg.BrandId' :disabled="false" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model='addMsg.BrandId' :disabled="false" filterable :placeholder="$t('pub.pleaseSel')">
...@@ -1680,12 +1684,14 @@ ...@@ -1680,12 +1684,14 @@
</tr> </tr>
<tr style="height:20px"> <tr style="height:20px">
<td colspan="16" class="RL_Order" style="height:20px"> <td colspan="16" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle" v-if="item.guestList.length>0">{{$t('salesModule.MD')}}:</span> <span class="RL-remarkTitle" v-if="item.guestList.length>0">{{$t('salesModule.MD')}}:</span>
<span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0"> <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0">
<span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span> <span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
</span> </span>
<span style="display: block">{{$t('salesModule.RoomInfo')}}:{{item.orderGuestHouseStr}}</span> <span style="display: block">{{$t('salesModule.RoomInfo')}}:{{item.orderGuestHouseStr}}</span>
<p >行李数量:{{item.luggageNum}}</p>
<span v-if="item.tipMoney" style="color:red">({{$t('fnc.xiaofei')}}:{{item.tipMoney}})</span> <span v-if="item.tipMoney" style="color:red">({{$t('fnc.xiaofei')}}:{{item.tipMoney}})</span>
<div v-if="item.otherContractList"> <div v-if="item.otherContractList">
<span class="GO_Contract" style="color:blue;cursor:pointer;" @click="goSingleContract(item)"> <span class="GO_Contract" style="color:blue;cursor:pointer;" @click="goSingleContract(item)">
...@@ -1978,7 +1984,8 @@ ...@@ -1978,7 +1984,8 @@
CommissionSharePeople: '-1', CommissionSharePeople: '-1',
CommissionShareMoney: '0', CommissionShareMoney: '0',
GuestList: [], GuestList: [],
GatherAddress: "" GatherAddress: "",
LuggageNum:'',
}, },
GuestList: [{ GuestList: [{
...@@ -2081,6 +2088,11 @@ ...@@ -2081,6 +2088,11 @@
message: '请选择国籍', message: '请选择国籍',
trigger: 'change' trigger: 'change'
}, ], }, ],
LuggageNum: [{
required: true,
message: '请输入行李数量',
trigger: 'blur'
}],
PassportNo: [{ PassportNo: [{
required: true, required: true,
message: '请输入护照号', message: '请输入护照号',
......
...@@ -491,6 +491,7 @@ ...@@ -491,6 +491,7 @@
GatherAddress: '', GatherAddress: '',
LureEmpId: 0, //引流id LureEmpId: 0, //引流id
CRMGuestId: 0, //客人ID CRMGuestId: 0, //客人ID
LuggageNum:''//行李数量
}, },
GuestList: [{ GuestList: [{
SurName: '', SurName: '',
...@@ -598,6 +599,11 @@ ...@@ -598,6 +599,11 @@
message: '请输入护照号', message: '请输入护照号',
trigger: 'blur' trigger: 'blur'
}, ], }, ],
LuggageNum: [{
required: true,
message: '请输入行李数量',
trigger: 'blur'
}],
MobilePhone: [{ MobilePhone: [{
required: true, required: true,
message: '请输入联系人电话', message: '请输入联系人电话',
...@@ -1456,6 +1462,7 @@ ...@@ -1456,6 +1462,7 @@
this.addMsg.TripleRoomNum = '0' this.addMsg.TripleRoomNum = '0'
this.addMsg.TradeDate = '' this.addMsg.TradeDate = ''
this.addMsg.CostType = '' this.addMsg.CostType = ''
this.addMsg.LuggageNum=''
this.addMsg.PlatformOrder = '' this.addMsg.PlatformOrder = ''
this.ddlyList = [] this.ddlyList = []
this.addMsg.Remarks = '' this.addMsg.Remarks = ''
......
...@@ -1252,6 +1252,9 @@ ...@@ -1252,6 +1252,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-col>
<el-col :span="4" v-if="addMsg.TradeWay == 1"> <el-col :span="4" v-if="addMsg.TradeWay == 1">
<el-form-item :label="$t('salesModule.PlatOrder')" prop="PlatformOrder"> <el-form-item :label="$t('salesModule.PlatOrder')" prop="PlatformOrder">
<el-input v-model="addMsg.PlatformOrder" @input="platformOrderMethods" :disabled="isAllowUpdate == 0"> <el-input v-model="addMsg.PlatformOrder" @input="platformOrderMethods" :disabled="isAllowUpdate == 0">
...@@ -1658,6 +1661,11 @@ ...@@ -1658,6 +1661,11 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="4" >
<el-form-item label="行李数量" v-if="addMsg.IsOneDay==1" prop="LuggageNum">
<el-input v-model="addMsg.LuggageNum"></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('salesModule.SSPT')" prop="BrandId" <el-form-item :label="$t('salesModule.SSPT')" prop="BrandId"
...@@ -2677,7 +2685,7 @@ ...@@ -2677,7 +2685,7 @@
<span v-for="subItem in childItem.CancelGuestList">{{ subItem.userName }}<span <span v-for="subItem in childItem.CancelGuestList">{{ subItem.userName }}<span
style="color:#f56c6c">{{subItem.VisaType==1?'(个签)':''}}</span> &nbsp;&nbsp;</span> style="color:#f56c6c">{{subItem.VisaType==1?'(个签)':''}}</span> &nbsp;&nbsp;</span>
</span> </span>
</p> </p >
<span style="display: block"> <span style="display: block">
{{ $t("salesModule.RoomInfo") {{ $t("salesModule.RoomInfo")
}}<span v-if="childItem.OneSex > 0" }}<span v-if="childItem.OneSex > 0"
...@@ -2704,6 +2712,8 @@ ...@@ -2704,6 +2712,8 @@
style="color: #f56c6c; margin-left: 20px; cursor: pointer">{{ $t("ground.tuiJingdian") }}</span> style="color: #f56c6c; margin-left: 20px; cursor: pointer">{{ $t("ground.tuiJingdian") }}</span>
</el-popover> </el-popover>
</span> </span>
<p v-if="childItem.IsOneDay==1">行李数量:{{childItem.LuggageNum}}</p>
<div> <div>
<span v-if=" <span v-if="
childItem.OPTipMoney == '' && childItem.TipMoney != '' childItem.OPTipMoney == '' && childItem.TipMoney != ''
...@@ -4055,6 +4065,8 @@ ...@@ -4055,6 +4065,8 @@
RefuseVisaNum: 0, //拒签人数 RefuseVisaNum: 0, //拒签人数
OneSex: "", OneSex: "",
QuotationUrl: "", //单团附件 QuotationUrl: "", //单团附件
LuggageNum:"",
IsOneDay:0,
}, },
uploadLloading: false, uploadLloading: false,
fileFujianList: [], fileFujianList: [],
...@@ -4114,6 +4126,11 @@ ...@@ -4114,6 +4126,11 @@
message: "请输入联系人姓名", message: "请输入联系人姓名",
trigger: "blur", trigger: "blur",
}, ], }, ],
LuggageNum: [{
required: true,
message: '请输入行李数量',
trigger: 'blur'
}],
ContactMobile: [{ ContactMobile: [{
required: true, required: true,
message: "请输入联系人电话", message: "请输入联系人电话",
...@@ -4152,6 +4169,7 @@ ...@@ -4152,6 +4169,7 @@
trigger: "blur", trigger: "blur",
}, ], }, ],
}, },
RemarksRules: { RemarksRules: {
Remarks: [{ Remarks: [{
required: true, required: true,
...@@ -5722,6 +5740,7 @@ ...@@ -5722,6 +5740,7 @@
this.ddlyList = []; this.ddlyList = [];
this.addMsg.Remarks = ""; this.addMsg.Remarks = "";
this.addMsg.MinOrderPrice = ""; this.addMsg.MinOrderPrice = "";
this.addMsg.LuggageNum = "";
this.addMsg.VisaNum = "0"; this.addMsg.VisaNum = "0";
this.addMsg.SafeNum = "0"; this.addMsg.SafeNum = "0";
this.addMsg.AirticketNum = "0"; this.addMsg.AirticketNum = "0";
......
...@@ -553,6 +553,15 @@ ...@@ -553,6 +553,15 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if="pagesTitle == '当地游产品'">
<!--联系人-->
<el-form-item label="行李数量" prop="LuggageNum">
<el-input v-model="addMsg.LuggageNum"></el-input>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<!--交易方式--> <!--交易方式-->
<el-form-item :label="$t('tips.jiaoyifangshi')" prop="TradeWay" <el-form-item :label="$t('tips.jiaoyifangshi')" prop="TradeWay"
...@@ -805,6 +814,7 @@ ...@@ -805,6 +814,7 @@
LureEmpId: 0, //引流id LureEmpId: 0, //引流id
CRMGuestId: 0, //客人ID CRMGuestId: 0, //客人ID
CouponAllotIds: '', CouponAllotIds: '',
LuggageNum:'',//行李数量
}, },
uploadLloading: false, uploadLloading: false,
rules: { rules: {
...@@ -883,6 +893,11 @@ ...@@ -883,6 +893,11 @@
message: "请输入护照号", message: "请输入护照号",
trigger: "blur", trigger: "blur",
}, ], }, ],
LuggageNum: [{
required: true,
message: '请输入行李数量',
trigger: 'blur'
}],
MobilePhone: [{ MobilePhone: [{
required: true, required: true,
message: "请输入联系人电话", message: "请输入联系人电话",
......
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