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
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
<style scoped>
.currentManage .addCompany {width: 440px;}
/* 币种管理 */
.cm_content{padding:0;overflow-x: auto;}
.cmc_item{float: left;width:212px;height: 195px;background:rgba(255,255,255,1);border-radius:4px;overflow: hidden;margin-right: 12px;margin-bottom: 15px;border: 1px solid #ebebeb}
.cmci_top{background-color: #3AD892;padding: 14px 20px;font-size: 14px;color: #009251}
.cmci_top p span:nth-child(2){display: inline-block;padding: 2px 5px;font-size: 12px;color: #FFFFFF;background-color: #02AE62;border-radius:4px;margin-left: 5px;vertical-align:top;}
.cmci_cen{padding: 14px 20px;color: #666666;font-size: 12px}
.cmci_cen p{padding: 4px 0;}
.cmci_cen p .fr{font-weight: bold;font-family: "PingFangSC-fine";color: #333333}
.cmci_cen p .icon-shuaxin{background-color: #E7E7E7;color: #999999;display: inline-block;margin-left: 5px;border-radius: 50%;font-size: 12px;transform: rotate(60deg);cursor: pointer;transition: all linear 0.2s;width: 12px;height: 12px;line-height: 12px;}
.cmci_cen p .icon-shuaxin:hover{background-color: #E95252;color: white;}
.fc_green{color: #47BF8C !important}
.fc_red{color: #E95252 !important}
.cmci_bot{padding:0 20px 20px 20px;font-size: 12px !important;text-align: center}
.cmci_bot .el-button-group .el-button{padding: 4px;}
.cmci_bot .el-button{font-size: 12px !important}
.cmc_item:hover{box-shadow:0px 0px 20px rgba(191,191,191,1);transition: all linear 0.5s;}
._benwei{background-color: #2AAEF2!important;color: #0877B0!important}
._benweiA{background-color: #0F80BA!important}
._underline{text-decoration: underline;cursor: pointer;}
.currentManage ._vMG_edit{overflow: auto;display: none;position:absolute;font-family: 'PingFangSc-Fine';bottom:0;left: 0;border-top:1px solid #d1d1d1;background-color:#FFFFFF;padding: 10px;width: 100%;}
.currentManage ._vMG_edit ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 16px;color: #000000}
.currentManage ._vMG_edit ._tit span{color: #666666;font-size: 14px;}
._edHeight{height:400px;}
.edHeight{display: block !important;height: 230px;}
._scrollbar::-webkit-scrollbar{width: 4px;height: 8px;}
._scrollbar::-webkit-scrollbar-thumb{border-radius: 4px;box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);background: #c9c9c9;}
._scrollbar::-webkit-scrollbar-track{box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);border-radius: 4px;background: #EDEDED;}
.currentManage ._info_box ul{margin-top: 15px}
.currentManage ._info_box ul li{float: left; width: 250px;}
._max_width{max-width: 100px; overflow:hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;vertical-align:top;}
._yingkui{height: 40px;line-height: 40px;font-size: 12px;color: #666666}
._tips{font-size: 12px;color: #666666;padding: 15px 0}
.currentManage .po_content{
border-collapse: collapse;
}
.currentManage .po_content{
width: 100%;
}
.currentManage .po_content tr:first-child{
font-size: 12px;
color: #666666;
background-color: #DCDCDC;
}
.currentManage .po_content tr th,.currentManage .po_content tr td{
padding: 10px 20px;
text-align: left;
}
.currentManage .po_content tr td{
color: #333333;
font-size: 14px;
border:1px solid #E6E6E6;
}
.currentManage .po_content tr td .iconfont{
font-size: 14px;
padding: 4px;
}
.query-box .iconfont{
cursor: pointer;
background-color: #E95252;
color: white;
width: 30px;
height: 30px;
display: inline-block;
text-align: center;
line-height: 30px;
border-radius: 50%;
margin-left: 10px;
}
.currentManage ._yuan{
width:12px;
height:12px;
background:rgba(233,82,82,1);
border-radius:50%;
display: inline-block;
}
.currentManage ._yuan._yuan_red{
background:#47BF8C;
}
._flex_rete{
cursor: pointer;
}
.display_none{
opacity: 0;
}
._flex_rete .icon-qiehuan{
background-color: #E5E5E5;
color: white;
height: 20px;
width: 20px;
border-radius: 50%;
text-align: center;
font-size: 12px;
padding: 0 !important;
line-height: 20px;
float: right;
}
._flex_rete .icon-qiehuan:hover{
background-color: rgba(233,82,82,1);
color: white;
}
</style>
<template>
<div class="flexOne currentManage">
<div class="query-box">
<ul>
<li>
<span>
<em>币种</em>
<el-select filterable v-model='msg.CurrencyId' >
<el-option key="0" :value="0" label="不限"></el-option>
<el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>日期</em>
<el-date-picker class="h34"
@change="timeAdd"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="getList">{{$t('pub.searchBtn')}}</button>
</li>
</ul>
</div>
<div class="cm_content _scrollbar">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>ID</th>
<th>名称</th>
<th>现钞卖出</th>
<th>现钞买入</th>
<th>时间</th>
</tr>
<tr v-for="(item,index) in DataList" :key="index">
<td>{{item.CurrencyId}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.CurrentRate}}</td>
<td>{{item.OutCashRate}}</td>
<td>{{item.UpdateTime}}</td>
<!-- <td>
<el-button-group size='mini'>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" @click="editCurency(item.ID),text=$t('system.table_edit')"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" class="iconfont icon-img_delete_small" @click="financeinfoRemove(item.ID,item.Name)"></el-button>
</el-tooltip>
<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-button-group>
</td> -->
</tr>
</table>
<div class="noData" v-if="DataList.length==0">
{{$t('system.content_noData')}}
</div>
<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>
</div>
</div>
</template>
<script>
export default {
data() {
return {
msg:{
pageIndex:1,
pageSize:14,
CurrencyId:0,
StartTime:"",
EndTime:"",
},
productionDate:[],
DataList:[],
loading:false,
currentPage:1,
total:0,
currencyTypeList:[],
}
},created(){
if(this.$route.query.CurrencyId){
this.msg.CurrencyId=Number(this.$route.query.CurrencyId);
}
},
mounted(){
this.financeinfo_post_GetList();
this.getList();
},
methods: {
resetPageIndex(){ // 重置页码
this.msg.pageIndex=1;
this.currentPage = 1;
},
handleCurrentChange(val) { //翻页
this.msg.pageIndex = val;
this.getList();
},
getList(){
this.loading=true;
this.apipost('financeinfo_post_GetHistoryCurrencyRatePageList', this.msg, res => {
this.loading=false;
console.log("res",res)
if(res.data.resultCode == 1) {
this.DataList = res.data.data.pageData;
this.total=res.data.data.count;
} else {
this.Error(res.data.message);
}
}, err => {})
},
timeAdd(){
if(!this.productionDate){
this.msg.sDate = '';
this.msg.eDate = '';
return
}
this.msg.sDate = this.productionDate[0];
this.msg.eDate = this.productionDate[1];
},
financeinfo_post_GetList(){ // 币种类型
this.apipost('financeinfo_post_GetList',{Name:''},res=>{
if(res.data.resultCode==1){
this.currencyTypeList = res.data.data;
}else{
}
},err=>{})
},
},
}
</script>
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