Skip to content

J
jz_Travel
Commit e73b5eb3 authored by 黄奎's avatar 黄奎
Browse files
Options

1

parent 9c21c180
Show whitespace changes
Inline Side-by-side
Showing with 410 additions and 389 deletions
pages/teamLeader/components/report/productInfor1.vue
View file @ e73b5eb3
<style lang="scss" scoped>
@import url("@/asset/css/flex.css");
.Sure{
.Sure {
padding: 0 20rpx;
margin-top: 30rpx;
}
.Sure view{
.Sure view {
background: #257BF2;
border-radius: 80rpx;
line-height: 80rpx;
......@@ -12,51 +14,62 @@
color: #fff;
}
.paymentTitle{
.paymentTitle {
font-size: 28rpx;
}
.paymentTexts view{
.paymentTexts view {
padding: 5rpx 15rpx;
border: 1px solid #EDEDED;
color: #888888;
border-radius: 6rpx;
}
.paymentTexts view:last-child{
.paymentTexts view:last-child {
margin-left: 40rpx;
}
.paymentTexts view.active{
.paymentTexts view.active {
color: #fff;
background: #257BF2;
border: 1px solid #257BF2;
}
.paymentTitle .tisp{
.paymentTitle .tisp {
color: #666666;
}
.textareaBox textarea{
.textareaBox textarea {
height: 208rpx;
background: #FFFFFF;
border: 1rpx solid #EAEAEA;
border-radius: 10rpx;
}
.InforImgBox{
.InforImgBox {
flex-wrap: wrap;
}
.InforImg,.addUp{
.InforImg,
.addUp {
width: 208rpx;
height: 208rpx;
margin-bottom: 20rpx;
}
.InforImg{
.InforImg {
border-radius: 10rpx;
margin-right: 20rpx;
position: relative;
}
.InforImg image{
.InforImg image {
width: 100%;
height: 100%;
border-radius: 10rpx;
}
.InforImgDel{
.InforImgDel {
position: absolute;
left: 0;
top: -14rpx;
......@@ -64,86 +77,96 @@
background: #fff;
border-radius: 50%;
}
.inforCenter{
.inforCenter {
border-radius: 10rpx;
overflow: hidden;
border: 1px solid rgba(102,102,102,0.3);
border: 1px solid rgba(102, 102, 102, 0.3);
margin-bottom: 40rpx;
position: relative;
}
.inforCenter:last-child{
.inforCenter:last-child {
margin-bottom: 0;
}
.inforCenterTop{
.inforCenterTop {
background: #F3F3F3;
padding: 20rpx 29rpx;
font-size: 32rpx;
color: #333333;
}
.inputBox{
.inputBox {
padding: 20rpx 0;
margin: 0 29rpx;
border-bottom:1px solid #DDD ;
border-bottom: 1px solid #DDD;
font-size: 28rpx;
}
.inputBox.noBorder{
.inputBox.noBorder {
border: 0;
}
.tisp{
.tisp {
color: red;
}
.inputBoxRight{
.inputBoxRight {
position: relative;
}
.inputBoxRight u-number-box{
.inputBoxRight u-number-box {
position: absolute;
right: 0;
top: -7rpx;
}
/deep/.inputBoxRight u-number-box input{
/deep/.inputBoxRight u-number-box input {
width: 130rpx !important;
min-width: 130rpx !important;
}
.inforCenterTopDel{
.inforCenterTopDel {
position: absolute;
left: -7rpx;
top: -7rpx;
padding: 5rpx;
z-index: 1;
}
</style>
<template>
<view>
<view v-if="datas&&datas.ReimburseList&&datas.ReimburseList.ReimburseDetailsList.length>0" class="inforCenterBox PX30 MT20">
<view class="inforCenter" v-for="(item,index) in datas.ReimburseList.ReimburseDetailsList"
:key="index">
<view v-if="datas&&datas.ReimburseList&&datas.ReimburseList.ReimburseDetailsList.length>0"
class="inforCenterBox PX30 MT20">
<view class="inforCenter" v-for="(item,index) in datas.ReimburseList.ReimburseDetailsList" :key="index">
<view class="inforCenterTop row justify-between" @click="showOptionVisible(index)">
<view>{{ item.UserTypeStr?item.UserTypeStr:'选择类型' }}</view>
<view>
<u-icon name="arrow-down" color="#BBBBBB" size="42"/>
<u-icon name="arrow-down" color="#BBBBBB" size="42" />
</view>
</view>
<u-icon v-if="index" @click="delInfor(index)" class="inforCenterTopDel" name="clear" color="#FA6967" size="36"/>
<u-icon v-if="index" @click="delInfor(index)" class="inforCenterTopDel" name="clear" color="#FA6967"
size="36" />
<view class="inputBox row justify-between">
<view class="row">
<text class="tisp MR10">*</text><text>出发地</text>
</view>
<view><input class="text-right" type="text" v-model="item.StartPlace" placeholder="请输入出发地"/></view>
<view><input class="text-right" type="text" v-model="item.StartPlace" placeholder="请输入出发地" /></view>
</view>
<view class="inputBox row justify-between">
<view class="row">
<text class="tisp MR10">*</text><text>目的地</text>
</view>
<view><input class="text-right" type="text" v-model="item.EndPlace" placeholder="请输入目的地"/></view>
<view><input class="text-right" type="text" v-model="item.EndPlace" placeholder="请输入目的地" /></view>
</view>
<view class="inputBox row justify-between">
<view class="row">
<text>数量</text>
</view>
<view class="inputBoxRight">
<u-number-box :min="0" :value="item.UserNum" @change="(e)=>getNum(e,index,'数量')"/>
<input class="text-right" type="text" v-model="item.UserNum"
@input="checkInteger(item,'UserNum')" @change="getNum()" />
</view>
</view>
<view class="inputBox row justify-between">
......@@ -151,7 +174,8 @@
<text>金额</text>
</view>
<view class="inputBoxRight">
<u-number-box :min="0" :max="99999999999999999" v-model="item.UnitPrice" @change="(e)=>getNum(e,index,'金额')"/>
<input class="text-right" type="text" v-model="item.UnitPrice"
@input="changePrice($event,item,index,true)" />
</view>
</view>
<view class="inputBox row justify-between noBorder">
......@@ -168,129 +192,155 @@
<view class="paymentTitle PA30">支付方式</view>
<view class="PX30 PB20 paymentTexts row">
<template v-for="(item,index) in paymentList">
<view :class="[datas.ReimburseList.SettlementType==item.id?'active':'']" @click="getSettlementType(item)">{{ item.name }}</view>
<view :class="[datas.ReimburseList.SettlementType==item.id?'active':'']"
@click="getSettlementType(item)">{{ item.name }}</view>
</template>
</view>
<view class="paymentTitle PA30">备注</view>
<view class="textareaBox PX30 row">
<textarea class="PA20 flex1" placeholder-style="color:#AAAAAA"
v-model="datas.ReimburseList.Remarks" placeholder="请输入备注信息" @blur="updateData"/>
<textarea class="PA20 flex1" placeholder-style="color:#AAAAAA" v-model="datas.ReimburseList.Remarks"
placeholder="请输入备注信息" @blur="updateData" />
</view>
<view class="paymentTitle PA30">
<text>凭证</text>
<text class="tisp">(可上传多张图片)</text>
</view>
<view class="PX30 PB30 row InforImgBox">
<view class="InforImg" v-for="(item,index) in datas.ReimburseList.VoucherPicList"
@click="previewImage(item.url)">
<image :src="item.url" mode="aspectFill"></image>
<u-icon @click="delImg(index)" class="InforImgDel" name="clear" color="#FA6967" size="36"/>
<view class="InforImg" v-for="(item,index) in datas.ReimburseList.VoucherPicList">
<image :src="item.url" mode="aspectFill" @click="previewImage(item.url)"></image>
<u-icon @click="delImg(index)" class="InforImgDel" name="clear" color="#FA6967" size="36" />
</view>
<upload class="addUp" @onSuccess="onSuccess"></upload>
</view>
<singleChoice v-if="optionVisible"
:current="optionObj.id"
:list="optionList"
@close="close" @change="popupCurrent"></singleChoice>
<singleChoice v-if="optionVisible" :current="optionObj.id" :list="optionList" @close="close"
@change="popupCurrent"></singleChoice>
</view>
</template>
<script>
import upload from "../upload";
import singleChoice from "../singleChoice";
export default {
props:['data','optionList'],
import upload from "../upload";
import singleChoice from "../singleChoice";
export default {
props: ['data', 'optionList'],
components: {
upload,
singleChoice,
},
data() {
return {
paymentList:[
{name:'现金支付',id:1},
{name:'公司结算',id:2},
paymentList: [{
name: '现金支付',
id: 1
},
{
name: '公司结算',
id: 2
},
],
optionVisible: false,
optionObj:{},
optionObj: {},
params: {},
datas: null,//展示数据
datas: null, //展示数据
dataIndex: 0,
ReimIndex: 0,
ReimDatas: {},
BusList:[], //车信息
HotelOrderListReport:[], //酒店信息，合团
DiningList:[], //餐厅
ScenicList:[], //景点
OtherList:[], //其他订单信息
TipList:[], //小费收入
TeamList:[], //团费小计
SelfPlayingIncomeList:[], //自费收入
SelfPlayingExpendList:[], //自费支出
LeaderShopList:[], //购物报账
BusList: [], //车信息
HotelOrderListReport: [], //酒店信息，合团
DiningList: [], //餐厅
ScenicList: [], //景点
OtherList: [], //其他订单信息
TipList: [], //小费收入
TeamList: [], //团费小计
SelfPlayingIncomeList: [], //自费收入
SelfPlayingExpendList: [], //自费支出
LeaderShopList: [], //购物报账
}
},
watch: {
data:{
handler(newVal,oldVal){
this.params = JSON.parse(JSON.stringify(newVal))
data: {
handler(newVal, oldVal) {
var newJson = JSON.parse(JSON.stringify(newVal));
console.log("newJson", newJson);
this.params = newJson;
this.BusList = this.params.BusList //车信息
this.dataIndex = this.params.dataIndex1
this.dataIndex = this.params.dataIndex1;
this.getRenderingData()
this.getTotal()
},
deep:true,
immediate:false
deep: true,
immediate: false
},
datas:{
handler(newVal,oldVal){
this.updateData()
datas: {
handler(newVal, oldVal) {
//this.updateData()
this.getRenderingData();
},
deep:true,
immediate:false
deep: true,
immediate: false
}
},
mounted() {
},
methods:{
getNum(e,index,type){
if(type=='数量') {
this.datas.ReimburseList.ReimburseDetailsList[index].UserNum = e.value
}else if(type=='金额'){
this.datas.ReimburseList.ReimburseDetailsList[index].UnitPrice = e.value
methods: {
changePrice(e, item, index, isMinus) {
var value = e.detail.value;
var t = value.charAt(0);
value = value.replace(/[^\d.]/g, ""); //清除“数字”和“.”以外的字符
value = value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的
value = value
.replace(".", "$#$")
.replace(/\./g, "")
.replace("$#$", ".");
value = value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3'); //只能输入两个小数
//如果第一位是负号，则允许添加 如果不允许添加负号 可以把这块注释掉
//是否允许负数
if (isMinus && t == '-') {
value = '-' + value;
}
this.getTotal()
if (value === '' || value === '.') {
value = 0;
}
item.UnitPrice = value;
this.$set(this.datas.ReimburseList.ReimburseDetailsList, index, item);
this.getNum();
},
getTotal(){
let total = 0
this.datas.ReimburseList.ReimburseDetailsList.forEach(x=>{
total+=x.UserNum*x.UnitPrice
getNum() {
this.getTotal();
},
getTotal() {
let total = 0;
console.log("getTotal", JSON.parse(JSON.stringify(this.datas.ReimburseList.ReimburseDetailsList)))
this.datas.ReimburseList.ReimburseDetailsList.forEach(x => {
total += x.UserNum * x.UnitPrice
})
this.datas.TotalMoney = total
this.updateData()
},
delInfor(index){
this.datas.ReimburseList.ReimburseDetailsList.splice(index,1)
delInfor(index) {
this.datas.ReimburseList.ReimburseDetailsList.splice(index, 1)
},
delImg(index){
this.datas.VoucherPicList.splice(index,1)
delImg(index) {
this.datas.ReimburseList.VoucherPicList.splice(index, 1);
},
getSettlementType(item){
getSettlementType(item) {
this.datas.ReimburseList.SettlementType = item.id
this.updateData()
this.$forceUpdate()
},
updateData(){
updateData() {
this.BusList[this.dataIndex] = JSON.parse(JSON.stringify(this.datas))
this.params.BusList = JSON.parse(JSON.stringify(this.BusList))
this.$emit('change',this.params)
this.$emit('change', this.params)
},
getRenderingData(){
getRenderingData() {
this.datas = this.BusList[this.dataIndex]
if(this.datas.VoucherPicList==null) this.datas.VoucherPicList = []
console.log("this.datas", this.datas);
if (this.datas.VoucherPicList == null) this.datas.VoucherPicList = []
this.ReimDatas = JSON.parse(JSON.stringify(this.datas.ReimburseList.ReimburseDetailsList[0]))
},
showOptionVisible(index){
showOptionVisible(index) {
this.optionVisible = true
this.ReimIndex = index
this.optionObj = {
......@@ -298,19 +348,21 @@ export default {
id: this.datas.ReimburseList.ReimburseDetailsList[this.ReimIndex].UserType,
}
},
close(){
close() {
this.optionVisible = false
},
popupCurrent(value){
popupCurrent(value) {
this.optionVisible = false
let findIndex = this.optionList.findIndex(x=>x.id==value)
let findIndex = this.optionList.findIndex(x => x.id == value)
this.optionObj = this.optionList[findIndex]
this.datas.ReimburseList.ReimburseDetailsList[this.ReimIndex].UserTypeStr = this.optionObj.name
this.datas.ReimburseList.ReimburseDetailsList[this.ReimIndex].UserType = this.optionObj.id
},
previewImage(src) {
uni.previewImage({
urls: this.datas.ReimburseList.VoucherPicList.map(x=> {return x.url}),
urls: this.datas.ReimburseList.VoucherPicList.map(x => {
return x.url
}),
current: src,
longPressActions: {
itemList: ["发送给朋友", "保存图片", "收藏"],
......@@ -323,7 +375,7 @@ export default {
},
});
},
addData(){
addData() {
this.ReimDatas = {
...this.ReimDatas,
ID: 0,
......@@ -337,12 +389,12 @@ export default {
this.datas.ReimburseList.ReimburseDetailsList.push(JSON.parse(JSON.stringify(this.ReimDatas)))
},
onSuccess(infor){
onSuccess(infor) {
this.datas.ReimburseList.VoucherPicList.push({
FileName: infor.name,
url: infor.url,
})
}
}
}
}
</script>
\ No newline at end of file
pages/teamLeader/reimbursementInfor.vue
View file @ e73b5eb3
......@@ -324,8 +324,6 @@
width,
height
} = res[0];
// console.log(`元素 ${index} 的横向位置（left）:`, left); // 单位：px
// console.log(`元素 ${index} 的宽度:`, width);
x.left = width * (index)
} else {
console.log(`未找到元素 refs_${index + 1}`);
......@@ -335,6 +333,7 @@
});
},
methods: {
//车验证
VerificationBusList() {
let msg = ''
for (let i = 0; i < this.params.BusList.length; i++) {
......@@ -347,16 +346,8 @@
obj.ReimburseList.VoucherPicList.length > 0 || child.StartPlace != '' ||
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 == '' &&
(obj.ReimburseList.SettlementType > 0 || obj.ReimburseList.Remarks != '' ||
obj.ReimburseList.VoucherPicList.length > 0 || obj.ReimburseList.CurrencyId ||
......@@ -375,6 +366,7 @@
}
return msg
},
//酒店验证
VerificationHotel() {
let msg = ''
for (let i = 0; i < this.params.HotelOrderListReport.length; i++) {
......@@ -391,18 +383,12 @@
) {
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
},
//餐验证
VerificationDining() {
let msg = ''
for (let i = 0; i < this.params.DiningList.length; i++) {
......@@ -419,18 +405,12 @@
) {
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
},
//景点验证
VerificationScenic() {
let msg = ''
for (let i = 0; i < this.params.ScenicList.length; i++) {
......@@ -447,13 +427,6 @@
) {
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 @@
let msg = ''
for (let i = 0; i < this.params.OtherOrderInfo.OtherList.length; i++) {
let obj = this.params.OtherOrderInfo.OtherList[i]
console.log("obj", obj)
if (msg == '' && obj.UseDate == null &&
(obj.UnitPrice > 0 || obj.Rebate > 0 || obj.VoucherPicList.length > 0 ||
obj.Remark != '' || obj.Currency!=0)
obj.Remark != '' || obj.Currency != 0)
) {
msg = `请选择其他费用使用时间`
}
......@@ -559,12 +532,11 @@
icon: "none",
})
}
// console.log(this.params,'-----')
// return
if (this.loading) return
this.loading = true
uni.showLoading()
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) {
this.loading = false
uni.hideLoading()
......@@ -592,6 +564,7 @@
init() {
uni.showLoading()
this.apipost("dmcstatistics_post_GetNewLeaderPayMoneyStatics", this.msg, (res) => {
console.log("dmcstatistics_post_GetNewLeaderPayMoneyStatics",JSON.parse(JSON.stringify(res.data)));
if (res.resultCode == 1) {
this.params = res.data;
for (let i = 1; i < 5; i++) {
......@@ -610,18 +583,14 @@
this.$set(this.params.HotelOrderListReport[i], `TotalMoney`, 0);
this.$set(this.params.HotelOrderListReport[i], `hotelIndex`, 0);
}
if (res.data.CountryIds) this.getShoppingType(res.data.CountryIds)
// console.log(this.params.HotelOrderListReport,'-----酒店')
// 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, '-----其他信息')
if (res.data.CountryIds) {
this.getShoppingType(res.data.CountryIds)
}
for (let i = 0; i < this.params.OtherOrderInfo.OtherList.length; i++) {
let obj = this.params.OtherOrderInfo.OtherList[i]
console.log("obj", obj)
if ( obj.UseDate == null &&obj.UnitPrice==0&&obj.Rebate==0&&obj.VoucherPic !=""&&obj.Remark == '' && obj.Currency==0) {
if (obj.UseDate == null && obj.UnitPrice == 0 && obj.Rebate == 0 && obj.VoucherPic !=
"" && obj.Remark == '' && obj.Currency == 0) {
obj.CostProject = -1
}
}
......@@ -663,7 +632,6 @@
Math.floor(e.detail.scrollTop - 100) / 100 > 1 ?
1 :
Math.floor(e.detail.scrollTop - 100) / 100;
this.$forceUpdate();
},
getOptionData() {
......@@ -697,6 +665,7 @@
})
},
//获取币种
getCurrencyList() {
this.apipost("financeinfo_post_GetList", {
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