Skip to content

S
SuperMan
Commit 5b567142 authored by Mac's avatar Mac
Browse files
Options

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

parents 15032513 250dc8a7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 359 additions and 10 deletions
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ 5b567142
......@@ -163,7 +163,7 @@
<th width="">{{$t('fnc.yueacc')}}</th>
</tr>
<tr>
<td :colspan="7">{{$t('fnc.a_qcyue')}}：期初余额</td>
<td :colspan="7">{{$t('fnc.a_qcyue')}}</td>
<td></td>
<td></td>
<td> {{ moneyFormat(RStartMoney) }} </td>
......@@ -177,8 +177,11 @@
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
</td>
<td> {{ item.BName }} </td>
<td>
<!-- <td>
<span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
</td> -->
<td>
<span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
</td>
<td>
<p v-if="item.CostTypeList&&item.CostTypeList.length"> <span v-for="(i,o) in item.CostTypeList">{{ i }} </span> </p>
......@@ -196,13 +199,13 @@
{{ item.AccountNumber }}
</td>
<td>
收入：{{ item.Type === 1 ? moneyFormat(item.OriginalMoney) : '' }}
{{ item.Type === 1 ? moneyFormat(item.OriginalMoney) : '' }}
</td>
<td>
支出： {{ item.Type === 2 ? moneyFormat(item.OriginalMoney) : '' }}
{{ item.Type === 2 ? moneyFormat(item.OriginalMoney) : '' }}
</td>
<td>
余额：{{ moneyFormat(item.enRSMoney) }}
{{ moneyFormat(item.enRSMoney) }}
</td>
<td>
{{item.Rate}}
......@@ -794,6 +797,21 @@ export default {
this.payMsg.Type = '';
this.payMsg.AccountId = '';
},
goUrlNew(item){
let status=false;
if(item.CostTypeList){
item.CostTypeList.forEach(cost=>{
if(cost=="资金调拨"){
status=true;
}
})
}
if(status){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
}else{
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
}
},
goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} })
},
......@@ -933,12 +951,11 @@ export default {
}else if(x.Type===2){//支出
this.bZhi = this.bZhi + x.Money;
this.wZhi = this.bZhi + x.OriginalMoney;
this.wZhi = this.wZhi + x.OriginalMoney;
endRStartMoney = endRStartMoney - x.OriginalMoney;
endStartMoney = endStartMoney - x.Money;
x.enRSMoney = endRStartMoney;
x.enSMoney = endStartMoney;
console.log("this.wZhi",this.wZhi);
}
x.check = false;
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 5b567142
......@@ -159,7 +159,10 @@
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
</td>
<td>{{ item.BName }}</td>
<td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td>
<!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
<td>
<span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
</td>
<td>
<p>{{item.CostTypeName}}</p>
<p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.TCNUM }} ( <span> {{ son.TCID }} </span> )</span> </p>
......@@ -442,6 +445,21 @@ export default {
}
},methods:{
goUrlNew(item){
let status=false;
if(item.CostTypeList){
item.CostTypeList.forEach(cost=>{
if(cost=="资金调拨"){
status=true;
}
})
}
if(status){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
}else{
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
}
},
goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} })
},
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 5b567142
......@@ -156,7 +156,11 @@
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
</td>
<td>{{ item.BName }}</td>
<td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td>
<!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
<td>
<span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
</td>
<td>
<p>{{item.CostTypeName}}</p>
<p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.TCNUM }}</span> </p>
......@@ -433,6 +437,21 @@ export default {
}
},methods:{
goUrlNew(item){
let status=false;
if(item.CostTypeList){
item.CostTypeList.forEach(cost=>{
if(cost=="资金调拨"){
status=true;
}
})
}
if(status){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
}else{
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
}
},
goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} })
},
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 5b567142
......@@ -157,8 +157,11 @@
</tr>
<tr v-for=" ( item , index ) in DataList " v-if=" item.Type !== 4">
<td> {{ item.BName }} </td>
<td>
<!-- <td>
<span class="cursorpointer" :class=" item.Type == 1 ? '_bg_green' : '_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
</td> -->
<td>
<span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
</td>
<td>
<p> {{ item.CostTypeName }} </p>
......@@ -464,6 +467,21 @@ export default {
}
},methods:{
goUrlNew(item){
let status=false;
if(item.CostTypeList){
item.CostTypeList.forEach(cost=>{
if(cost=="资金调拨"){
status=true;
}
})
}
if(status){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
}else{
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
}
},
goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} })
},
......
src/components/systemManagement/HistoryRateQuery.vue 0 → 100644
View file @ 5b567142
This diff is collapsed.
src/components/systemManagement/currencyManagement.vue
View file @ 5b567142
......@@ -198,6 +198,10 @@
<el-tooltip class="item" effect="dark" :content="$t('fnc.szbweibi')" placement="top-start">
<el-button type="warning" class="iconfont" v-if="item.IsStandardCurrency!=1" @click="setStandardTips(item.ID,item.Name)">{{$t('Airticket.Air_ben')}}</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="历史汇率" placement="top-start">
<el-button type="warning" class="iconfont" @click="GoUrlHis('HistoryRateQuery',item)">历</el-button>
</el-tooltip>
</el-button-group>
</td>
</tr>
......@@ -398,6 +402,15 @@
this.tableSize = this.msg.pageSize = parseInt(cH/45);
},
methods: {
GoUrlHis(path,item){
this.$router.push({
name: path,
query: {
blank: "y",
CurrencyId: item.ID
}
});
},
switchMethod(t){
this.msg.pageIndex = 1;
if(t===1){
......
src/router/config.js
View file @ 5b567142
......@@ -865,6 +865,14 @@ export default {
title: '币种管理'
},
},
{
path: '/HistoryRateQuery', //历史汇率查询
name: 'HistoryRateQuery',
component: resolve => require(['@/components/systemManagement/HistoryRateQuery'], resolve),
meta: {
title: '历史汇率'
},
},
{
path: '/transportCostsManagement', //联运成本管理
name: 'transportCostsManagement',
......
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