Skip to content

S
SuperMan
Commit e02cf1a1 authored by 吴春's avatar 吴春
Browse files
Options

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

parents 5a7bd11d 7eb60811
Show whitespace changes
Inline Side-by-side
Showing with 132 additions and 43 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ e02cf1a1
......@@ -1155,7 +1155,7 @@
</p>
<div class="_tit _tit2 w890px">
<!-- 预付款冲抵 电商商品 -->
<czBillModule :FrID='ID' />
<czBillModule :FrID='ID' :GetDetail="GetDetail" />
<!-- 预收款抵用 -->
<UserCredit v-if="(GetDetail.OtherType==74&&GetDetail.ReFinanceId)||GetDetail.DepositCustomerId"
:GetDetail="GetDetail"></UserCredit>
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ e02cf1a1
......@@ -1449,14 +1449,20 @@
<el-dialog :title="$t('objFill.precharge')" width="960px" :visible.sync="yfcdState" center>
<el-form class="cdForm" label-width="90px">
<el-form-item :label="$t('fnc.danhao')" prop="FrID">
<el-input class="w220" @keyup.native="checkInteger(czMsg,'FrID')" v-model="czMsg.FrID"></el-input>
<el-input class="w180" @keyup.native="checkInteger(czMsg,'FrID')" v-model="czMsg.FrID"></el-input>
</el-form-item>
<el-form-item :label="$t('salesModule.CostType')">
<el-select filterable v-model='czMsg.CostTypeID' class="">
<el-select filterable v-model='czMsg.CostTypeID' class="w180">
<el-option :label="$t('pub.unlimitedSel')" value=''></el-option>
<el-option v-for="(item,index) in costList" :key="index" :label="item.Name" :value='item.ID'></el-option>
</el-select>
</el-form-item>
<el-form-item label="查询类型">
<el-select filterable v-model='czMsg.IsDiJieSelect' class="w180">
<el-option label="只看可冲抵" value='0'></el-option>
<el-option label="查询所有" value='1'></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('fnc.jiaoyiriqi')">
<el-date-picker v-model="czdateList" type="daterange" :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')">
......@@ -1479,7 +1485,7 @@
<th>{{$t('fnc.jine')}}</th>
<th>{{$t('objFill.amountoffset')}}</th>
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('fnc.fkduixiang')}}</th>
<th width="270px">{{$t('fnc.fkduixiang')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in czList" :key="index">
......@@ -1495,14 +1501,15 @@
<td>
<el-tooltip class="item" effect="dark"
:content="item.ClientTypeName+':'+item.RemitterName+'('+item.AccountNumber+')'" placement="top-start">
<div style="width:250px;overflow:hidden">{{item.ClientTypeName}}:{{item.RemitterName}}</div>
<div>{{item.ClientTypeName}}:{{item.RemitterName}}</div>
</el-tooltip>
</td>
<td>
<el-tooltip class="item" effect="dark" content="预付款剩余余额转移至新单" placement="top-start">
<span @click="matchTransfer(item)" style="cursor: pointer; color:#33B3FF">余额转移</span>
</el-tooltip>|
<el-tooltip class="item" effect="dark" :content="$t('objFill.prepaymentrefund')" placement="top-start">
<button class="normalBtn" @click="goUrlZD(item)">
<i class="el-icon-right"></i>
</button>
<span @click="goUrlZD(item)" style="cursor: pointer; color:#33B3FF">退款</span>
</el-tooltip>
</td>
</tr>
......@@ -1521,6 +1528,13 @@
</button>
</div>
</el-dialog>
<el-dialog title="余额转移" width="400px" :visible.sync="IsMatchTransfer" center>
<p style="color: #33B3FF; margin-bottom: 10px">单号{{matchMsg.TransferFrId}}：剩余余额 {{matchMsg.TransferMoney}}{{matchMsg.CurrencyName}}将全部转移*</p>
<p>转入单号：<el-input class="w180" @keyup.native="checkInteger(matchMsg,'JoinFrId')" v-model="matchMsg.JoinFrId"></el-input></p>
<br>
<button v-loading="matchBtn" class="normalBtn" @click="sureMatchTransfer()" style="margin-left: 150px;margin-bottom: 10px">确认转移</button>
</el-dialog>
<div class="btmAddStore" :class="{'fillShow':fillShow}">
<div class="btmTitle">{{$t('objFill.daorugzdxx')}}</div>
<div style="height:250px;overflow-y: auto;">
......@@ -1967,7 +1981,8 @@
CostTypeID: "",
sTradeDate: "",
eTradeDate: "",
IsAdvanceFinance: 1
IsAdvanceFinance: 1,
IsDiJieSelect: '0'
},
costList: [],
transactionmode: false,
......@@ -1999,6 +2014,14 @@
MarkRemark: '',
isBatchPrinting: false,
multipleSelection: [],
IsMatchTransfer: false,
matchBtn: false,
matchMsg:{
TransferFrId: 0,
JoinFrId: 0,
TransferMoney: 0,
CurrencyName:''
}
};
},
created() {
......@@ -2098,6 +2121,36 @@
this.czgetList();
},
methods: {
matchTransfer(item){
this.matchMsg.TransferFrId = item.FrID;
this.matchMsg.TransferMoney = (item.Money - item.MatchMoney).toFixed(2);
this.matchMsg.CurrencyName = item.CurrencyName;
this.IsMatchTransfer =true;
},
sureMatchTransfer(){
if (this.matchMsg.TransferFrId<=0){
return this.$message.error("需转移单号有误");
}
if (this.matchMsg.JoinFrId<=0){
return this.$message.error("转入单号有误");
}
this.matchBtn=true;
this.apipost("Financial_post_SetMatchFinanceSurplusTransfer",this.matchMsg,res => {
if (res.data.resultCode == 1) {
this.matchBtn=false;
this.$message.success(res.data.message);
this.matchMsg.TransferFrId=0;
this.matchMsg.TransferMoney=0;
this.IsMatchTransfer=false;
this.czgetList();
} else {
this.$message.error(res.data.message);
this.matchBtn=false;
}
},
err => {}
);
},
toggleSelection(rows) {
if (rows) {
rows.forEach(row => {
......@@ -2549,6 +2602,8 @@
if (res.data.resultCode === 1) {
this.czList = res.data.data.pageData;
this.total2 = res.data.data.count;
}else{
this.Error(res.data.message);
}
},
null
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ e02cf1a1
......@@ -1213,7 +1213,7 @@
</p>
<div class="_tit _tit2 w890px">
<!-- 预付款冲抵 电商商品-->
<czBillModule :FrID='ID' />
<czBillModule :FrID='ID' :GetDetail="GetDetail" />
<!-- 预收款抵用 -->
<UserCredit v-if="(GetDetail.OtherType==74&&GetDetail.ReFinanceId)||GetDetail.DepositCustomerId"
:GetDetail="GetDetail"></UserCredit>
......
src/components/FinancialModule/FinancialSubmodule/czBillModule.vue
View file @ e02cf1a1
......@@ -55,6 +55,41 @@
</table>
</div>
</div>
<div v-if="OtherType==81">
<div class="_tit">
<span class="_text">预付款余额转移明细</span>
<div>
<span class="_btn" v-if="tableShow" @click="tableShow=false">{{$t('fnc.shouqi')}} <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow=true">{{$t('fnc.zhankai')}} <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>类型</th>
<th>预付单</th>
<th>预付金额</th>
<th>币种</th>
<th>转移单</th>
<th>转移金额</th>
<th>转移状态</th>
<th>余额</th>
</tr>
<tr class="_color_b" v-for="(item,index) in matchTransferList" :key="index">
<td>{{item.BranchName}}</td>
<th>{{item.Type}}</th>
<td class="hover_text" @click="goDetail(item.MatchFrId)" ><span>{{item.MatchFrId}}</span></td>
<td>{{item.MatchFrMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td class="hover_text" @click="goDetail(item.FinanceId)" ><span>{{item.FinanceId}}</span></td>
<td>{{item.FMoney}}</td>
<td>{{item.Status}}</td>
<td>{{item.YEMoney}}</td>
</tr>
</table>
</div>
</div>
<div v-if="IsAdvanceFinance==1" style="border-top: 1px solid #DDDDDD;">
<div class="_tit">
<span class="_text">冲抵单据</span>
......@@ -234,7 +269,7 @@
<script>
export default {
props:["FrID"],
props:["FrID","GetDetail"],
data(){
return{
tableShow: true,
......@@ -247,7 +282,6 @@ export default {
loading: true,
czList:[],
czTableList:[],
GetDetail:{},
OtherType:0,
ReFinanceId:0,
IsAdvanceFinance:-1,
......@@ -259,15 +293,21 @@ export default {
ReceiptModel:{},
IsFinancePermission:false,
Area_Name: '',
matchTransferList: []
}
},watch:{
'GetDetail': {
handler(newValue) {
this.getDataDes();
},
deep: true,
immediate: true
}
},created(){
},mounted(){
this.getDataDes();
// 查询财务权限
let userInfo = this.getLocalStorage();
if (userInfo.ActionMenuCode.indexOf('F_AccountantFinanceMerge') != -1) {
......@@ -311,28 +351,25 @@ export default {
this.GetLocalFile("Financial_get_DownLoadAdvanceMatchFinance", msg,this.FrID + "预付款冲抵导出.xls");
},
getDataDes(){
this.apipost('Financial_post_GetDetail', {ID:this.FrID,Type:1}, res => {
this.loading = false
if (res.data.resultCode == 1) {
let data=res.data.data;
this.LeaderRefundDetailList=data.LeaderRefundDetailList;
this.ReceiptModel=data.ReceiptModel;
this.LeaderRefundDetailList=this.GetDetail.LeaderRefundDetailList;
this.ReceiptModel=this.GetDetail.ReceiptModel;
this.LeaderState=true;
this.OtherType=data.OtherType;
this.ReFinanceId=data.ReFinanceId;
this.IsAdvanceFinance=data.IsAdvanceFinance;
this.ECommerceGoodsModel=data.ECommerceGoodsModel;
this.details=data;
this.OtherType=this.GetDetail.OtherType;
this.ReFinanceId=this.GetDetail.ReFinanceId;
this.IsAdvanceFinance=this.GetDetail.IsAdvanceFinance;
this.ECommerceGoodsModel=this.GetDetail.ECommerceGoodsModel;
this.details=this.GetDetail;
if(this.OtherType==7||this.details.MatchFrId>0){
this.getDetails()
if(this.OtherType==81){
this.getMatchTransferList()
}
}else if(this.OtherType==65){
this.getyfTableList()
} else{
}else if(this.IsAdvanceFinance ==1){
this.getczTableList();
}
}
}, err => {})
},
goTravelControlList(id){
this.$router.push({ name: 'TravelControlList',query:{"TCID":id,blank:'y',tab:'团控列表'} })
......@@ -378,20 +415,16 @@ export default {
}, err => {})
},
// OtherType=65详情 预付款退款详情
getyfTableList(){
getMatchTransferList(){
this.loading = true
let msg={
pageIndex:1,
pageSize:100,
FrID:this.details.ReFinanceId,
FinanceId:this.FrID
};
this.cdtotal=0;
this.apipost('Financial_get_GetAdvanceFinancePageList', msg, res => {
this.apipost('Financial_post_GetMatchTransferList', msg, res => {
this.loading = false
if (res.data.resultCode == 1) {
let data=res.data.data.pageData;
this.czList=data;
let data=res.data.data;
this.matchTransferList=data;
}
else{
this.Error(res.data.message)
......@@ -400,6 +433,7 @@ export default {
},
// OtherType=7详情
getDetails(){
console.log('---====22')
this.loading = true;
let msg={
pageIndex:1,
......
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