Skip to content

S
SuperMan
Commit a646eb30 authored by 黄奎's avatar 黄奎
Browse files
Options

保证详情调整

parent 053f7e30
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 191 deletions
src/components/LeaderManagement/CarDetails.vue
View file @ a646eb30
<template>
<div class="flexOne" style="min-width: 1200px;">
<!-- 表格 -->
<div style="width: 100%; height: auto;min-height:500px;overflow-x: auto;margin-top:20px" class="ownScrollbarStyle">
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
......@@ -13,10 +12,10 @@
<th>用车方式</th>
<th>出发地</th>
<th>目的地</th>
<th>{{$t('fnc.jine')}}</th>
<th>实付金额</th>
<th>币种</th>
<th>支付方式</th>
<th>附件</th>
<th style="width:150px;">附件</th>
<th>{{$t('pub.pubRemark')}}</th>
</tr>
<tr>
......@@ -54,12 +53,12 @@
<p v-if="item.ReimburseList.SettlementType==2">公司结算</p>
</td>
<td>
<div v-if="item.ReimburseList.VoucherPicList.length">
<div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex">
<template v-if="item.ReimburseList.VoucherPicList.length">
<div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex" >
<el-image style="width: 20px;height: 20px;" :src="vou.url" :preview-src-list="item.listUrl">
</el-image>
</div>
</div>
</template>
<div v-else>
无
</div>
......@@ -70,34 +69,23 @@
</tbody>
</table>
</div>
<!-- <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination> -->
</div>
</template>
<script>
import payURL from "../commonPage/payURL.vue";
import moment from "moment";
export default {
data() {
return {
msg: {
TCIDs: ''
TCIDs: '',
date: "",
},
dataList: [],
loading: false,
total: 0,
currentPage: 1,
showID: -1,
companyList: [],
employeeList: [],
urrencyTypeObj: {},
};
},
components: {},
created() {
let userInfo = this.getLocalStorage();
this.msg.TCIDs = this.$route.query.TCIDs ? this.$route.query.TCIDs : "";
this.msg.date = this.$route.query.date ? this.$route.query.date : "";
this.financeinfo_post_GetList();
......@@ -110,35 +98,10 @@
if (res.data.resultCode == 1) {
let data = res.data.data;
data.map(item => {
this.urrencyTypeObj[0] = "不限";
this.urrencyTypeObj[item.ID] = item.Name;
});
} else {
}
}, err => {})
},
goUrl: function (name, path, id) {
this.$router.push({
name: path,
query: {
id: id,
blank: "y",
tab: name
}
});
},
openImg(src) {
window.open(src, "_blank");
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
})
},
getList() {
this.loading = true;
......@@ -168,7 +131,7 @@
} else {
this.Error(res.data.message);
}
}, err => {})
})
},
},
mounted() {
......@@ -185,7 +148,6 @@
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
/* border-collapse: collapse; */
}
.groupTourOrderSearchTable tr th {
......
src/components/LeaderManagement/DinningDetails.vue
View file @ a646eb30
<template>
<div class="flexOne" style="min-width: 1200px;">
<!-- 表格 -->
<div style="width: 100%; height: auto;min-height:500px;overflow-x: auto;margin-top:20px" class="ownScrollbarStyle">
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
......@@ -12,7 +11,7 @@
<th>用餐人数</th>
<th>单价</th>
<th>{{$t('fnc.jine')}}</th>
<th>实付</th>
<th>实付金额</th>
<th>币种</th>
<th>支付方式</th>
<th>附件</th>
......@@ -48,24 +47,23 @@
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{diningTotalPrice2(subItem, subItem.ReimburseList.ReimburseDetailsList)}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{urrencyTypeObj[subItem.ReimburseList.CurrencyId]}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<br />
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{urrencyTypeObj[subItem.ReimburseList.CurrencyId]}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
<div v-if="subItem.ReimburseList.VoucherPicList.length">
<div v-for="(vou, vouIndex) in subItem.ReimburseList.VoucherPicList" :key="vouIndex">
<el-image style="width: 20px;height: 20px;" :src="vou.url" :preview-src-list="subItem.listUrl">
</el-image>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div>
</div>
<div v-else>
......@@ -87,21 +85,16 @@
data() {
return {
msg: {
TCIDs: ''
TCIDs: '',
date: ""
},
dataList: [],
loading: false,
total: 0,
currentPage: 1,
showID: -1,
companyList: [],
employeeList: [],
urrencyTypeObj: {},
};
},
components: {},
created() {
let userInfo = this.getLocalStorage();
this.msg.TCIDs = this.$route.query.TCIDs ? this.$route.query.TCIDs : "";
this.msg.date = this.$route.query.date ? this.$route.query.date : "";
this.financeinfo_post_GetList();
......@@ -125,6 +118,7 @@
}
return this.moneyFormat(totalPrice)
},
//计算实付金额
diningTotalPrice2(sObj, obj) {
let totalPrice = 0
obj.forEach(x => {
......@@ -139,34 +133,10 @@
if (res.data.resultCode == 1) {
let data = res.data.data;
data.map(item => {
this.urrencyTypeObj[0] = "不限";
this.urrencyTypeObj[item.ID] = item.Name;
});
} else {
}
}, err => {})
},
goUrl: function (name, path, id) {
this.$router.push({
name: path,
query: {
id: id,
blank: "y",
tab: name
}
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
openImg(src) {
window.open(src, "_blank");
})
},
getList() {
this.loading = true;
......@@ -198,7 +168,7 @@
} else {
this.Error(res.data.message);
}
}, err => {})
})
},
},
mounted() {
......@@ -225,7 +195,6 @@
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
/* border-collapse: collapse; */
}
.groupTourOrderSearchTable tr th {
......
src/components/LeaderManagement/leaderPayTicketDetail.vue
View file @ a646eb30
......@@ -18,10 +18,11 @@
<th>附件</th>
<th>{{$t('pub.pubRemark')}}</th>
</tr>
<template v-for='(item,index) in dataList'>
<template v-for='(item,index) in dataList'>
<template v-for="(subItem,subIndex) in item.ScenicStatisticsList">
<tr v-for="(childItem,childIndex) in subItem.ReimburseList.ReimburseDetailsList">
<td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">{{item.UseTimeStr}}</td>
<td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">{{item.UseTimeStr}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
{{subItem.ScenicName}}
</td>
......@@ -30,9 +31,7 @@
</td>
<td>{{childItem.UserNum}}</td>
<td>
<p>
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
</p>
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
</td>
<td>
{{moneyFormat(childItem.UnitPrice*childItem.UserNum)}}
......@@ -43,7 +42,7 @@
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<br />
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
......@@ -52,12 +51,8 @@
<td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
<div v-if="subItem.ReimburseList.VoucherPicList.length">
<div v-for="(vou, vouIndex) in subItem.ReimburseList.VoucherPicList" :key="vouIndex">
<el-image
style="width: 20px;height: 20px;"
:src="vou.url"
:preview-src-list="subItem.listUrl">
</el-image>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
<el-image style="width: 20px;height: 20px;" :src="vou.url" :preview-src-list="subItem.listUrl">
</el-image>
</div>
</div>
<div v-else>
......@@ -74,75 +69,78 @@
</div>
</template>
<script>
export default {
data() {
return {
loading: true,
dataList: [],
currencyList: [],
};
},
mounted() {
let TCIDs = this.$route.query.TCIDs;
let date = this.$route.query.date;
this.getList(TCIDs, date);
},created(){
this.apipost("financeinfo_post_GetList", {Name: ""}, res=>{
if (res.data.resultCode === 1) {
let data = res.data.data;
this.currencyList = data
}
}, null)
},
filters: {},
methods: {
getCurrencyStr: function(id){
for(let i = 0; i < this.currencyList.length; i++) {
if (this.currencyList[i].ID == id) {
return this.currencyList[i].Name
}
}
export default {
data() {
return {
loading: true,
dataList: [],
currencyList: [],
};
},
openImg(src){
window.open(src, "_blank");
mounted() {
let TCIDs = this.$route.query.TCIDs;
let date = this.$route.query.date;
this.getList(TCIDs, date);
},
//获取数据
getList(TCIDs, date) {
this.loading = true;
this.apipost(
"dmcstatistics_post_GetNewLeaderPayMoneyStatics",
{TCIDs: TCIDs},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
let data = res.data.data.ScenicList;
let dataList = [];
if(date!=='all') {
data.map(x=>{
if (x.UseTimeStr == date){
dataList.push(x)
}
})
created() {
this.apipost("financeinfo_post_GetList", {
Name: ""
}, res => {
if (res.data.resultCode === 1) {
let data = res.data.data;
this.currencyList = data
}
}, null)
},
filters: {},
methods: {
getCurrencyStr: function (id) {
for (let i = 0; i < this.currencyList.length; i++) {
if (this.currencyList[i].ID == id) {
return this.currencyList[i].Name
}
}
},
//获取数据
getList(TCIDs, date) {
this.loading = true;
this.apipost(
"dmcstatistics_post_GetNewLeaderPayMoneyStatics", {
TCIDs: TCIDs
},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
let data = res.data.data.ScenicList;
console.log("data", data);
let dataList = [];
if (date !== 'all') {
data.map(x => {
if (x.UseTimeStr == date) {
dataList.push(x)
}
})
} else {
dataList = data
}
dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y => {
y.listUrl = []
y.ReimburseList.VoucherPicList && y.ReimburseList.VoucherPicList.forEach(z => {
y.listUrl.push(z.url)
})
})
});
this.dataList = dataList;
} else {
dataList = data
this.Error(res.data.message);
}
dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{
y.listUrl = []
y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
y.listUrl.push(z.url)
})
})
});
this.dataList = dataList;
} else {
this.Error(res.data.message);
}
},
null
);
},
}
};
},
null
);
},
}
};
</script>
src/components/SingleAirTicket/douyinSellOrder.vue
View file @ a646eb30
......@@ -585,7 +585,6 @@
this.UpdateApply.OperateContentList.splice(i, 1);
},
setStatus: function (item) {
console.log("item", item);
this.UpdateApply.Id = item.Id;
this.UpdateApply.OperateContentList = [];
if (item.OperateContent && item.OperateContent.length > 0) {
......
src/components/leaderPay2.vue
View file @ a646eb30
......@@ -271,7 +271,6 @@
padding: 10px;
}
/* tr._t_head th{border-top: 1px solid #e5e5e5;} */
tr._item_list td:first-child {
border-left: 1px solid #e5e5e5;
}
......@@ -407,17 +406,18 @@
<template v-for='(item,index) in ScenicDataList'>
<template v-for="(subItem,subIndex) in item.data">
<tr v-for="(childItem,childIndex) in subItem.TicketPriceList">
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">{{item.UseTimeStr}}</td>
<td v-if="childIndex==0 && subIndex == 0" :rowspan="item.row">
<td v-if="childIndex==0 &&subIndex==0" :rowspan="item.row">{{item.UseTimeStr}}</td>
<td v-if="childIndex==0 " :rowspan="subItem.TicketPriceList.length">
{{subItem.ScenicName}}
</td>
<td>
{{peopleStrToWord(childItem.PeopleType)}}:{{childItem.UsePeopleNum}}
{{peopleStrToWord(childItem.PeopleType)}}
</td>
<td>
<p>
{{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
</p>
{{childItem.UsePeopleNum}}
</td>
<td>
{{childItem.TradingPrice}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
<span v-if="subItem.PayStyle === 1">现付</span>
......@@ -429,22 +429,20 @@
<br />
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td>
{{subItem.PayStyle === 1 ? moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{scenicTotalPrice(subItem, subItem.TicketPriceList)}}
</td>
<td v-if="childIndex==0 && subIndex == 0" :rowspan="item.row">
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{subItem.TradingTotalPrice}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{subItem.Remarks}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length"><span
class="cursorpointer text-decoratio" @click="godetail('ticket', subItem)">明细</span></td>
<td v-if="childIndex==0 &&subIndex==0" :rowspan="item.row"><span class="cursorpointer text-decoratio"
@click="godetail('ticket', subItem)">明细</span></td>
</tr>
</template>
</template>
......@@ -852,7 +850,7 @@
type="button" value="地接费结算制单" style="" class="leader2Btn" @click="goZhiDan(item)">
<span v-else style="color:red">请在APP中提交实际用款详情信息</span>
<input type="button" value="地接费结算制单" class="leader2Btn" @click="goZhiDan(item)">
<input type="button" value="地接费结算制单" class="leader2Btn" @click="goZhiDan(item)">
<input style="margin-top:15px" v-if="item.FinanceIds && item.FinanceIds.length>0" type="button" value="退款制单"
class="leader2Btn" @click="gofzZd(item)">
</td>
......@@ -996,7 +994,6 @@
<td>{{Sitem.CreateByStr}}</td>
</tr>
</template>
</table>
<!-- 预付款冲抵 -->
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0">
......@@ -1006,7 +1003,6 @@
</tr>
<tr v-for="(item, index) in TotalNav">
<td colspan="4">{{item.TCNUMS}}</td>
<td colspan="4">
<input type="button" value="制单" class="leader2Btn" @click="ZhiDanChongDi(item)">
</td>
......@@ -1138,8 +1134,8 @@
<input type="button" :value="$t('pub.searchBtn')" class="leader2Btn" @click="czgetList">
</el-form-item>
<el-form-item label="交易日期">
<el-date-picker v-model="czdateList" type="daterange" :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')">
<el-date-picker v-model="czdateList" type="daterange" :range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')">
</el-date-picker>
</el-form-item>
......@@ -1218,7 +1214,8 @@
<td colspan="12">{{$t('system.content_noData')}}</td>
</tr>
</table>
<input type="checkbox" v-model="isNotCurrency"><span style="color:dodgerblue; font-size: 10px;">使用其他币种(将使用系统实时汇率)</span>
<input type="checkbox" v-model="isNotCurrency"><span
style="color:dodgerblue; font-size: 10px;">使用其他币种(将使用系统实时汇率)</span>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="cdState1=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="goUrlfk">{{$t('pub.sureBtn')}}</button>
......@@ -1466,11 +1463,9 @@
let arr = [];
that.fkZDmsg.ReFinanceId = this.checkList1[0].FinanceId;
if(this.isNotCurrency)
{
that.fkZDmsg.Rate=0;
}
else {
if (this.isNotCurrency) {
that.fkZDmsg.Rate = 0;
} else {
that.fkZDmsg.Rate = this.checkList1[0].Rate;
}
var msg = JSON.stringify(that.fkZDmsg);
......
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