Skip to content

S
SuperMan
Commit 9295e91c authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 64da7488 8d74b499
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 86 deletions
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 9295e91c
...@@ -4362,45 +4362,47 @@ ...@@ -4362,45 +4362,47 @@
this.addMsg.CommissionShareMoney = "0"; this.addMsg.CommissionShareMoney = "0";
}, },
saveOrder() { saveOrder() {
//验证人数和机位数 //验证人数和机位数 20190807 修改 如果是不是单地接才判断
if ( if (this.addMsg.GroupType !== '4') {
Number(this.addMsg.ManNum) + if (
Number(this.addMsg.ChirdNum) + Number(this.addMsg.ManNum) +
Number(this.addMsg.OldPeopleNum) != Number(this.addMsg.ChirdNum) +
Number(this.addMsg.YSeatNum) + Number(this.addMsg.OldPeopleNum) !=
Number(this.addMsg.ESeatNum) + Number(this.addMsg.YSeatNum) +
Number(this.addMsg.FSeatNum) Number(this.addMsg.ESeatNum) +
) { Number(this.addMsg.FSeatNum)
if (this.IsChargeLossOrders == 1) { ) {
if (this.IsChargeLossOrders == 1) {
} else { } else {
this.$message.warning("人数和机位数不相等！"); this.$message.warning("人数和机位数不相等！");
return;
}
}
if (
Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.BabyNum) <
Number(this.addMsg.VisaNum)
) {
this.$message.warning("签证数量不能大于人数总和！");
return; return;
} }
}
if (
Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.BabyNum) <
Number(this.addMsg.VisaNum)
) {
this.$message.warning("签证数量不能大于人数总和！");
return;
}
if ( if (
Number(this.addMsg.AirticketNum) + Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) + Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.BabyNum) < Number(this.addMsg.BabyNum) <
Number(this.addMsg.SafeNum) Number(this.addMsg.SafeNum)
) { ) {
this.$message.warning("保险数量不能大于人数总和！"); this.$message.warning("保险数量不能大于人数总和！");
return; return;
} }
}
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) { if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning("儿童占床不能大于儿童数！"); this.$message.warning("儿童占床不能大于儿童数！");
......
src/components/SalesModule/productQuery.vue
View file @ 9295e91c
...@@ -1936,24 +1936,26 @@ ...@@ -1936,24 +1936,26 @@
return; return;
} }
} }
//验证人数和机位数 //验证人数和机位数 20190807 修改 如果是不是单地接才判断
if ((Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) != Number( alert(this.addMsg.GroupType)
if (this.addMsg.GroupType !== '4') {
if ((Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) != Number(
this.addMsg.YSeatNum) + Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum)) { this.addMsg.YSeatNum) + Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum)) {
this.$message.warning('人数和机位数不相等！') this.$message.warning('人数和机位数不相等！')
return return
} }
if ((Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this if ((Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this
.addMsg.OldPeopleNum) + Number(this.addMsg.BabyNum)) < Number(this.addMsg.VisaNum)) { .addMsg.OldPeopleNum) + Number(this.addMsg.BabyNum)) < Number(this.addMsg.VisaNum)) {
this.$message.warning('签证数量不能大于人数总和！') this.$message.warning('签证数量不能大于人数总和！')
return return
} }
if ((Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this
.addMsg.OldPeopleNum) + Number(this.addMsg.BabyNum)) < Number(this.addMsg.SafeNum)) {
this.$message.warning('保险数量不能大于人数总和！')
return
}
if ((Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this
.addMsg.OldPeopleNum) + Number(this.addMsg.BabyNum)) < Number(this.addMsg.SafeNum)) {
this.$message.warning('保险数量不能大于人数总和！')
return
}
}
// if((Number(this.addMsg.ManNum)+Number(this.addMsg.ChirdNoNeedBedNum)+Number(this.addMsg.ChirdNeedBedNum)+Number(this.addMsg.OldPeopleNum)) // if((Number(this.addMsg.ManNum)+Number(this.addMsg.ChirdNoNeedBedNum)+Number(this.addMsg.ChirdNeedBedNum)+Number(this.addMsg.OldPeopleNum))
// <(Number(this.addMsg.YSeatNum)+Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum))) // <(Number(this.addMsg.YSeatNum)+Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum)))
// { // {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 9295e91c
...@@ -2795,6 +2795,22 @@ ...@@ -2795,6 +2795,22 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<el-dialog custom-class='w350' title="追加团款" :visible.sync="zhuijiaShow" center>
<el-form label-width="110px">
<el-form-item label="追加团款金额：" class="w280">
<el-input placeholder="请输入" type="text" @keyup.native="checkPrice(zhuijiaMsg,'ChangePrice')"
v-model="zhuijiaMsg.ChangePrice">
</el-input>
</el-form-item>
<el-form-item label="备注：" class="w280">
<el-input placeholder="请输入" type="textarea" v-model="zhuijiaMsg.OP_Remarks"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitZhuiJiaTuanKuan">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" @click="zhuijiaShow=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<a id='RegistrationList_DownLoad' target="_blank" style="display:none">1不要删除</a> <a id='RegistrationList_DownLoad' target="_blank" style="display:none">1不要删除</a>
</div> </div>
</template> </template>
...@@ -3226,6 +3242,17 @@ ...@@ -3226,6 +3242,17 @@
commonShouSun: commonShouSun commonShouSun: commonShouSun
}, },
methods: { methods: {
// 20190807 新增追加团款 提交按钮
submitZhuiJiaTuanKuan(){
this.apipost('sellorder_get_SetOrderOPTotalPrice',msg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.date.message)
this.zhuijiaShow = false
} else {
this.$message.error(res.date.message)
}
}, err => {})
},
// 20190807 新增追加团款 // 20190807 新增追加团款
ZhuiJiaTuanKuan(orderID){ ZhuiJiaTuanKuan(orderID){
this.zhuijiaShow = true this.zhuijiaShow = true
...@@ -4289,45 +4316,47 @@ ...@@ -4289,45 +4316,47 @@
this.addMsg.CommissionShareMoney = "0"; this.addMsg.CommissionShareMoney = "0";
}, },
saveOrder() { saveOrder() {
//验证人数和机位数 //验证人数和机位数 20190807 修改 如果是不是单地接才判断
if ( if (this.addMsg.GroupType !== '4') {
Number(this.addMsg.ManNum) + if (
Number(this.addMsg.ChirdNum) + Number(this.addMsg.ManNum) +
Number(this.addMsg.OldPeopleNum) != Number(this.addMsg.ChirdNum) +
Number(this.addMsg.YSeatNum) + Number(this.addMsg.OldPeopleNum) !=
Number(this.addMsg.ESeatNum) + Number(this.addMsg.YSeatNum) +
Number(this.addMsg.FSeatNum) Number(this.addMsg.ESeatNum) +
) { Number(this.addMsg.FSeatNum)
if (this.IsChargeLossOrders == 1) { ) {
if (this.IsChargeLossOrders == 1) {
} else { } else {
this.$message.warning("人数和机位数不相等！"); this.$message.warning("人数和机位数不相等！");
return;
}
}
if (
Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.BabyNum) <
Number(this.addMsg.VisaNum)
) {
this.$message.warning("签证数量不能大于人数总和！");
return; return;
} }
}
if (
Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.BabyNum) <
Number(this.addMsg.VisaNum)
) {
this.$message.warning("签证数量不能大于人数总和！");
return;
}
if ( if (
Number(this.addMsg.AirticketNum) + Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) + Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.BabyNum) < Number(this.addMsg.BabyNum) <
Number(this.addMsg.SafeNum) Number(this.addMsg.SafeNum)
) { ) {
this.$message.warning("保险数量不能大于人数总和！"); this.$message.warning("保险数量不能大于人数总和！");
return; return;
} }
}
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) { if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning("儿童占床不能大于儿童数！"); this.$message.warning("儿童占床不能大于儿童数！");
......
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