Commit ecc06c58 authored by youjie's avatar youjie

no message

parent 831e2b4f
...@@ -362,10 +362,10 @@ ...@@ -362,10 +362,10 @@
obj.ReimburseList.VoucherPicList.length > 0 || child.StartPlace != '' || obj.ReimburseList.VoucherPicList.length > 0 || child.StartPlace != '' ||
child.EndPlace != '' || child.UserNum > 0 || child.UnitPrice > 0 || child.UserType) child.EndPlace != '' || child.UserNum > 0 || child.UnitPrice > 0 || child.UserType)
) { ) {
msg = `请选择[` + obj.UseTime + `]车辆币种`; msg = `请选择${obj.PlanDateStr}车辆币种`;
} }
if(msg == ''&&child.UnitPrice!=0&&child.UnitPrice!=null&&child.UnitPrice!=''&&!this.$utils.checkIsNum(child.UnitPrice)){ if(msg == ''&&child.UnitPrice!=0&&child.UnitPrice!=null&&child.UnitPrice!=''&&!this.$utils.checkIsNum(child.UnitPrice)){
msg = `请输入正确的车金额` msg = `请输入${obj.PlanDateStr}正确的车金额`
} }
// if (msg == '' && child.StartPlace == '' && // if (msg == '' && child.StartPlace == '' &&
// (obj.ReimburseList.SettlementType > 0 || obj.ReimburseList.Remarks != '' || // (obj.ReimburseList.SettlementType > 0 || obj.ReimburseList.Remarks != '' ||
...@@ -400,10 +400,10 @@ ...@@ -400,10 +400,10 @@
child.ReimburseList.VoucherPicList.length > 0 || grandson.UserNum > 0 || child.ReimburseList.VoucherPicList.length > 0 || grandson.UserNum > 0 ||
grandson.UnitPrice > 0 || grandson.UserType) grandson.UnitPrice > 0 || grandson.UserType)
) { ) {
msg = `请选择酒店币种` msg = `请选择${obj.UseTimeStr}酒店币种`
} }
if(msg == ''&&grandson.UnitPrice!=0&&grandson.UnitPrice!=null&&grandson.UnitPrice!=''&&!this.$utils.checkIsNum(grandson.UnitPrice)){ if(msg == ''&&grandson.UnitPrice!=0&&grandson.UnitPrice!=null&&grandson.UnitPrice!=''&&!this.$utils.checkIsNum(grandson.UnitPrice)){
msg = `请输入正确的酒店金额` msg = `请输入${obj.UseTimeStr}正确的酒店金额`
} }
} }
} }
...@@ -425,10 +425,10 @@ ...@@ -425,10 +425,10 @@
child.ReimburseList.VoucherPicList.length > 0 || grandson.UserNum > 0 || child.ReimburseList.VoucherPicList.length > 0 || grandson.UserNum > 0 ||
grandson.UnitPrice > 0 || grandson.UserType) grandson.UnitPrice > 0 || grandson.UserType)
) { ) {
msg = `请选择餐币种` msg = `请选择${obj.UseTimeStr}餐币种`
} }
if(msg == ''&&grandson.UnitPrice!=0&&grandson.UnitPrice!=null&&grandson.UnitPrice!=''&&!this.$utils.checkIsNum(grandson.UnitPrice)){ if(msg == ''&&grandson.UnitPrice!=0&&grandson.UnitPrice!=null&&grandson.UnitPrice!=''&&!this.$utils.checkIsNum(grandson.UnitPrice)){
msg = `请输入正确的餐金额` msg = `请输入${obj.UseTimeStr}正确的餐金额`
} }
} }
} }
...@@ -450,10 +450,10 @@ ...@@ -450,10 +450,10 @@
child.ReimburseList.VoucherPicList.length > 0 || grandson.UserNum > 0 || child.ReimburseList.VoucherPicList.length > 0 || grandson.UserNum > 0 ||
grandson.UnitPrice > 0 || grandson.UserType) grandson.UnitPrice > 0 || grandson.UserType)
) { ) {
msg = `请选择门票币种` msg = `请选择${obj.UseTimeStr}门票币种`
} }
if(msg == ''&&grandson.UnitPrice!=0&&grandson.UnitPrice!=null&&grandson.UnitPrice!=''&&!this.$utils.checkIsNum(grandson.UnitPrice)){ if(msg == ''&&grandson.UnitPrice!=0&&grandson.UnitPrice!=null&&grandson.UnitPrice!=''&&!this.$utils.checkIsNum(grandson.UnitPrice)){
msg = `请输入正确的门票金额` msg = `请输入${obj.UseTimeStr}正确的门票金额`
} }
} }
} }
...@@ -469,25 +469,25 @@ ...@@ -469,25 +469,25 @@
(obj.UnitPrice > 0 || obj.Rebate > 0 || obj.VoucherPicList.length > 0 || (obj.UnitPrice > 0 || obj.Rebate > 0 || obj.VoucherPicList.length > 0 ||
obj.Remark != '' || obj.Currency != 0) obj.Remark != '' || obj.Currency != 0)
) { ) {
msg = `请选择其他费用使用时间` msg = `请选择第【${i+1}条的】其他费用使用时间`
} }
if (msg == '' && obj.CostProjectStr == '' && if (msg == '' && obj.CostProjectStr == '' &&
(obj.UnitPrice > 0 || obj.Rebate > 0 || obj.VoucherPicList.length > 0 || (obj.UnitPrice > 0 || obj.Rebate > 0 || obj.VoucherPicList.length > 0 ||
obj.Remark != '' || obj.Currency || obj.UseDate != null) obj.Remark != '' || obj.Currency || obj.UseDate != null)
) { ) {
msg = `请选择其他费用费用项目` msg = `请选择第【${i+1}条的】其他费用费用项目`
} }
if (msg == '' && (obj.Currency == 0 || obj.Currency == null) && if (msg == '' && (obj.Currency == 0 || obj.Currency == null) &&
(obj.UnitPrice > 0 || obj.Rebate > 0 || obj.VoucherPicList.length > 0 || (obj.UnitPrice > 0 || obj.Rebate > 0 || obj.VoucherPicList.length > 0 ||
obj.Remark != '' || obj.UseDate != null) obj.Remark != '' || obj.UseDate != null)
) { ) {
msg = `请选择其他费用币种` msg = `请选择第【${i+1}条的】其他费用币种`
} }
if(msg == ''&&obj.UnitPrice!=0&&obj.UnitPrice!=null&&obj.UnitPrice!=''&&!this.$utils.checkIsNum(obj.UnitPrice)){ if(msg == ''&&obj.UnitPrice!=0&&obj.UnitPrice!=null&&obj.UnitPrice!=''&&!this.$utils.checkIsNum(obj.UnitPrice)){
msg = `请输入正确的其他费用金额` msg = `请输入第【${i+1}条的】正确的其他费用金额`
} }
if(msg == ''&&obj.Rebate!=0&&obj.Rebate!=null&&obj.Rebate!=''&&!this.$utils.checkIsNum(obj.Rebate)){ if(msg == ''&&obj.Rebate!=0&&obj.Rebate!=null&&obj.Rebate!=''&&!this.$utils.checkIsNum(obj.Rebate)){
msg = `请输入正确的其他费用返佣金额` msg = `请输入第【${i+1}条的】正确的其他费用返佣金额`
} }
} }
...@@ -501,16 +501,16 @@ ...@@ -501,16 +501,16 @@
(obj.UnitPrice > 0 || obj.VoucherPicList.length > 0 || (obj.UnitPrice > 0 || obj.VoucherPicList.length > 0 ||
obj.Remark != '' || obj.Currency) obj.Remark != '' || obj.Currency)
) { ) {
msg = `请选择自费收入使用时间` msg = `请选择第【${i+1}条的】自费收入使用时间`
} }
if (msg == '' && (obj.Currency == 0 || obj.Currency == null) && if (msg == '' && (obj.Currency == 0 || obj.Currency == null) &&
(obj.UnitPrice > 0 || obj.VoucherPicList.length > 0 || (obj.UnitPrice > 0 || obj.VoucherPicList.length > 0 ||
obj.Remark != '' || obj.UseDate != null) obj.Remark != '' || obj.UseDate != null)
) { ) {
msg = `请选择自费收入币种` msg = `请选择第【${i+1}条的】自费收入币种`
} }
if(msg == ''&&obj.UnitPrice!=0&&obj.UnitPrice!=null&&obj.UnitPrice!=''&&!this.$utils.checkIsNum(obj.UnitPrice)){ if(msg == ''&&obj.UnitPrice!=0&&obj.UnitPrice!=null&&obj.UnitPrice!=''&&!this.$utils.checkIsNum(obj.UnitPrice)){
msg = `请输入正确的自费收入金额` msg = `请输入第【${i+1}条的】正确的自费收入金额`
} }
} }
...@@ -524,13 +524,13 @@ ...@@ -524,13 +524,13 @@
(obj.UnitPrice > 0 || obj.Rebate > 0 || obj.VoucherPicList.length > 0 || (obj.UnitPrice > 0 || obj.Rebate > 0 || obj.VoucherPicList.length > 0 ||
obj.Remark != '') obj.Remark != '')
) { ) {
msg = `请选择自费支出使用时间` msg = `请选择第【${i+1}条的】自费支出使用时间`
} }
if(msg == ''&&obj.UnitPrice!=0&&!this.$utils.checkIsNum(obj.UnitPrice)){ if(msg == ''&&obj.UnitPrice!=0&&!this.$utils.checkIsNum(obj.UnitPrice)){
msg = `请输入正确的自费支出金额` msg = `请输入第【${i+1}条的】正确的自费支出金额`
} }
if(msg == ''&&obj.Rebate!=0&&obj.Rebate!=null&&obj.Rebate!=''&&!this.$utils.checkIsNum(obj.Rebate)){ if(msg == ''&&obj.Rebate!=0&&obj.Rebate!=null&&obj.Rebate!=''&&!this.$utils.checkIsNum(obj.Rebate)){
msg = `请输入正确的自费支出返佣金额` msg = `请输入第【${i+1}条的】正确的自费支出返佣金额`
} }
} }
return msg return msg
...@@ -543,28 +543,28 @@ ...@@ -543,28 +543,28 @@
(obj.ShopMoney > 0 || obj.ShopId != null || obj.VoucherPicList.length > 0 || (obj.ShopMoney > 0 || obj.ShopId != null || obj.VoucherPicList.length > 0 ||
obj.Remark != null || obj.CurrencyId) obj.Remark != null || obj.CurrencyId)
) { ) {
msg = `请选择购物报账进店时间` msg = `请选择第【${i+1}条的】购物报账进店时间`
} }
if (msg == '' && obj.ShopId == null && if (msg == '' && obj.ShopId == null &&
(obj.ShopMoney > 0 || obj.CurrencyId || obj.VoucherPicList.length > 0 || (obj.ShopMoney > 0 || obj.CurrencyId || obj.VoucherPicList.length > 0 ||
obj.Remark != null || obj.EnterTime != null)&&this.params.IsSelectShop obj.Remark != null || obj.EnterTime != null)&&this.params.IsSelectShop
) { ) {
msg = `请选择购物名称` msg = `请选择第【${i+1}条的】购物名称`
} }
if (msg == '' && obj.ShopName == null && if (msg == '' && obj.ShopName == null &&
(obj.ShopMoney > 0 || obj.CurrencyId || obj.VoucherPicList.length > 0 || (obj.ShopMoney > 0 || obj.CurrencyId || obj.VoucherPicList.length > 0 ||
obj.Remark != null || obj.EnterTime != null)&&!this.params.IsSelectShop obj.Remark != null || obj.EnterTime != null)&&!this.params.IsSelectShop
) { ) {
msg = `请输入购物名称` msg = `请输入第【${i+1}条的】购物名称`
} }
if (msg == '' && (obj.CurrencyId == 0 || obj.CurrencyId == null) && if (msg == '' && (obj.CurrencyId == 0 || obj.CurrencyId == null) &&
(obj.ShopMoney > 0 || obj.ShopId != null || obj.VoucherPicList.length > 0 || (obj.ShopMoney > 0 || obj.ShopId != null || obj.VoucherPicList.length > 0 ||
obj.Remark != null || obj.EnterTime != null) obj.Remark != null || obj.EnterTime != null)
) { ) {
msg = `请选择购物报账币种` msg = `请选择第【${i+1}条的】购物报账币种`
} }
if(msg == ''&&obj.ShopMoney!=0&&obj.ShopMoney!=null&&!this.$utils.checkIsNum(obj.ShopMoney)){ if(msg == ''&&obj.ShopMoney!=0&&obj.ShopMoney!=null&&!this.$utils.checkIsNum(obj.ShopMoney)){
msg = `请输入正确的购物金额` msg = `请输入第【${i+1}条的】正确的购物金额`
} }
} }
return msg return msg
...@@ -599,7 +599,9 @@ ...@@ -599,7 +599,9 @@
icon: 'success', icon: 'success',
duration: 2000 duration: 2000
}); });
this.init() setTimeout(() => {
this.init()
}, 2000);
} }
uni.hideLoading() uni.hideLoading()
}, (failed) => { }, (failed) => {
......
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