Commit 31f5578f authored by youjie's avatar youjie

平台对照、附件查看

parent 15473611
......@@ -686,6 +686,15 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="金蝶状态:">
<el-select v-model='msg.KingdeeMark'>
<el-option key="0" value="0" label="不限"></el-option>
<el-option key="1" value="1" label="已导入"></el-option>
<el-option key="2" value="2" label="未导入"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单日期:">
<el-date-picker style="width: 100%;" class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
value-format="yyyy-MM-dd">
......@@ -719,6 +728,7 @@
</span>
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">导出</button>
<button v-if="DataList&&DataList.length>0" class="hollowFixedBtn" @click="Markers">标记</button>
</li>
</ul>
<!-- <div style="text-align: right;">
......@@ -931,7 +941,8 @@
BranchIds:'',
AccountIdStr:'',
ColorType:1,//和平
ImportType:1
ImportType:1,
KingdeeMark: '0',
},
BranchIds:[],
getCompanyMsg: { // 公司
......@@ -1092,6 +1103,40 @@
},
methods: {
Markers(){
this.$confirm('是否确认标记此查询条件的下所有财务单据以导入至金蝶?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.SetFinanceToKingdeeMark()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
},
SetFinanceToKingdeeMark(){
if(this.msg.FrID===''){
this.msg.FrID = 0
}
if(this.BranchIds.length>0){
let ids = JSON.parse(JSON.stringify(this.BranchIds)).join(',')
this.msg.BranchIds = ids
}else{
this.msg.BranchIds = ''
}
this.apipost('Financial_post_SetFinanceToKingdeeMark', this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getPageList()
} else {
this.Error(res.data.message);
}
}, err => {})
},
typeCancel(){
for(let i=0;i<this.typeList.length;i++){
this.typeList[i].AccountType = ''
......
......@@ -84,6 +84,9 @@
<!-- 现金 -->
<cashForm v-if="titleType==3" :list="RCashList" :loading="loading" @clickEdit="clickEdit" @success="getList"
:type="titleType"></cashForm>
<!-- 平台 -->
<bankForm v-if="titleType==4" :list="RPlatfromList" :loading="loading" @clickEdit="clickEdit" @success="getList"
:type="titleType"></bankForm>
<!-- 费用 -->
<costForm v-if="titleType==1" :list="RCostList" :loading="loading" @clickEdit="clickEdit" @success="getList"
:type="titleType"></costForm>
......@@ -154,6 +157,10 @@
Name: '现金',
Id: 3
},
{
Name: '平台',
Id: 4
},
{
Name: '费用',
Id: 1
......@@ -198,6 +205,10 @@
Name: '现金对照表',
Id: 3
},
{
Name: '平台对照表',
Id: 4
},
{
Name: '费用对照表',
Id: 1
......@@ -208,6 +219,7 @@
},
RBankList: [], //银行
RCashList: [], //现金
RPlatfromList: [],//平台
RCostList: [], //费用
loading: false,
outerVisible: false,
......@@ -316,6 +328,9 @@
if (item.Id == 3) {
this.text = '新增现金对照表'
}
if (item.Id == 4) {
this.text = '新增平台对照表'
}
if (item.Id == 1) {
this.text = '新增费用对照表'
}
......@@ -356,6 +371,7 @@
if (res.data.resultCode == 1) {
this.RBankList = res.data.data.RBankList;
this.RCashList = res.data.data.RCashList;
this.RPlatfromList = res.data.data.RPlatfromList;
this.RCostList = res.data.data.RCostList;
} else {
this.Error(res.data.message);
......
......@@ -147,12 +147,21 @@
<el-input v-model="msg.OrderID"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="4">
<el-form-item label="金额:">
<el-input v-model="msg.sMoney" class="w64d5" @keyup.native="checkPrice(msg,'sMoney')"></el-input>-
<el-input v-model="msg.eMoney" @keyup.native="checkPrice(msg,'eMoney')" class="w64d5"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="金蝶状态:">
<el-select v-model='msg.KingdeeMark'>
<el-option key="0" value="0" label="不限"></el-option>
<el-option key="1" value="1" label="已导入"></el-option>
<el-option key="2" value="2" label="未导入"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单日期:">
<el-date-picker class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
......@@ -685,6 +694,7 @@
Remark: '', //备注查询
Sort: '2',
EmployeeId: '',
KingdeeMark: '0',
},
getCompanyMsg: { // 公司
RB_Group_Id: '0',
......
<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'>
<tr class="title_tr">
<th>日期</th>
<th>日期</th>
<th>司机</th>
<th>计划金额</th>
<th>车配号</th>
......@@ -17,7 +17,7 @@
<th>金额</th>
<th>币种</th>
<th>支付方式</th>
<th>附件</th>
<th>附件</th>
<th>备注</th>
</tr>
<tr>
......@@ -50,7 +50,7 @@
{{s.UnitPrice}}
</p>
</td>
<td>{{urrencyTypeObj[item.ReimburseList.CurrencyId]}}</td>
<td>{{urrencyTypeObj[item.ReimburseList.CurrencyId]}}</td>
<td>
<p v-if="item.ReimburseList.SettlementType==1">现金支付</p>
<p v-if="item.ReimburseList.SettlementType==2">公司结算</p>
......@@ -58,16 +58,21 @@
<td >
<div v-if="item.ReimburseList.VoucherPicList.length">
<div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex">
<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>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div>
</div>
<div v-else>
</div>
</td>
</td>
<td>{{item.ReimburseList.Remarks}}</td>
</tr>
</tbody>
</table>
</div>
......@@ -117,7 +122,7 @@ export default {
}
},err=>{})
},
goUrl: function(name, path, id) {
this.$router.push({
name: path,
......@@ -136,11 +141,11 @@ export default {
this.currentPage = 1;
},
getList() {
this.loading = true;
this.apipost('dmcstatistics_post_GetNewLeaderPayMoneyStatics', this.msg, res => {
this.loading=false;
if(res.data.resultCode == 1) {
this.dataList = [];
let data=res.data.data.BusList;
......@@ -153,13 +158,21 @@ export default {
}else{
this.dataList=data;
}
this.dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{
y.listUrl = []
y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
y.listUrl.push(z.url)
})
})
});
} else {
this.Error(res.data.message);
}
}, err => {})
},
},
mounted() {
this.getList();
......
<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'>
<tr class="title_tr">
<th>日期</th>
<th>日期</th>
<th>餐厅名称</th>
<th>计划金额</th>
<th>类别</th>
......@@ -16,7 +16,7 @@
<th>实付</th>
<th>币种</th>
<th>支付方式</th>
<th>附件</th>
<th>附件</th>
<th>备注</th>
</tr>
<tr>
......@@ -28,7 +28,7 @@
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">{{item.UseTimeStr}}</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.DiningName}}
</td>
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{childItem.TotalPrice}}
</td>
......@@ -60,20 +60,25 @@
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{urrencyTypeObj[subItem.ReimburseList.CurrencyId]}}
</td>
</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">
<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>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div>
</div>
<div v-else>
</div>
</td>
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.ReimburseList.Remarks}}
</td>
</td>
</tr>
</template>
</template>
......@@ -168,11 +173,11 @@ export default {
window.open(src, "_blank");
},
getList() {
this.loading = true;
this.apipost('dmcstatistics_post_GetNewLeaderPayMoneyStatics', this.msg, res => {
this.loading=false;
if(res.data.resultCode == 1) {
this.dataList = [];
let data=res.data.data.DiningList;
......@@ -185,13 +190,21 @@ export default {
}else{
this.dataList=data;
}
this.dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{
y.listUrl = []
y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
y.listUrl.push(z.url)
})
})
});
} else {
this.Error(res.data.message);
}
}, err => {})
},
},
mounted() {
this.getList();
......@@ -201,7 +214,7 @@ export default {
<style scoped>
.numSpan{
display: inline-block;
width:60px;
width:60px;
}
.widthSpan{
display: inline-block;
......
<style>
<style>
</style>
<template>
<div class="flexOne leaderPayHotelDetail">
<div class="flexOne leaderPayHotelDetail">
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
......@@ -14,9 +14,9 @@
<th>单价/人</th>
<th>金额小计</th>
<th>支付方式</th>
<th>币种</th>
<th>附件</th>
<th>备注</th>
<th>币种</th>
<th>附件</th>
<th>备注</th>
</tr>
<template v-for='(item,index) in dataList'>
<template v-if="item.ReimburseList && item.ReimburseList.ReimburseDetailsList.length">
......@@ -24,7 +24,7 @@
<td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">{{item.CheckInDateStr}}</td>
<td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
{{item.HotelName}}
</td>
</td>
<td>
{{childItem.UserTypeStr}}
</td>
......@@ -48,57 +48,62 @@
</td>
<td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
{{getCurrencyStr(item.ReimburseList.CurrencyId)}}
</td>
</td>
<td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
<div v-if="item.ReimburseList.VoucherPicList.length">
<div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex">
<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>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div>
</div>
<div v-else>
</div>
</td>
</td>
<td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
{{item.ReimburseList.Remarks}}
</td>
</td>
</tr>
</template>
<tr v-else>
<td colspan="9">暂无数据</td>
</tr>
</template>
</table>
</div>
</template>
<script>
export default {
data() {
return {
loading: true,
dataList: [],
loading: true,
dataList: [],
currencyList: [],
};
},created(){
this.apipost("financeinfo_post_GetList", {Name: ""}, res=>{
if (res.data.resultCode === 1) {
let data = res.data.data;
this.currencyList = data
this.currencyList = data
}
}, null)
},
mounted() {
let TCIDs = this.$route.query.TCIDs;
let date = this.$route.query.date;
this.getList(TCIDs, date);
this.getList(TCIDs, date);
},
filters: {},
methods: {
getCurrencyStr: function(id){
getCurrencyStr: function(id){
for(let i = 0; i < this.currencyList.length; i++) {
if (this.currencyList[i].ID == id) {
return this.currencyList[i].Name
......@@ -130,6 +135,14 @@ export default {
dataList.push(...x.HotelOrderList)
})
}
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);
......@@ -137,7 +150,7 @@ export default {
},
null
);
},
},
}
};
</script>
\ No newline at end of file
</script>
<style>
<style>
</style>
<template>
<div class="flexOne leaderPayHotelDetail">
<div class="flexOne leaderPayHotelDetail">
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
......@@ -14,9 +14,9 @@
<th>单价/人</th>
<th>金额小计</th>
<th>支付方式</th>
<th>币种</th>
<th>附件</th>
<th>备注</th>
<th>币种</th>
<th>附件</th>
<th>备注</th>
</tr>
<template v-for='(item,index) in dataList'>
<template v-for="(subItem,subIndex) in item.ScenicStatisticsList">
......@@ -24,7 +24,7 @@
<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>
</td>
<td>
{{childItem.UserTypeStr}}
</td>
......@@ -48,20 +48,25 @@
</td>
<td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
{{getCurrencyStr(subItem.ReimburseList.CurrencyId)}}
</td>
</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">
<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>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div>
</div>
<div v-else>
</div>
</td>
</td>
<td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
{{subItem.ReimburseList.Remarks}}
</td>
</td>
</tr>
</template>
</template>
......@@ -72,27 +77,27 @@
export default {
data() {
return {
loading: true,
dataList: [],
loading: true,
dataList: [],
currencyList: [],
};
},
mounted() {
let TCIDs = this.$route.query.TCIDs;
let date = this.$route.query.date;
this.getList(TCIDs, 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
this.currencyList = data
}
}, null)
},
filters: {},
methods: {
getCurrencyStr: function(id){
methods: {
getCurrencyStr: function(id){
for(let i = 0; i < this.currencyList.length; i++) {
if (this.currencyList[i].ID == id) {
return this.currencyList[i].Name
......@@ -122,6 +127,14 @@ export default {
} 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 {
this.Error(res.data.message);
......@@ -129,7 +142,7 @@ export default {
},
null
);
},
},
}
};
</script>
\ No newline at end of file
</script>
<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'>
<tr class="title_tr">
<th width="300">日期</th>
<th width="300">日期</th>
<th>金额</th>
<th>备注</th>
<th>附件</th>
<th>附件</th>
</tr>
<template v-for='(item, index) in dataList'>
<tr :key="index">
......@@ -19,7 +19,12 @@
<td>
<div v-if="item.VoucherPicList.length">
<div v-for="(vou, vouIndex) in item.VoucherPicList" :key="vouIndex">
<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>
<!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
</div>
</div>
<div v-else>
......@@ -79,11 +84,11 @@ export default {
window.open(src, "_blank");
},
getList() {
this.loading = true;
this.apipost('dmcstatistics_post_GetNewLeaderPayMoneyStatics', this.msg, res => {
this.loading=false;
if(res.data.resultCode == 1) {
this.dataList = [];
let data=res.data.data.OtherOrderInfo.OtherList;
......@@ -96,13 +101,21 @@ export default {
}else{
this.dataList=data;
}
this.dataList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{
y.listUrl = []
y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
y.listUrl.push(z.url)
})
})
});
} else {
this.Error(res.data.message);
}
}, err => {})
},
},
mounted() {
this.getList();
......@@ -112,7 +125,7 @@ export default {
<style scoped>
.numSpan{
display: inline-block;
width:60px;
width:60px;
}
.widthSpan{
display: inline-block;
......
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