Skip to content

S
SuperMan
Commit ecf3eda3 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

1

parent b9d89687
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 60 deletions
src/components/FinancialModule/JumpReport.vue
View file @ ecf3eda3
......@@ -813,7 +813,7 @@ export default {
{field: 'StatusStr', title: '当前状态',width: 120, titleAlign: 'left',columnAlign:'left',isResize:true},
{field: 'custome-operation', title: '操作',width: 200, titleAlign: 'left',columnAlign:'left',componentName:'table-operation',isResize:true}
],
pageSize:6,
pageSize:5,
pageIndex:1,
heightQueryBox:false
}
......@@ -1270,7 +1270,7 @@ export default {
queryInfoInit(){ // 初始化msg
let msg = {
pageIndex:this.msg.pageIndex,
pageSize:6,
pageSize:5,
FrID:this.msg.FrID==0?'':this.msg.FrID,
sDate:this.msg.sDate,
eDate:this.msg.sDate,
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ ecf3eda3
......@@ -889,6 +889,9 @@ export default {
console.log(res)
this.shouxufei = res.data.data
}, err => {})
} else {
this.msg.OriginalFee = 0
this.msg.Fee = 0
}
},
clearAccBank(){ // 选择账户类型清空数据
......
src/components/SalesModule/addPassenger.vue
View file @ ecf3eda3
......@@ -898,53 +898,6 @@
this.access_token_ocr = res.data.access_token;
});
},
// commonTextDiscernIdCard(){
// this.loading=true
// let params= 'detect_direction=true&id_card_side=front&image='+encodeURIComponent(this.imgBase64String) //base64类型
// let url = this.BD_COMMON_TEXT_DISCERN_IDCARD + '?access_token=' + this.access_token_ocr;
// let that=this
// this.$http({
// method: 'post',
// url:'https://bird.ioliu.cn/v1?url='+url,
// data:params,
// headers:{
// 'Accept':'application/json',
// 'Content-Type':'application/x-www-form-urlencoded'
// }
// }).then(res=>{
// this.loading=false
// let obj=res.data.words_result
// this.addMsg.Nationality=2
// for(let key in obj){
// switch(key){
// case '姓名':
// this.addMsg.SurName=obj[key].words.substring(0,1)
// this.addMsg.Name=obj[key].words.substring(1,obj[key].words.length)
// this.Transformation(this.addMsg.SurName,'SurName')
// this.Transformation(this.addMsg.Name,'Name')
// break;
// case '公民身份号码':
// this.addMsg.IdCard=obj[key].words
// break;
// case '住址':
// this.addMsg.AddressDetail=obj[key].words
// break;
// case '性别':
// obj[key].words=='男'?this.addMsg.Sex='1':this.addMsg.Sex='2'
// break;
// case '出生':
// this.addMsg.Birthday=obj[key].words.substring(0,4)+'-'+obj[key].words.substring(4,6)+'-'+obj[key].words.substring(6,8)
// default:
// break;
// }
// }
// that.$forceUpdate()
// },err=>{
// this.loading=false
// })
//
// },
// 月份转换
getMonthWithEn: function (enMonth) {
enMonth = enMonth.toLowerCase();
......@@ -1882,6 +1835,7 @@
this.VisaStartStatus = this.addMsg.IsVisaFree;
this.AirStartStatus = this.addMsg.IsNeedAirticket;
this.SafeStartStatus = this.addMsg.IsNeedSafe;
this.zhanchuangTips(obj.Birthday)
this.$forceUpdate();
this.getHouselist(obj.Sex.toString(),obj.TCID,obj.OrderId,obj.IsBed)
if ( this.$route.query.isOneDay === 1) {
......
src/components/SalesModule/productQuery.vue
View file @ ecf3eda3
......@@ -975,8 +975,8 @@
TC_Price: '0',
ManNum: '0',
ChirdNum: '0',
ChirdNoNeedBedNum: '0',
ChirdNeedBedNum: '0',
ChirdNoNeedBedNum: '',
ChirdNeedBedNum: '',
BabyNum: '0',
OldPeopleNum: '0',
SingleRoomNum: '0',
......@@ -1187,8 +1187,8 @@
groupTypeChange: function (val) {
if (val === '4') {
this.addMsg.ManNum = 0
this.addMsg.ChirdNoNeedBedNum = 0
this.addMsg.ChirdNeedBedNum = 0
this.addMsg.ChirdNoNeedBedNum = ''
this.addMsg.ChirdNeedBedNum = ''
this.addMsg.BabyNum = 0
this.addMsg.OldPeopleNum = 0
this.addMsg.ManNum = 0
......@@ -1214,8 +1214,8 @@
// this.addMsg.ChirdNum = 0;
this.addMsg.BabyNum = 0;
this.addMsg.OldPeopleNum = 0;
this.addMsg.ChirdNoNeedBedNum = 0;
this.addMsg.ChirdNeedBedNum = 0;
this.addMsg.ChirdNoNeedBedNum = '';
this.addMsg.ChirdNeedBedNum = '';
this.addMsg.PreferPrice = 0;
this.addMsg.SafeNum = 0;
......@@ -1229,8 +1229,8 @@
// this.addMsg.ChirdNum = 0;
this.addMsg.BabyNum = 0;
this.addMsg.OldPeopleNum = 0;
this.addMsg.ChirdNoNeedBedNum = 0;
this.addMsg.ChirdNeedBedNum = 0;
this.addMsg.ChirdNoNeedBedNum = '';
this.addMsg.ChirdNeedBedNum = '';
this.addMsg.PreferPrice = 0;
this.addMsg.SafeNum = 0;
......@@ -1711,7 +1711,7 @@
},
getNumber() {
if (this.addMsg.GroupType == 4 && this.addMsg.ChirdNoNeedBedNum > this.addMsg.AirticketNum) {
this.addMsg.ChirdNoNeedBedNum = 0
this.addMsg.ChirdNoNeedBedNum = ''
this.$message.error('儿童不占床数不能大于单地接人数！')
this.$forceUpdate()
return
......@@ -1884,7 +1884,7 @@
this.addMsg.TC_Price = '0'
this.addMsg.ManNum = '0'
this.addMsg.ChirdNum = '0'
this.addMsg.ChirdNeedBedNum = '0'
this.addMsg.ChirdNeedBedNum = ''
this.addMsg.BabyNum = '0'
this.addMsg.OldPeopleNum = '0'
this.addMsg.SingleRoomNum = '0'
......@@ -1940,8 +1940,17 @@
return;
}
}
//验证人数和机位数 20190807 修改 如果是不是单地接才判断
if (this.addMsg.GroupType !== '4' && this.addMsg.GroupType !== '3') {
if (this.addMsg.ChirdNoNeedBedNum == '') {
this.$message.warning('请输入儿童不占床数！如果没有请输入0！')
return
}
if (this.addMsg.ChirdNeedBedNum == '') {
this.$message.warning('请输入儿童占床数！如果没有请输入0！')
return
}
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.$message.warning('人数和机位数不相等！')
......@@ -1967,6 +1976,7 @@
this.$message.warning('儿童占床不能大于儿童数！')
return
}
}
// 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)))
......@@ -1987,7 +1997,10 @@
if(this.addMsg.GroupType == 4){
this.addMsg.TC_Price = this.SingleDMCPricex;//地接时 本团单价
this.addMsg.Unit_Price = this.SingleDMCPrice; // 地接时 成交单价
if (this.addMsg.ChirdNoNeedBedNum == '') {
this.$message.warning('请输入儿童不占床数！如果没有请输入0！')
return
}
}
let ChirdNum = Number(this.addMsg.ChirdNum)
......
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