Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 664433a0 3eb2f16f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 694 additions and 203 deletions
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 763a48a8
......@@ -528,6 +528,7 @@
<SaleOrderModule v-if="OrderSource==10&&SourceID&&OrderID" :SourceID='SourceID' :OrderID='OrderID'/>
<TicketFinace v-if="OrderSource==4&&SourceID&&Callback&&ID" :SourceID='SourceID' :Callback='Callback' :id='ID'/>
<TicketingModule v-if="OrderSource==9&&FrID&&ID" :FrID='FrID' :id='ID'/>
<ChongDiPage v-if="GetDetail.Type === 7 || isChongDi" :dataList="ChongDiList" :type="danjuType"/>
</div>
<div class="_tit _tit2 w890px">
......@@ -784,6 +785,7 @@ import teamProductModule from "../commonPage/teamProductModule.vue";
import TicketFinace from "../commonPage/TicketFinace.vue";
import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
import TicketingModule from "../commonPage/TicketingModule.vue";
import ChongDiPage from "../commonPage/ChongDiPage.vue";
import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
export default {
data(){
......@@ -847,6 +849,9 @@ export default {
currentPage:1,
total: 0,
},
isChongDi: false,
ChongDiList: [],
danjuType: ''
}
},components:{
'my-FlowChartModule': myFlowChartModule,
......@@ -860,6 +865,7 @@ export default {
'SaleOrderModule':SaleOrderModule,
'TicketFinace':TicketFinace,
'myDJieBill': myDJieBill,
'ChongDiPage': ChongDiPage,
},
created(){
this.ID = this.$route.query.id;
......@@ -867,6 +873,33 @@ export default {
let userinfo = this.getLocalStorage();
this.bossID = userinfo.EmployeeId;
},methods:{
// 获取冲抵列表
getChongDiList(data){
this.danjuType = data.Type
let cmd = 'Financial_post_GetHangingAccountList'
if (data.Type === 7){
cmd = 'Financial_post_GetHangingMatchFinanceList'
}
this.apipost(cmd,{FrID: data.FrID}, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
this.ChongDiList = data;
}
}, err => {})
},
chongJudge(data){
// 收支冲抵显示
let p1 = false;
data.DetailList.map(item=>{
if (item.CostTypeName === '挂账单冲抵') {
p1 = true
}
})
if (p1 || data.Type === 7) {
this.isChongDi = true;
this.getChongDiList(data)
}
},
goUrl(path, id) {
this.$router.push({
name: path,
......@@ -1193,6 +1226,7 @@ export default {
}
})
}
this.chongJudge(data)
this.GetDetail = data;
// 截取掉驳回后面的审核步骤
this.ZhiDanRen = this.GetDetail.CreatBy;
......
src/components/SalesVisa/VisaProduct.vue
View file @ 763a48a8
......@@ -291,8 +291,8 @@
</li>
<li>
<button class="hollowFixedBtn" @click="getList()">查询</button>
<button class="normalBtn" v-show="!buttonshow" @click="cancelEdit(),addShow=true" v-if="msg.isFinacial==1">添加</button>
<button class="normalBtn" v-show="buttonshow" @click="AddVisaProduct" v-if="msg.isFinacial==1">添加(新)</button>
<!-- <button class="normalBtn" v-show="!buttonshow" @click="cancelEdit(),addShow=true" v-if="msg.isFinacial==1">添加</button> -->
<button class="normalBtn" @click="AddVisaProduct" v-if="msg.isFinacial==1">添加</button>
</li>
</ul>
</div>
......@@ -395,7 +395,7 @@
</td>
<td class="groupTourOrderIcon">
<el-button-group>
<el-tooltip
<!-- <el-tooltip
class="item"
effect="dark"
content="修改"
......@@ -408,15 +408,15 @@
icon="iconfont icon-img_bianji_small"
@click="getDetail(item)"
></el-button>
</el-tooltip>
</el-tooltip> -->
<el-tooltip
class="item"
effect="dark"
content="修改(新)"
content="修改"
placement="top-start"
v-if="item.SendVisaStatus==1&&msg.isFinacial==1"
>
<el-button v-show="buttonshow"
<el-button
type="primary"
style="background:#409EFF; border-color:#409EFF"
icon="iconfont icon-img_bianji_small"
......@@ -665,15 +665,15 @@ export default {
addShow: false,
currentPage: 1,
VisaManagementList: [],
buttonshow:false,
// buttonshow:false,
Type:0,
};
},
created(){
let locationName = window.location.hostname;
if (locationName.indexOf('viitto') !== -1 || locationName.indexOf('www') !== -1){
this.buttonshow=true;
}
// let locationName = window.location.hostname;
// if (locationName.indexOf('viitto') !== -1 || locationName.indexOf('www') !== -1){
// this.buttonshow=true;
// }
},
methods: {
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 763a48a8
......@@ -193,7 +193,6 @@
<div>应收：<span>￥{{moneyFormat(moneyAll.otheryTotalyf)}}</span></div>
<div>实收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalsf)}}</span></div>
<div>待收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalyf-moneyAll.otheryTotalsf)}}</span></div>
<div>挂账总收入：<span>￥{{moneyFormat(AllCont.Income)}}</span></div>
<!--<div>
注：应收=订单应收总额，实收=订单实收总额
</div>-->
......@@ -211,7 +210,6 @@
<div>应付：<span>￥{{DataList.TeamBalance.ShouldPay}}</span></div>
<div>实付：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualPay}}</span></div>
<div>待付：<span class="Team_Coins">￥{{DataList.TeamBalance.WaitPay}}</span></div>
<div>挂账总支出：<span>￥{{moneyFormat(AllCont.Expend)}}</span></div>
<div>
注：成本单据总额(包含退款)+提成-小费收入-地接收入
</div>
......@@ -229,7 +227,7 @@
<div>实际利润：<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div>
<div>当前利润：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
<div>
注：实收-(应付/实付)+佣金收入+自费收入-联运成本
注：实收-(应付/实付)+佣金收入+自费收入-联运成本+挂账总收入-挂账总支出+冲抵总收入-冲抵总支出
</div>
</div>
</div>
......@@ -251,20 +249,21 @@
<div>联运成本：<span>￥{{DataList.LYCB}}</span></div>
</div>
</el-col>
<!-- <el-col :span="4">
<el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
<i class="iconfont icon-qian"></i>
</span>挂账信息
</div>
<div class="Team_Incontent">
<div>挂账总金额：<span>￥{{moneyFormat(AllCont.Income - AllCont.Expend)}}</span></div>
<div>挂账总支出：<span>￥{{moneyFormat(AllCont.Expend)}}</span></div>
<div>挂账总收入：<span>￥{{moneyFormat(AllCont.Income)}}</span></div>
<div class="Team_Incontent">
<div>挂账总收入：<span>￥{{moneyFormat(DataList.TeamBalance.GZIncome)}}</span></div>
<div>挂账总支出：<span>￥{{moneyFormat(DataList.TeamBalance.GZExpend)}}</span></div>
<div>冲抵总收入：<span>￥{{moneyFormat(DataList.TeamBalance.CDIncome)}}</span></div>
<div>冲抵总支出：<span>￥{{moneyFormat(DataList.TeamBalance.CDExpend)}}</span></div>
</div>
</div>
</el-col> -->
</el-col>
<el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">
......@@ -1079,6 +1078,81 @@
</template>
</table>
</div>
<div class="Team_collection" v-loading="loading">
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">挂账冲抵</div>
</div>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">冲抵单据：</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">挂账金额</th>
<th width="500">挂账类型</th>
<th width="500">挂账对象</th>
<th width="500">单据状态</th>
<th width="300">创建时间</th>
<th width="200">创建人</th>
</tr>
<tr v-for="item in DataList.CDList">
<td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td>
<span>{{item.Money}}</span>
</td>
<td>
<span>{{item.HangingAccountsTypeStr}}</span>
</td>
<td>
<span>{{item.RemitterName}}：{{item.AccountNumber}}</span>
</td>
<td>
<span>{{item.StatusStr}}</span>
</td>
<td>
<span>{{item.CreateDateStr}}</span>
</td>
<td>
<span>{{item.createByStr}}</span>
</td>
</tr>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">挂账单据：</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">挂账金额</th>
<th width="500">挂账类型</th>
<th width="500">挂账对象</th>
<th width="500">单据状态</th>
<th width="300">创建时间</th>
<th width="200">创建人</th>
</tr>
<tr v-for="item in DataList.GuaZhangList">
<td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td>
<span>{{item.Money}}</span>
</td>
<td>
<span>{{item.HangingAccountsTypeStr}}</span>
</td>
<td>
<span>{{item.RemitterName}}：{{item.AccountNumber}}</span>
</td>
<td>
<span>{{item.StatusStr}}</span>
</td>
<td>
<span>{{item.CreateDateStr}}</span>
</td>
<td>
<span>{{item.createByStr}}</span>
</td>
</tr>
</table>
</div>
<div class="Team_collection" v-loading="loading">
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">非成本</div>
......@@ -1250,43 +1324,6 @@
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">挂账单据：</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">挂账金额</th>
<th width="500">挂账类型</th>
<th width="500">挂账对象</th>
<th width="500">单据状态</th>
<th width="300">创建时间</th>
<th width="200">创建人</th>
</tr>
<tr v-for="item in HangingList">
<td>
<span>{{item.FrID}}</span>
</td>
<td>
<span>{{item.Money}}</span>
</td>
<td>
<span>{{item.HangingAccountsTypeStr}}</span>
</td>
<td>
<span>{{item.RemitterName}}：{{item.AccountNumber}}</span>
</td>
<td>
<span>{{item.StatusStr}}</span>
</td>
<td>
<span>{{item.CreateDateStr}}</span>
</td>
<td>
<span>{{item.createByStr}}</span>
</td>
</tr>
</table>
</div>
</div>
<div class="Team_BtnList" v-if="IsHaveAuth">
......@@ -1389,37 +1426,10 @@
otheryTotalyf: 0,
otheryTotalsf: 0,
},
AllCont: {
Income: 0,
Expend: 0,
},
HangingList: [],
};
},
methods: {
getAllCont: function () {
let msg = {
TCID: this.TCID,
// FrID: 0,
// UpdateBy: '-1',
// RB_Branch_Id: -1,
// RB_Depart_Id: -2,
// sDate: '',
// eDate: '',
// Status: '-1',
// sTradeDate: '',
// eTradeDate: '',
// EmployeeId: 0,
// ClientType: 0,
}
this.apipost('Financial_post_GetHangingAccountTotalPrice', msg, res => {
if (res.data.resultCode === 1) {
this.AllCont = res.data.data;
} else {
this.$message.error(res.data.message)
}
}, null)
},
//判断数组包含字符串
isExists(array, str) {
var flag = false;
......@@ -1758,19 +1768,6 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
}
});
},
getHangingAccountByTCIDList: function () {
this.apipost(
'Financial_post_GetHangingAccountByTCIDList', {
TCID: this.TCID
},
res => {
if (res.data.resultCode == 1) {
this.HangingList = res.data.data
}
},
err => {}
)
},
//权限验证
checkHasAuth() {
// this.apipost(
......@@ -1801,8 +1798,6 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
}
this.checkHasAuth();
this.getList();
this.getAllCont();
this.getHangingAccountByTCIDList();
}
};
......
src/components/commonPage/ChongDiPage.vue 0 → 100644
View file @ 763a48a8
<style>
@import url('../../assets/css/domestic/TicketingModule.css');
</style>
<template>
<div v-if="dataList.length < 1">
</div>
<div v-else>
<div class="m_TicketingModule" v-if="type !== 7">
<div class="_tit">
<span class="_text">挂账冲抵列表</span>
<div>
<span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</div>
</div>
<div v-show="tableShow" class="_padding_20_15">
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr>
<th>费用类型</th>
<th>团号</th>
<th>财务单据</th>
<th>收支类型</th>
<th>冲抵金额</th>
<th>对象名称</th>
<th>备注</th>
<th>制单时间</th>
<th>制单人</th>
</tr>
<tr v-for="(item, index) in dataList" :key="index">
<td>{{item.CostTypeName}}</td>
<td>{{item.TCNUM}}</td>
<td>{{item.FrID}}</td>
<td>{{item.HangingAccountsTypeStr}}</td>
<td>{{item.fmrMoney}}</td>
<td>{{item.RemitterName}}</td>
<td>{{item.Remark}}</td>
<td>{{item.CreateDateStr}}</td>
<td>{{item.createByStr}}</td>
</tr>
</table>
</div>
</div>
<div v-else class="m_TicketingModule" >
<div class="_tit">
<span class="_text">挂账冲抵列表</span>
<div>
<span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</div>
</div>
<div v-show="tableShow" class="_padding_20_15">
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr>
<th>财务单据</th>
<th>费用类型</th>
<th>收支类型</th>
<th>金额</th>
<th>备注</th>
<th>制单时间</th>
<th>制单人</th>
</tr>
<tr v-for="(item, index) in dataList" :key="index">
<td>{{item.FrID}}</td>
<td>
<span v-for="(t, index) in item.DetailList">{{t.CostTypeName}} <span v-if="index!==item.DetailList.length-1">,</span> </span>
</td>
<td>{{item.Type === 1 ? '收' : '支'}}</td>
<td>{{item.Money}}</td>
<td>{{item.Remark}}</td>
<td>{{item.CreateDateStr}}</td>
<td>{{item.createByStr}}</td>
</tr>
</table>
</div>
</div>
</div>
</template>
<script>
export default {
props:["dataList", 'type'],
data(){
return{
tableShow:false,
}
},watch:{
},created(){
},mounted(){
},methods:{
}
}
</script>
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