Skip to content

S
SuperMan
Commit 3bd9cad3 authored by youjie's avatar youjie
Browse files
Options

no message

parent e90c7fdf
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 22 deletions
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ 3bd9cad3
...@@ -2748,6 +2748,7 @@ ...@@ -2748,6 +2748,7 @@
{Name:'男',Id:1}, {Name:'男',Id:1},
{Name:'女',Id:2}, {Name:'女',Id:2},
], ],
TotalNumber: 0,
isGuest: 0 isGuest: 0
...@@ -3029,6 +3030,7 @@ ...@@ -3029,6 +3030,7 @@
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum)) Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
if (count < this.addMsg.SafeNum) { if (count < this.addMsg.SafeNum) {
this.addMsg.SafeNum = count this.addMsg.SafeNum = count
this.TotalNumber = count
this.$message.error('保险人数不能大于总人数') this.$message.error('保险人数不能大于总人数')
} }
}, },
...@@ -3686,7 +3688,12 @@ ...@@ -3686,7 +3688,12 @@
Number(this.addMsg.ChirdNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) + Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum); Number(this.addMsg.OldPeopleNum);
this.TotalNumber =
Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum);
var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum) + var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.BabyNum)) - Number(this.addMsg.BabyNum)) -
(Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum)); (Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum));
...@@ -3901,6 +3908,10 @@ ...@@ -3901,6 +3908,10 @@
}, },
submitForm(addMsg) { submitForm(addMsg) {
//提交创建、修改表单 //提交创建、修改表单
if(this.TotalNumber==0){
this.$message.error('总人数不能小于1人')
return
}
this.$refs[addMsg].validate(valid => { this.$refs[addMsg].validate(valid => {
if (valid) { if (valid) {
this.saveOrder(); this.saveOrder();
...@@ -4154,16 +4165,16 @@ ...@@ -4154,16 +4165,16 @@
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.addMsg.SafeNum;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.addMsg.SafeNum){ }else if(this.addMsg.GuestList.length<this.TotalNumber){
num = this.addMsg.SafeNum-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.addMsg.SafeNum){ }else if(this.addMsg.GuestList.length>this.TotalNumber){
num = this.addMsg.GuestList.length-this.addMsg.SafeNum 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)
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ 3bd9cad3
...@@ -2388,6 +2388,7 @@ ...@@ -2388,6 +2388,7 @@
{Name:'男',Id:1}, {Name:'男',Id:1},
{Name:'女',Id:2}, {Name:'女',Id:2},
], ],
TotalNumber: 0,
isGuest: 0, isGuest: 0,
} }
}, },
...@@ -2573,6 +2574,7 @@ ...@@ -2573,6 +2574,7 @@
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum)) Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
if (count < this.addMsg.SafeNum) { if (count < this.addMsg.SafeNum) {
this.addMsg.SafeNum = count this.addMsg.SafeNum = count
this.TotalNumber = count
this.$message.error('保险人数不能大于总人数') this.$message.error('保险人数不能大于总人数')
} }
}, },
...@@ -3289,7 +3291,12 @@ ...@@ -3289,7 +3291,12 @@
Number(this.addMsg.ChirdNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) + Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum) Number(this.addMsg.OldPeopleNum)
this.TotalNumber =
Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum)
var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)+ Number(this.addMsg.BabyNum) ) - var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)+ Number(this.addMsg.BabyNum) ) -
(Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum)); (Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum));
this.addMsg.YSeatNum = SeatNum < 0 ? 0 : SeatNum; this.addMsg.YSeatNum = SeatNum < 0 ? 0 : SeatNum;
...@@ -3504,6 +3511,10 @@ ...@@ -3504,6 +3511,10 @@
}, },
submitForm(addMsg) { submitForm(addMsg) {
//提交创建、修改表单 //提交创建、修改表单
if(this.TotalNumber==0){
this.$message.error('总人数不能小于1人')
return
}
this.$refs[addMsg].validate(valid => { this.$refs[addMsg].validate(valid => {
if (valid) { if (valid) {
this.saveOrder() this.saveOrder()
...@@ -3723,16 +3734,16 @@ ...@@ -3723,16 +3734,16 @@
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.addMsg.SafeNum;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.addMsg.SafeNum){ }else if(this.addMsg.GuestList.length<this.TotalNumber){
num = this.addMsg.SafeNum-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.addMsg.SafeNum){ }else if(this.addMsg.GuestList.length>this.TotalNumber){
num = this.addMsg.GuestList.length-this.addMsg.SafeNum 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)
......
src/components/SalesModule/productQueryOne.vue
View file @ 3bd9cad3
...@@ -1250,7 +1250,8 @@ ...@@ -1250,7 +1250,8 @@
optionsList: [ optionsList: [
{Name:'男',Id:1}, {Name:'男',Id:1},
{Name:'女',Id:2}, {Name:'女',Id:2},
] ],
TotalNumber: 0
} }
}, },
components: { components: {
...@@ -1371,6 +1372,7 @@ ...@@ -1371,6 +1372,7 @@
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum)) Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
if (count < this.addMsg.SafeNum) { if (count < this.addMsg.SafeNum) {
this.addMsg.SafeNum = count this.addMsg.SafeNum = count
this.TotalNumber = count
this.$message.error('保险人数不能大于总人数') this.$message.error('保险人数不能大于总人数')
this.getNumGuest() this.getNumGuest()
} }
...@@ -1815,6 +1817,8 @@ ...@@ -1815,6 +1817,8 @@
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum)) Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)+ Number(this.addMsg.BabyNum))- var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)+ Number(this.addMsg.BabyNum))-
(Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum)); (Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
this.TotalNumber = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
this.addMsg.YSeatNum = SeatNum<0?0:SeatNum; this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
this.autoRemarks("VisaNum", "不要签证数量") this.autoRemarks("VisaNum", "不要签证数量")
}, },
...@@ -1933,6 +1937,10 @@ ...@@ -1933,6 +1937,10 @@
this.autoRemarks("TripleRoomNum", "三人房"); this.autoRemarks("TripleRoomNum", "三人房");
}, },
submitForm(addMsg) { //提交创建、修改表单 submitForm(addMsg) { //提交创建、修改表单
if(this.TotalNumber==0){
this.$message.error('总人数不能小于1人')
return
}
this.$refs[addMsg].validate((valid) => { this.$refs[addMsg].validate((valid) => {
if (valid) { if (valid) {
this.saveOrder() this.saveOrder()
...@@ -2073,16 +2081,16 @@ ...@@ -2073,16 +2081,16 @@
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.addMsg.SafeNum;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.addMsg.SafeNum){ }else if(this.addMsg.GuestList.length<this.TotalNumber){
num = this.addMsg.SafeNum-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.addMsg.SafeNum){ }else if(this.addMsg.GuestList.length>this.TotalNumber){
num = this.addMsg.GuestList.length-this.addMsg.SafeNum 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)
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 3bd9cad3
...@@ -1147,7 +1147,7 @@ ...@@ -1147,7 +1147,7 @@
"></el-input> "></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('salesModule.OldPeopleNum')" prop="OldPeopleNum"> <el-form-item :label="$t('salesModule.OldPeopleNum')" prop="OldPeopleNum">
<el-input v-model="addMsg.OldPeopleNum" @keyup.native="checkInteger(addMsg, 'OldPeopleNum')" @input=" <el-input v-model="addMsg.OldPeopleNum" @keyup.native="checkInteger(addMsg, 'OldPeopleNum')" @input="
getNumber(); getNumber();
...@@ -1155,7 +1155,7 @@ ...@@ -1155,7 +1155,7 @@
getTotalPrice(); getTotalPrice();
"></el-input> "></el-input>
</el-form-item> </el-form-item>
</el-col> --> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
...@@ -1470,7 +1470,7 @@ ...@@ -1470,7 +1470,7 @@
"></el-input> "></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('salesModule.OldPeopleNum')" prop="OldPeopleNum" v-show="addMsg.GroupType !== '4'"> <el-form-item :label="$t('salesModule.OldPeopleNum')" prop="OldPeopleNum" v-show="addMsg.GroupType !== '4'">
<el-input v-model="addMsg.OldPeopleNum" @keyup.native="checkInteger(addMsg, 'OldPeopleNum')" @input=" <el-input v-model="addMsg.OldPeopleNum" @keyup.native="checkInteger(addMsg, 'OldPeopleNum')" @input="
getNumber(); getNumber();
...@@ -1478,7 +1478,7 @@ ...@@ -1478,7 +1478,7 @@
getTotalPrice(); getTotalPrice();
"></el-input> "></el-input>
</el-form-item> </el-form-item>
</el-col> --> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
......
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