Skip to content

J
jz_Travel
Commit fe7d126f authored by youjie's avatar youjie
Browse files
Options

no message

parent acd76905
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 35 deletions
pages/teamLeader/components/headeDatas.vue
View file @ fe7d126f
...@@ -127,9 +127,8 @@ ...@@ -127,9 +127,8 @@
<template v-else>暂无司机信息</template> <template v-else>暂无司机信息</template>
</view> </view>
<view v-if="params.type>1&&params.type<5" class="row justify-center items-center"> <view v-if="params.type>1&&params.type<5" class="row justify-center items-center">
<view v-if="params.type==2" class="row justify-center items-center"> <view v-if="params.type==2" class="row justify-center items-center">
<view class="row" v-if="datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo" <view class="row items-center" v-if="datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo||datas.HotelOrderList[datas.hotelIndex].NewHotelName"
@click="showOptionVisible(3)"> @click="showOptionVisible(3)">
<view class="nameTitle"> <view class="nameTitle">
{{ datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo?datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo:datas.HotelOrderList[datas.hotelIndex].NewHotelName }} {{ datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo?datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo:datas.HotelOrderList[datas.hotelIndex].NewHotelName }}
...@@ -142,7 +141,7 @@ ...@@ -142,7 +141,7 @@
</view> </view>
</view> </view>
<view v-if="params.type==3" class="row justify-center items-center"> <view v-if="params.type==3" class="row justify-center items-center">
<view class="row" v-if="datas.DiningSummaryList[datas.diningIndex].ReimburseList.ActualUseInfo" <view class="row items-center" v-if="datas.DiningSummaryList[datas.diningIndex].ReimburseList.ActualUseInfo||datas.DiningSummaryList[datas.diningIndex].NewDiningName"
@click="showOptionVisible(4)"> @click="showOptionVisible(4)">
<view class="nameTitle"> <view class="nameTitle">
{{ datas.DiningSummaryList[datas.diningIndex].ReimburseList.ActualUseInfo?datas.DiningSummaryList[datas.diningIndex].ReimburseList.ActualUseInfo:datas.DiningSummaryList[datas.diningIndex].NewDiningName }} {{ datas.DiningSummaryList[datas.diningIndex].ReimburseList.ActualUseInfo?datas.DiningSummaryList[datas.diningIndex].ReimburseList.ActualUseInfo:datas.DiningSummaryList[datas.diningIndex].NewDiningName }}
...@@ -156,7 +155,7 @@ ...@@ -156,7 +155,7 @@
</view> </view>
</view> </view>
<view v-if="params.type==4" class="row justify-center items-center"> <view v-if="params.type==4" class="row justify-center items-center">
<view class="row" v-if="datas.ScenicStatisticsList[datas.scenicIndex].ReimburseList.ActualUseInfo" <view class="row items-center" v-if="datas.ScenicStatisticsList[datas.scenicIndex].ReimburseList.ActualUseInfo||datas.ScenicStatisticsList[datas.scenicIndex].ScenicName"
@click="showOptionVisible(5)"> @click="showOptionVisible(5)">
<view class="nameTitle"> <view class="nameTitle">
{{ datas.ScenicStatisticsList[datas.scenicIndex].ReimburseList.ActualUseInfo?datas.ScenicStatisticsList[datas.scenicIndex].ReimburseList.ActualUseInfo:datas.ScenicStatisticsList[datas.scenicIndex].ScenicName }} {{ datas.ScenicStatisticsList[datas.scenicIndex].ReimburseList.ActualUseInfo?datas.ScenicStatisticsList[datas.scenicIndex].ReimburseList.ActualUseInfo:datas.ScenicStatisticsList[datas.scenicIndex].ScenicName }}
...@@ -168,9 +167,9 @@ ...@@ -168,9 +167,9 @@
暂无门票信息 暂无门票信息
</view> </view>
</view> </view>
<img v-if="(params.type==2&&datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo) <img v-if="(params.type==2&&(datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo||datas.HotelOrderList[datas.hotelIndex].NewHotelName))
||(params.type==3&&datas.DiningSummaryList[datas.diningIndex].ReimburseList.ActualUseInfo) ||(params.type==3&&(datas.DiningSummaryList[datas.diningIndex].ReimburseList.ActualUseInfo||datas.DiningSummaryList[datas.diningIndex].NewDiningName))
||(params.type==4&&datas.ScenicStatisticsList[datas.scenicIndex].ReimburseList.ActualUseInfo)" @click="showEditorVisible" class="PL40" ||(params.type==4&&(datas.ScenicStatisticsList[datas.scenicIndex].ReimburseList.ActualUseInfo||datas.ScenicStatisticsList[datas.scenicIndex].ScenicName))" @click="showEditorVisible" class="PL40"
style="width: 30rpx;height: 30rpx;display: inline-block;" style="width: 30rpx;height: 30rpx;display: inline-block;"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638870767566609082.png" /> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638870767566609082.png" />
</view> </view>
...@@ -441,6 +440,7 @@ ...@@ -441,6 +440,7 @@
this.dateList.push({ this.dateList.push({
name: data.UseTimeStr, name: data.UseTimeStr,
id: i + 1, id: i + 1,
newName: data.ActualUseInfo
}) })
} }
this.datas = this.ScenicList[this.dataIndex] this.datas = this.ScenicList[this.dataIndex]
...@@ -500,6 +500,7 @@ ...@@ -500,6 +500,7 @@
this.dateList.push({ this.dateList.push({
name: data.UseTimeStr, name: data.UseTimeStr,
id: i + 1, id: i + 1,
newName: data.ActualUseInfo
}) })
} }
this.datas = this.DiningList[this.dataIndex] this.datas = this.DiningList[this.dataIndex]
...@@ -566,7 +567,8 @@ ...@@ -566,7 +567,8 @@
this.datas.HotelOrderList.forEach(x => { this.datas.HotelOrderList.forEach(x => {
this.hotelList.push({ this.hotelList.push({
name: x.HotelName, name: x.HotelName,
id: x.HotelId id: x.HotelId,
newName: x.ReimburseList.ActualUseInfo
}) })
}) })
this.hotelObj = JSON.parse(JSON.stringify(this.hotelList[this.datas.hotelIndex])) this.hotelObj = JSON.parse(JSON.stringify(this.hotelList[this.datas.hotelIndex]))
......
pages/teamLeader/components/report/productInfor1.vue
View file @ fe7d126f
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
</view> </view>
</view> </view>
<view class="Sure"> <view class="Sure">
<view class="text-center" @click="addData">添加</view> <view class="text-center" @click="addData">添加</view >
</view> </view>
<view class="paymentTitle PA30">支付方式</view> <view class="paymentTitle PA30">支付方式</view>
<view class="PX30 PB20 paymentTexts row"> <view class="PX30 PB20 paymentTexts row">
...@@ -286,6 +286,7 @@ ...@@ -286,6 +286,7 @@
item[field] = value item[field] = value
this.getTotal() this.getTotal()
}else{ }else{
item[field] = 0
uni.showToast({ uni.showToast({
title: `请输入正确的${type?'金额':'数量'}`, title: `请输入正确的${type?'金额':'数量'}`,
icon: 'none' icon: 'none'
...@@ -296,6 +297,7 @@ ...@@ -296,6 +297,7 @@
if(this.$utils.checkIsNum(item[field])){ if(this.$utils.checkIsNum(item[field])){
this.getTotal(); this.getTotal();
}else{ }else{
item[field] = 0
uni.showToast({ uni.showToast({
title: `请输入正确的${type?'金额':'数量'}`, title: `请输入正确的${type?'金额':'数量'}`,
icon: 'none' icon: 'none'
......
pages/teamLeader/components/report/productInfor2.vue
View file @ fe7d126f
...@@ -292,6 +292,7 @@ ...@@ -292,6 +292,7 @@
item[field] = value item[field] = value
this.getTotal() this.getTotal()
}else{ }else{
item[field] = 0
uni.showToast({ uni.showToast({
title: `请输入正确的${type?'金额':'数量'}`, title: `请输入正确的${type?'金额':'数量'}`,
icon: 'none' icon: 'none'
...@@ -302,6 +303,7 @@ ...@@ -302,6 +303,7 @@
if(this.$utils.checkIsNum(item[field])){ if(this.$utils.checkIsNum(item[field])){
this.getTotal(); this.getTotal();
}else{ }else{
item[field] = 0
uni.showToast({ uni.showToast({
title: `请输入正确的${type?'金额':'数量'}`, title: `请输入正确的${type?'金额':'数量'}`,
icon: 'none' icon: 'none'
......
pages/teamLeader/components/report/productInfor3.vue
View file @ fe7d126f
...@@ -291,6 +291,7 @@ ...@@ -291,6 +291,7 @@
item[field] = value item[field] = value
this.getTotal() this.getTotal()
}else{ }else{
item[field] = 0
uni.showToast({ uni.showToast({
title: `请输入正确的${type?'金额':'数量'}`, title: `请输入正确的${type?'金额':'数量'}`,
icon: 'none' icon: 'none'
...@@ -301,6 +302,7 @@ ...@@ -301,6 +302,7 @@
if(this.$utils.checkIsNum(item[field])){ if(this.$utils.checkIsNum(item[field])){
this.getTotal(); this.getTotal();
}else{ }else{
item[field] = 0
uni.showToast({ uni.showToast({
title: `请输入正确的${type?'金额':'数量'}`, title: `请输入正确的${type?'金额':'数量'}`,
icon: 'none' icon: 'none'
......
pages/teamLeader/components/report/productInfor4.vue
View file @ fe7d126f
...@@ -293,6 +293,7 @@ ...@@ -293,6 +293,7 @@
item[field] = value item[field] = value
this.getTotal() this.getTotal()
}else{ }else{
item[field] = 0
uni.showToast({ uni.showToast({
title: `请输入正确的${type?'金额':'数量'}`, title: `请输入正确的${type?'金额':'数量'}`,
icon: 'none' icon: 'none'
...@@ -303,6 +304,7 @@ ...@@ -303,6 +304,7 @@
if(this.$utils.checkIsNum(item[field])){ if(this.$utils.checkIsNum(item[field])){
this.getTotal(); this.getTotal();
}else{ }else{
item[field] = 0
uni.showToast({ uni.showToast({
title: `请输入正确的${type?'金额':'数量'}`, title: `请输入正确的${type?'金额':'数量'}`,
icon: 'none' icon: 'none'
......
pages/teamLeader/components/singleChoice.vue
View file @ fe7d126f
...@@ -9,6 +9,13 @@ ...@@ -9,6 +9,13 @@
transform: scale(.7); transform: scale(.7);
margin-right: 5px; margin-right: 5px;
} }
.newName{
padding-left: 66rpx;
}
.newNameImg img{
width: 35rpx;
height: 35rpx;
}
</style> </style>
<template> <template>
<u-popup mode="center" border-radius="20" <u-popup mode="center" border-radius="20"
...@@ -20,8 +27,9 @@ ...@@ -20,8 +27,9 @@
style="max-height: 60vh;"> style="max-height: 60vh;">
<view class="List column"> <view class="List column">
<radio-group @change="radioChange"> <radio-group @change="radioChange">
<view class="column" v-for="(item, index) in list">
<label class="row items-center justify-center MB20" <label class="row items-center justify-center MB20"
v-for="(item, index) in list" :key="item.value"> :key="item.value">
<view> <view>
<radio :value="item.id" :checked="item.id == newCurrent" <radio :value="item.id" :checked="item.id == newCurrent"
color="#295EEB" color="#295EEB"
...@@ -30,6 +38,11 @@ ...@@ -30,6 +38,11 @@
</view> </view>
<view class="flex1">{{item.name}}</view> <view class="flex1">{{item.name}}</view>
</label> </label>
<view class="PB20" v-if="item.newName">
<view class="newNameImg row justify-center"> <img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638890399900642324.png"/> </view>
<view class="newName">{{ item.newName }}</view>
</view>
</view>
</radio-group> </radio-group>
</view> </view>
</scroll-view> </scroll-view>
......
pages/teamLeader/reimbursementInfor.vue
View file @ fe7d126f
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
top: 0; top: 0;
right: 0; right: 0;
z-index: 3; z-index: 3;
background: linear-gradient(-30deg, #4FA9FF, #4779FF); // background: linear-gradient(-30deg, #4FA9FF, #4779FF);
} }
.reimbursementInforTitle.fixed .reimbursementInforTsBox { .reimbursementInforTitle.fixed .reimbursementInforTsBox {
...@@ -70,12 +70,12 @@ ...@@ -70,12 +70,12 @@
} }
</style> </style>
<template> <template>
<view style="height: 100vh;"> <view style="height: 100vh;overflow: hidden;">
<scroll-view class="reimbursementInforBox" scroll-y="true" :enable-back-to-top="true" :enable-flex="true" <scroll-view class="reimbursementInforBox" scroll-y="true" :enable-back-to-top="true" :enable-flex="true"
@scroll="scroll" style="height: 100vh;"> @scroll="scroll" style="height: 100vh;overflow: hidden;">
<view class="reimbursementInforHeaderBox"> <view class="reimbursementInforHeaderBox">
<view class="reimbursementInforTitle" :class="[boxOption>0?'fixed':'']" <view class="reimbursementInforTitle fixed"
:style="[boxOption>0?'titleStyle':'']"> :style="[{'background': old.scrollTop>2?'linear-gradient(-30deg, #4FA9FF, #4779FF)':''}]">
<headers textAlign="left" :title="pageTitle" color="#fff"></headers> <headers textAlign="left" :title="pageTitle" color="#fff"></headers>
<scroll-view class="reimbursementInforTsBox" :scroll-x="true" :scroll-left="scrollLeft"> <scroll-view class="reimbursementInforTsBox" :scroll-x="true" :scroll-left="scrollLeft">
<view class="reimbursementInforT-text row-aic-n"> <view class="reimbursementInforT-text row-aic-n">
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<view style="height: 200rpx;"></view>
<headeDatas v-show="params.type<5" :currencyList="currencyList" :data="params" @change="getNewData"> <headeDatas v-show="params.type<5" :currencyList="currencyList" :data="params" @change="getNewData">
</headeDatas> </headeDatas>
</view> </view>
...@@ -301,13 +302,13 @@ ...@@ -301,13 +302,13 @@
}, },
mounted() { mounted() {
const that = this const that = this
uni.getSystemInfo({ // uni.getSystemInfo({
success(res) { // success(res) {
that.titleStyle = { // that.titleStyle = {
paddingTop: `${res.statusBarHeight}px` // paddingTop: `${res.statusBarHeight}px`
}; // };
}, // },
}); // });
this.getOptionData() this.getOptionData()
this.getCurrencyList() this.getCurrencyList()
this.$nextTick(() => { this.$nextTick(() => {
...@@ -780,14 +781,14 @@ ...@@ -780,14 +781,14 @@
}, },
scroll(e) { scroll(e) {
this.old.scrollTop = e.detail.scrollTop this.old.scrollTop = e.detail.scrollTop
this.boxOption = Math.floor((e.detail.scrollTop - 500) / 1.5); this.boxOption = Math.floor((e.detail.scrollTop - 250) / 1.5);
this.titleStyle.opacity = this.titleStyle.opacity =
e.detail.scrollTop - 500 < 0 ? e.detail.scrollTop - 250 < 0 ?
0 : 0 :
Math.floor(e.detail.scrollTop - 500) / 100 > 1 ? Math.floor(e.detail.scrollTop - 250) / 100 > 1 ?
1 : 1 :
Math.floor(e.detail.scrollTop - 500) / 100; Math.floor(e.detail.scrollTop - 250) / 100;
this.$forceUpdate(); console.log(this.titleStyle.opacity,'-00--------')
}, },
getOptionData() { getOptionData() {
this.apipost("dmcstatistics_post_GetReimburseTypeList", { this.apipost("dmcstatistics_post_GetReimburseTypeList", {
......
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