Commit 4eee5b69 authored by youjie's avatar youjie

no message

parent f4dfbf9f
......@@ -478,6 +478,9 @@
.caoz i{
margin-bottom: 5px;
}
.Remark-box{
overflow: hidden;white-space: nowrap;text-overflow: ellipsis;width: 100%;
}
</style>
<template>
......@@ -673,255 +676,32 @@
<el-table :data="DataList" border style="width: 100%;font-size: 12px">
<el-table-column prop="FrID" label="单号" width="100">
<template slot-scope='scope'>
<el-popover popper-class="detailsIT_Journal" placement="bottom-start" trigger="click">
<template
v-if="(scope.row.Type==2 || scope.row.Type==6)&&scope.row.modelShow&&(scope.row.Is_Merge==0||scope.row.Is_Merge==null)">
<my-Bill :ID="scope.row.FrID" :width="widthSon" :color="colorSon"></my-Bill>
</template>
<template
v-else-if="(scope.row.Type==1 || scope.row.Type==5)&&scope.row.modelShow&&(scope.row.Is_Merge==0||scope.row.Is_Merge==null)">
<my-RVB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
</template>
<template v-else-if="scope.row.Is_Merge==1&&scope.row.modelShow">
<my-HB-Bill :ID="scope.row.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template>
<span slot="reference" @click="scope.row.modelShow = true"
style="text-decoration: underline;cursor: pointer;font-weight: bold">{{scope.row.FrID}}</span>
</el-popover>
</template>
</el-table-column>
<el-table-column prop="BranchName" label="所属校区" width="100"></el-table-column>
<el-table-column prop="allName" label="单据类型" width="150">
<template slot-scope="scope">
<span>
<span v-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-if="scope.row.Type==1" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
收入
</span>
<span v-if="scope.row.Type==4" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
调拨
</span>
<span v-if="scope.row.Type==5" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
应收
</span>
<span v-if="scope.row.Type==6" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
line-height: 16px;
border-radius: 4px;">
应付
</span>
<el-tooltip class="item" effect="dark" content="追加团款" placement="top">
<span v-if="scope.row.OtherType == 1" style="width: 20px;
height: 20px;
display: inline-block;
border-radius: 50%;
text-align: center;
line-height: 20px;
color: #E95252;
border: 1px solid #E95252;
font-size: 12px;" class="zhuiClass"></span>
</el-tooltip>
</span>
{{scope.row.FrID}}
</template>
</el-table-column>
<el-table-column prop="Accountholder" label="关联信息">
<el-table-column prop="TradeDate" label="凭证日期" width="100"></el-table-column>
<el-table-column prop="allName" label="科目代码" width="100">
<template slot-scope="scope">
<div>
<div v-if="scope.row.TCIDAndTCNUMList.length>0">
<div class="_TCIDAndTCNUMList" style="display: flex;">
<span>团号:</span>
<div v-if="scope.row.TCIDAndTCNUMList&&scope.row.TCIDAndTCNUMList.length>0">
<p><span v-for="(i,ix) in scope.row.TCIDAndTCNUMList">{{i.ClassName}}{{i.ClassId}}<span
v-if="ix!=scope.row.TCIDAndTCNUMList.length-1">,</br></span></span></p>
</div>
<div v-else>
<span></span>
</div>
</div>
<p v-if="scope.row.OrderID>0 && scope.row.OrderSource==8">单号:<span class="">{{scope.row.OrderID}}</span>
</p>
</div>
<div v-else-if="scope.row.OrderSource==8 && scope.row.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">暂无团期信息</p>
</div>
<div v-else-if="scope.row.OrderSource==4 && scope.row.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList" style="text-decoration: underline;cursor: pointer;"
@click="goTicketPage(scope.row)">机票编号:{{scope.row.SourceID}}</p>
<p style="margin-top: 5px;">线路:<span>{{scope.row.LineName?scope.row.LineName:'机票尚未选择线路'}}</span></p>
</div>
<div v-else-if="scope.row.OrderSource==9 && scope.row.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">国内票务期数:{{scope.row.Term}}</p>
</div>
<div v-else-if="scope.row.OrderSource==10 && scope.row.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">签证产品编号:{{scope.row.SourceID}}</p>
</div>
<div v-else-if="scope.row.OrderSource==0 || scope.row.OrderSource==null||scope.row.OrderSource==17||scope.row.OrderSource==18">
<p class="_TCIDAndTCNUMList">{{ scope.row.BranchName }}-{{scope.row.DepartName}} </p>
</div>
<div v-else>
<p class="_TCIDAndTCNUMList">暂无</p>
</div>
</div>
{{scope.row.SubjectCode}}
</template>
</el-table-column>
<el-table-column prop="dateRange" label="费用类型">
<el-table-column prop="SubjectName" label="科目名称" width="100"></el-table-column>
<el-table-column prop="Money" label="原币金额" width="100"></el-table-column>
<el-table-column prop="DebitMoney" label="借方金额" width="100"></el-table-column>
<el-table-column prop="CreditMoney" label="贷方金额" width="100"></el-table-column>
<el-table-column prop="Remark" label="凭证摘要">
<template slot-scope="scope">
<div>
<div v-for="(s,si) in scope.row.CostTypeList" :index="si">
<span
style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;">{{s}}</span></br>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="TradeWay" label="交易方式">
<template slot-scope="scope">
<div>
<div v-if="scope.row.TradeWayList&&scope.row.TradeWayList.length>0">
<div class="_TradeWayList" v-for="(tw,twIn) in scope.row.TradeWayList"
style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:230px">
<p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name"
style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{scope.row.TradeWayList[0].TypeName}}</span><span
style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;"
:style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?'无':tw.AccountType}}</span>
</p>
<p style="color:#333333">{{tw.BankNo}}</p>
</div>
</div>
<div v-else>
<div class="_pad5">
</div>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="Money" label="金额">
<template slot-scope="scope">
<span>
<p style="line-height:20px">{{scope.row.Type==1?'应收':'应付'}}<span>{{scope.row.Money}}</span></p>
<p style="line-height:20px">{{scope.row.Type==1?'实收':'实付'}}<span>{{scope.row.PayMoney}}</span></p>
<p v-if="scope.row.IsAdvanceFinance==1" style="line-height:20px">冲抵:<span>{{scope.row.MatchMoney}}</span>
</p>
</span>
</template>
</el-table-column>
<el-table-column prop="ClientTypeName" label="付款对象">
<template slot-scope="scope">
<span>
<span
style="color: gray">{{scope.row.Type==2?scope.row.ClientTypeName+':':'汇款人:'}}</span><span>{{scope.row.RemitterName}}</span>
</span>
</template>
</el-table-column>
<el-table-column prop="EmName" label="制单人员"></el-table-column>
<el-table-column prop="StatusStr" label="当前状态"></el-table-column>
<el-table-column prop="Remark" label="操作">
<template slot-scope="scope">
<div class="caoz">
<span>
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<i v-if="scope.row.Type !== 4" style="width: 30px;
height: 30px;
display: inline-block;
color: white !important;
border-radius: 50%;
text-align: center;
line-height: 30px;
margin-right: 10px;
cursor: pointer;
background-color: #47BF8C;
outline: none;" class="iconfont icon-sousuo"
@click="goUrl('FinancialDocumentsDetail',scope.row)">
</i>
<i v-if="scope.row.Type === 4" style="width: 30px;
height: 30px;
display: inline-block;
color: white !important;
border-radius: 50%;
text-align: center;
line-height: 30px;
margin-right: 10px;
cursor: pointer;
background-color: #47BF8C;
outline: none;" class="iconfont icon-sousuo"
@click="goUrl('CapitalAllocationDetail',scope.row)">
</i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="转交" placement="top">
<!-- <i v-if="scope.row.isExchange" style="width: 30px;-->
<i style="width: 30px;
height: 30px;
display: inline-block;
color: white !important;
border-radius: 50%;
text-align: center;
line-height: 30px;
margin-right: 10px;
cursor: pointer;
background-color: #47BF8C;
outline: none;" class="iconfont icon-zhuanhuan1" @click="getExchange(scope.row)">
</i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="发票修改" placement="top">
<!-- <i v-if="scope.row.isExchange" style="width: 30px;-->
<i style="width: 30px;
height: 30px;
display: inline-block;
color: white !important;
border-radius: 50%;
text-align: center;
line-height: 30px;
margin-right: 10px;
cursor: pointer;
background-color: #47BF8C;
outline: none;" class="iconfont icon-fapiao" v-if="Finance_InvoiceUpdate==true && scope.row.Type==2" @click="setdaju(scope.row)">
</i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="费用类型" placement="top">
<!-- <i v-if="scope.row.isExchange" style="width: 30px;-->
<i style="width: 30px;
height: 30px;
display: inline-block;
color: white !important;
border-radius: 50%;
text-align: center;
line-height: 30px;
margin-right: 10px;
cursor: pointer;
background-color: #47BF8C;
outline: none;" class="iconfont icon-caiwu" v-if="Finance_ExpenseType==true && (scope.row.Type==2 || scope.row.Type==1)" @click="showfeiyong(scope.row)">
</i>
</el-tooltip>
</span>
</div>
<el-tooltip class="item" effect="dark" :content="scope.row.Remark" placement="bottom">
<p class="Remark-box">{{scope.row.Remark}}</p>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="OriginalName" label="系统费用/账户" width="150"></el-table-column>
<el-table-column prop="Code" label="金蝶币种code" width="150"></el-table-column>
<el-table-column prop="Name" label="金蝶币种别名" width="150"></el-table-column>
<el-table-column prop="RateType" label="金蝶汇率类型" width="150"></el-table-column>
<el-table-column prop="ItemName" label="金蝶核算项目" width="100"></el-table-column>
</el-table>
<div style="padding-bottom:15px">
<el-pagination background @current-change="handleCurrentChanges" layout="total,prev, pager, next, jumper"
......@@ -983,7 +763,7 @@
</template>
</el-dialog>
<!-- 修改费用类型 -->
<el-dialog title="修改费用类型" width="400px"
<!-- <el-dialog title="修改费用类型" width="400px"
:visible.sync="costmode" center >
<el-form label-width="110px">
<div class="rb_top_row _r_mb5" v-for='(x,y) in trabeList' :key='y'>
......@@ -1001,7 +781,7 @@
<el-button class="hollowFixedBtn" @click="costmode=false">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="preservetransaction()">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
</el-dialog> -->
</div>
</template>
......@@ -1166,7 +946,32 @@
},
mounted() {
let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo
.RB_Group_id; //集团ID
this.DepartIDs = userInfo.RB_Department_Id;
this.userId = userInfo.EmployeeId;
this.msg.EmployeeId = userInfo.EmployeeId;
this.financeinfo_post_GetList();
this.financeinfo_post_GetCostTypeList();
this.FinancialFlowTemplate_post_GetList();
this.getCompanyList();
this.Financial_post_GetConditionList();
this.getEmployee(0);
this.getDepartment(0);
this.Financial_post_GetBranchAccountList();
this.financeinfo_post_GetClientTypeList();
this.FinancialFlowTemplate_post_GetStatusList();
this.getPageList();
this.AccountType_post_GetList();
this.get_GetInvoiceTypeEnumList()
var that = this;
that.MsgBus.$on('getRecQuery', function (FrID) {
that.zhuanjiaoMsg.CreateBy = '';
that.zhuanjiaoMsg.RB_CreateByName = '';
that.zhuanjiaoMsg.FrIDList = [];
that.zhuanjiaoMsg.FrIDList.push(FrID);
that.zhuanjiaoBox = true;
});
},
methods: {
......@@ -1285,10 +1090,13 @@
this.apipost('Financial_post_GetFinanceToKingdeePageList', this.msg, res => {
if (res.data.resultCode == 1) {
let data = res.data.data.pageData;
console.log(data,'====')
this.total = res.data.data.count;
if (this.total == 0) {
this.DataList = [];
}
}else{
this.DataList = data
}
this.loading = false;
} else {
this.loading = false;
......
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