Commit e73b5eb3 authored by 黄奎's avatar 黄奎

1

parent 9c21c180
...@@ -324,8 +324,6 @@ ...@@ -324,8 +324,6 @@
width, width,
height height
} = res[0]; } = res[0];
// console.log(`元素 ${index} 的横向位置(left):`, left); // 单位:px
// console.log(`元素 ${index} 的宽度:`, width);
x.left = width * (index) x.left = width * (index)
} else { } else {
console.log(`未找到元素 refs_${index + 1}`); console.log(`未找到元素 refs_${index + 1}`);
...@@ -335,6 +333,7 @@ ...@@ -335,6 +333,7 @@
}); });
}, },
methods: { methods: {
//车验证
VerificationBusList() { VerificationBusList() {
let msg = '' let msg = ''
for (let i = 0; i < this.params.BusList.length; i++) { for (let i = 0; i < this.params.BusList.length; i++) {
...@@ -347,16 +346,8 @@ ...@@ -347,16 +346,8 @@
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.PlanDateStr} msg = `请选择车辆币种`
} }
// if(msg==''&&child.UserType==0&&
// (obj.ReimburseList.SettlementType>0||obj.ReimburseList.Remarks!=''||
// obj.ReimburseList.VoucherPicList.length>0||child.StartPlace!=''||
// child.EndPlace!=''||obj.ReimburseList.CurrencyId||child.UserNum>0||child.UnitPrice>0)
// ){
// msg = `请输入车辆类型`
// }
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 ||
...@@ -375,6 +366,7 @@ ...@@ -375,6 +366,7 @@
} }
return msg return msg
}, },
//酒店验证
VerificationHotel() { VerificationHotel() {
let msg = '' let msg = ''
for (let i = 0; i < this.params.HotelOrderListReport.length; i++) { for (let i = 0; i < this.params.HotelOrderListReport.length; i++) {
...@@ -391,18 +383,12 @@ ...@@ -391,18 +383,12 @@
) { ) {
msg = `请选择酒店币种` msg = `请选择酒店币种`
} }
// if(msg==''&&grandson.UserType==0&&
// (child.ReimburseList.SettlementType>0||child.ReimburseList.Remarks!=''||
// child.ReimburseList.VoucherPicList.length>0||grandson.UserNum>0||
// grandson.UnitPrice>0||child.ReimburseList.CurrencyId)
// ){
// msg = `请选择酒店类型`
// }
} }
} }
} }
return msg return msg
}, },
//餐验证
VerificationDining() { VerificationDining() {
let msg = '' let msg = ''
for (let i = 0; i < this.params.DiningList.length; i++) { for (let i = 0; i < this.params.DiningList.length; i++) {
...@@ -419,18 +405,12 @@ ...@@ -419,18 +405,12 @@
) { ) {
msg = `请选择餐币种` msg = `请选择餐币种`
} }
// if(msg==''&&grandson.UserType==0&&
// (child.ReimburseList.SettlementType>0||child.ReimburseList.Remarks!=''||
// child.ReimburseList.VoucherPicList.length>0||grandson.UserNum>0||
// grandson.UnitPrice>0||child.ReimburseList.CurrencyId)
// ){
// msg = `请选择餐类型`
// }
} }
} }
} }
return msg return msg
}, },
//景点验证
VerificationScenic() { VerificationScenic() {
let msg = '' let msg = ''
for (let i = 0; i < this.params.ScenicList.length; i++) { for (let i = 0; i < this.params.ScenicList.length; i++) {
...@@ -447,13 +427,6 @@ ...@@ -447,13 +427,6 @@
) { ) {
msg = `请选择门票币种` msg = `请选择门票币种`
} }
// if(msg==''&&grandson.UserType==0&&
// (child.ReimburseList.SettlementType>0||child.ReimburseList.Remarks!=''||
// child.ReimburseList.VoucherPicList.length>0||grandson.UserNum>0||
// grandson.UnitPrice>0||child.ReimburseList.CurrencyId)
// ){
// msg = `请选择门票类型`
// }
} }
} }
} }
...@@ -463,10 +436,10 @@ ...@@ -463,10 +436,10 @@
let msg = '' let msg = ''
for (let i = 0; i < this.params.OtherOrderInfo.OtherList.length; i++) { for (let i = 0; i < this.params.OtherOrderInfo.OtherList.length; i++) {
let obj = this.params.OtherOrderInfo.OtherList[i] let obj = this.params.OtherOrderInfo.OtherList[i]
console.log("obj", obj)
if (msg == '' && obj.UseDate == null && if (msg == '' && obj.UseDate == null &&
(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 = `请选择其他费用使用时间`
} }
...@@ -559,12 +532,11 @@ ...@@ -559,12 +532,11 @@
icon: "none", icon: "none",
}) })
} }
// console.log(this.params,'-----')
// return
if (this.loading) return if (this.loading) return
this.loading = true this.loading = true
uni.showLoading() uni.showLoading()
this.apipost("dmcstatistics_post_SetNewLeaderApplyList_V2", this.params, (res) => { this.apipost("dmcstatistics_post_SetNewLeaderApplyList_V2", this.params, (res) => {
console.log("dmcstatistics_post_SetNewLeaderApplyList_V2",JSON.parse(JSON.stringify(res.data)));
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.loading = false this.loading = false
uni.hideLoading() uni.hideLoading()
...@@ -592,6 +564,7 @@ ...@@ -592,6 +564,7 @@
init() { init() {
uni.showLoading() uni.showLoading()
this.apipost("dmcstatistics_post_GetNewLeaderPayMoneyStatics", this.msg, (res) => { this.apipost("dmcstatistics_post_GetNewLeaderPayMoneyStatics", this.msg, (res) => {
console.log("dmcstatistics_post_GetNewLeaderPayMoneyStatics",JSON.parse(JSON.stringify(res.data)));
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.params = res.data; this.params = res.data;
for (let i = 1; i < 5; i++) { for (let i = 1; i < 5; i++) {
...@@ -610,18 +583,14 @@ ...@@ -610,18 +583,14 @@
this.$set(this.params.HotelOrderListReport[i], `TotalMoney`, 0); this.$set(this.params.HotelOrderListReport[i], `TotalMoney`, 0);
this.$set(this.params.HotelOrderListReport[i], `hotelIndex`, 0); this.$set(this.params.HotelOrderListReport[i], `hotelIndex`, 0);
} }
if (res.data.CountryIds) this.getShoppingType(res.data.CountryIds) if (res.data.CountryIds) {
// console.log(this.params.HotelOrderListReport,'-----酒店') this.getShoppingType(res.data.CountryIds)
// console.log(this.params.BusList,'-----车信息') }
// console.log(this.params.ScenicList,'-----景点')
// console.log(this.params.DiningList,'-----餐厅')
// console.log(this.params.LeaderShopList ,'-----购物店信息')
// console.log(this.params.LeaderApply ,'-----领队用款申请信息')
console.log(this.params.OtherOrderInfo, '-----其他信息')
for (let i = 0; i < this.params.OtherOrderInfo.OtherList.length; i++) { for (let i = 0; i < this.params.OtherOrderInfo.OtherList.length; i++) {
let obj = this.params.OtherOrderInfo.OtherList[i] let obj = this.params.OtherOrderInfo.OtherList[i]
console.log("obj", obj) if (obj.UseDate == null && obj.UnitPrice == 0 && obj.Rebate == 0 && obj.VoucherPic !=
if ( obj.UseDate == null &&obj.UnitPrice==0&&obj.Rebate==0&&obj.VoucherPic !=""&&obj.Remark == '' && obj.Currency==0) { "" && obj.Remark == '' && obj.Currency == 0) {
obj.CostProject = -1 obj.CostProject = -1
} }
} }
...@@ -663,7 +632,6 @@ ...@@ -663,7 +632,6 @@
Math.floor(e.detail.scrollTop - 100) / 100 > 1 ? Math.floor(e.detail.scrollTop - 100) / 100 > 1 ?
1 : 1 :
Math.floor(e.detail.scrollTop - 100) / 100; Math.floor(e.detail.scrollTop - 100) / 100;
this.$forceUpdate(); this.$forceUpdate();
}, },
getOptionData() { getOptionData() {
...@@ -697,6 +665,7 @@ ...@@ -697,6 +665,7 @@
}) })
}, },
//获取币种
getCurrencyList() { getCurrencyList() {
this.apipost("financeinfo_post_GetList", { this.apipost("financeinfo_post_GetList", {
Name: '', Name: '',
......
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