Skip to content

S
SuperMan
Commit 17bb523d authored by liudong1993's avatar liudong1993
Browse files
Options

1 台湾结算

parent eae13327
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1027 additions and 0 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 17bb523d
......@@ -1164,6 +1164,9 @@
<!-- 相同对象付款单据 -->
<SamePayment v-if="GetDetail.Type==2&&GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0&&(GetDetail.DijieBathFinanceList==null || GetDetail.DijieBathFinanceList.length==0)" :GetDetail="GetDetail">
</SamePayment>
<!-- 台湾经营费关联 -->
<TaiwanWorkingExpense v-if="userInfo.RB_Group_id ==2 && (GetDetail.TemplateId==282 || GetDetail.TemplateId==283)" :GetDetail="GetDetail">
</TaiwanWorkingExpense>
<!-- 团成员已制单名单 -->
<template v-if="GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0">
<RollCall v-if="GetDetail.OrderSource==10&&
......@@ -2169,6 +2172,7 @@ class="w135 _border_b_1">
import orderFinancialPage from "./FinancialSubmodule/OrderFinancialPage.vue";
import CostmonthDetails from './components/CostmonthDetails';
import SamePayment from './components/SamePayment';
import TaiwanWorkingExpense from './components/TaiwanWorkingExpense';
import UserCredit from './components/UserCredit';
import RollCall from './components/RollCall'
import OrderReceivablesAccount from "./components/OrderReceivablesAccount.vue";
......@@ -2389,6 +2393,7 @@ class="w135 _border_b_1">
"orderFinancialPage":orderFinancialPage,
CostmonthDetails,
SamePayment,
TaiwanWorkingExpense,
UserCredit,
RollCall,
OrderReceivablesAccount,
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 17bb523d
......@@ -1223,6 +1223,9 @@
<SamePayment v-if="GetDetail.Type==2&&GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0"
:GetDetail="GetDetail">
</SamePayment>
<!-- 台湾经营费关联 -->
<TaiwanWorkingExpense v-if="userInfo.RB_Group_id ==2 && (GetDetail.TemplateId==282 || GetDetail.TemplateId==283)" :GetDetail="GetDetail">
</TaiwanWorkingExpense>
<!-- 团成员已制单名单 -->
<template v-if="GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0">
<RollCall v-if="GetDetail.OrderSource==10&&
......@@ -1596,6 +1599,7 @@
import dmcTravelBill from './FinancialSubmodule/DmcTravelBillModule'; //线路
import CostmonthDetails from './components/CostmonthDetails';
import SamePayment from './components/SamePayment';
import TaiwanWorkingExpense from './components/TaiwanWorkingExpense';
import UserCredit from './components/UserCredit';
import RollCall from './components/RollCall';
import OrderReceivablesAccount from "./components/OrderReceivablesAccount.vue";
......@@ -1718,6 +1722,7 @@
"dmcTravelBill": dmcTravelBill,
CostmonthDetails,
SamePayment,
TaiwanWorkingExpense,
UserCredit,
RollCall,
OrderReceivablesAccount,
......
src/components/FinancialModule/MonthlyCostStatement/components/selectSettlementData.vue 0 → 100644
View file @ 17bb523d
<template>
<div>
<el-dialog :title="`已选数据${dataList.length}条`"
:visible.sync="showDialog" center @close="close"
width="1000px">
<div style="max-height: 400px;overflow: auto;">
<el-table
:data="dataList"
tooltip-effect="dark"
style="width: 100%;"
>
<el-table-column
:label="$t('fnc.danhao')"
width="120">
<template slot-scope="scope">
<span>{{ scope.row.FrID }}</span>
</template>
</el-table-column>
<el-table-column
:label="$t('fnc.djleixing')"
width="120">
<template slot-scope="scope">
<span v-if="scope.row.TemplateId==281" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
line-height: 16px;
border-radius: 4px;">
分润收入
</span>
<span v-else-if="scope.row.TemplateId==283" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
line-height: 16px;
border-radius: 4px;">
经营费收入
</span>
<span v-else-if="scope.row.Type==2" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
line-height: 16px;
border-radius: 4px;">
成本支出
</span>
<span v-else-if="scope.row.Type==1" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
团费收入
</span>
</template>
</el-table-column>
<el-table-column
prop=""
label="原币金额"
show-overflow-tooltip width="150">
<template slot-scope="scope">
{{scope.row.WBMoney?scope.row.WBMoney+'/'+scope.row.CurrencyName:''}}
</template>
</el-table-column>
<el-table-column
prop=""
label="本位币金额"
show-overflow-tooltip width="150">
<template slot-scope="scope">
{{scope.row.Money}}
</template>
</el-table-column>
<el-table-column
prop=""
label="明细"
show-overflow-tooltip>
<template slot-scope="scope">
<div v-for="(x,index) in scope.row.DetailList" class="DetailList-box">
<p><span>费用:</span>{{x.CostTypeName}} &nbsp;</p>
<p><span>原币:</span>{{x.OriginalMoney}}&nbsp;</p>
<p><span>汇率:</span>{{x.Rate}} &nbsp;</p>
<p><span>本位币:</span>{{x.Money}}</p>
</div>
</template>
</el-table-column>
</el-table>
</div>
<div class="totalMoney-box">
<div>
<span>合计应付台湾：</span>
<span style="color: red;">{{OriginalMoney}}</span>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="close">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="clicksubmit">{{$t('pub.sureBtn')}}生成</el-button>
<el-select style="width: 90px;" filterable v-model="financeType" :placeholder="$t('pub.pleaseSel')">
<el-option label="结算调拨单" :value="1"></el-option>
</el-select>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
name:'selectListData',
props: ['multipleSelection'],
data() {
return {
showDialog: true,
financeType : 1,
MatchFrId:'',
dataList: [],
OriginalMoney: 0,//原币合计
};
},
watch: {
multipleSelection:{
handler(val, oldval) {
this.dataList = JSON.parse(JSON.stringify(val));
this.OriginalMoney = 0;
this.dataList.forEach(x=>{
x.DetailList.forEach(y=>{
if(x.TemplateId==281 || x.TemplateId==283 || x.Type==2){
this.OriginalMoney+=(y.Money *100)
}else{
this.OriginalMoney-=(y.Money *100)
}
});
})
this.OriginalMoney = (this.OriginalMoney)/100
},
deep: true,
immediate: true
}
},
methods: {
clicksubmit(){
let ids
ids = this.dataList.map(x=>{ return x.FrID})
this.$emit('close')
this.$router.push({
name: 'addCapitalAllocation',
query: {
'settlementFrIds': ids.join(','),
'tab': '新增资金调拨',
'blank': "y"
}
});
},
close(){
this.$emit('close')
},
},
mounted() {
}
};
</script>
<style scoped>
.DetailList-box{
display: flex;
}
.DetailList-box p{
color: black;
margin-right: 20px;
}
.DetailList-box p:last-child{
margin-right: 0;
}
.DetailList-box p span{
margin-right: 3px;
color: #666666;
}
.totalMoney-box{
display: flex;
justify-content: end;
align-items: center;
padding: 10px 0;
}
.totalMoney-box>div{
display: flex;
align-items: center;
margin-left: 20px;
}
.totalMoney-box>div>span{
flex-shrink: 0;
}
</style>
src/components/FinancialModule/addCapitalAllocation.vue
View file @ 17bb523d
......@@ -495,6 +495,11 @@ export default {
delete x.shouAccNumList
})
if(this.$route.query.settlementFrIds){
this.msg.IsDiJieSelect=955;//代号
this.msg.ReFinanceIds=this.$route.query.settlementFrIds;
}
if(this.$route.query.frIds){
this.msg.FrIDs=this.$route.query.frIds;
}
......
src/components/FinancialModule/components/TaiwanWorkingExpense.vue 0 → 100644
View file @ 17bb523d
<style>
@import url('../../../assets/css/domestic/TicketingModule.css');
.sanjiao-box{
position: relative;
padding-top: 10px!important;
}
.sanjiao-box .Receipt_table td{
padding: 0 10px;
}
.hover_text span{
cursor: pointer;
text-decoration: underline;
}
.czBillModule td{
text-align: center!important;
padding:6px 0!important;
}
</style>
<template>
<div class="m_TicketingModule" v-if="DataList&&DataList.length>0">
<div>
<div class="_tit" style="border: 0;">
<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="sanjiao-box _padding_20_15">
<table border="1" class="czBillModule _border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
<tr>
<th>公司</th>
<th>{{$t('fnc.danhao')}}</th>
<th>类型</th>
<th>费用科目</th>
<th>币种</th>
<th>原币</th>
<th>汇率</th>
<th>{{$t('fnc.bweibi')}}</th>
<th>{{$t('pub.pubRemark')}}</th>
</tr>
<tr class="_color_b" v-for="(item,index) in DataList" :key="index">
<td>
{{item.BranchIdName}}
</td>
<td class="hover_text" @click="goDetail(item.FinanceId)" ><span>{{item.FinanceId}}</span></td>
<td>
{{item.Type}}
</td>
<td>
{{item.CostTypeName}}
</td>
<td>
{{item.CurrencyName}}
</td>
<td>
{{item.OriginalMoney}}
</td>
<td>{{item.Rate}}</td>
<td>{{item.Money}}</td>
<td>
{{item.Remark}}
</td>
</tr>
</table>
</div>
</div>
</div>
</template>
<script>
export default {
props:["GetDetail"],
data(){
return{
tableShow: true,
DataList: [],
msg:{
FrID:0,
}
}
},watch:{
GetDetail:{
handler(val, oldVal) {
this.msg.FrID = this.GetDetail.FrID
this.Financial_post_GetDetail();
},
deep: true,
immediate: true,
}
},
created(){
},
mounted(){
},
methods:{
goDetail(id){
this.$router.push(
{ name: 'FinancialDocumentsDetail',
query:{"id":id,blank:'y',tab:'单据详情'}
}
)
},
Financial_post_GetDetail(){ //获取关联单
if(this.msg.FrID){
this.loading = true;
this.apipost('Financial_post_GetTaiwanWorkingExpenseList',this.msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
this.DataList = data
}else{
this.Error(res.data.message)
}
this.loading = false;
}, err => {})
}
},
}
}
</script>
src/router/config.js
View file @ 17bb523d
......@@ -4107,6 +4107,14 @@ export default {
title: '成本月结查询'
},
},
{ //财务 台湾与日本结算
path: '/TaiwanSettlement',
name: 'TaiwanSettlement',
component: resolve => require(['@/components/FinancialModule/MonthlyCostStatement/settlement'], resolve),
meta: {
title: '台湾结算查询'
},
},
{ //财务 财务单据 帮收帮付公司
path: '/HelpBranch',
name: 'HelpBranch',
......
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