Commit f514862a authored by 黄奎's avatar 黄奎

Merge branch 'B2C' of http://gitlab.oytour.com/zk123/jz_travel into B2C

parents 30a86de8 d52247e3
...@@ -359,20 +359,20 @@ ...@@ -359,20 +359,20 @@
) { ) {
msg = `请选择[` + obj.UseTime + `]车辆币种`; msg = `请选择[` + obj.UseTime + `]车辆币种`;
} }
if (msg == '' && child.StartPlace == '' && // if (msg == '' && child.StartPlace == '' &&
(obj.ReimburseList.SettlementType > 0 || obj.ReimburseList.Remarks != '' || // (obj.ReimburseList.SettlementType > 0 || obj.ReimburseList.Remarks != '' ||
obj.ReimburseList.VoucherPicList.length > 0 || obj.ReimburseList.CurrencyId || // obj.ReimburseList.VoucherPicList.length > 0 || obj.ReimburseList.CurrencyId ||
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.UseTime + `]车辆出发地`
} // }
if (msg == '' && child.EndPlace == '' && // if (msg == '' && child.EndPlace == '' &&
(obj.ReimburseList.SettlementType > 0 || obj.ReimburseList.Remarks != '' || // (obj.ReimburseList.SettlementType > 0 || obj.ReimburseList.Remarks != '' ||
obj.ReimburseList.VoucherPicList.length > 0 || child.StartPlace != '' || // obj.ReimburseList.VoucherPicList.length > 0 || child.StartPlace != '' ||
obj.ReimburseList.CurrencyId || child.UserNum > 0 || child.UnitPrice > 0 || child.UserType) // obj.ReimburseList.CurrencyId || child.UserNum > 0 || child.UnitPrice > 0 || child.UserType)
) { // ) {
msg = `请输入[` + obj.UseTime + `]车辆目的地` // msg = `请输入[` + obj.UseTime + `]车辆目的地`
} // }
} }
} }
return msg return msg
......
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