Skip to content

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

1 未认款

parent e2fdff54
Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 26 deletions
src/components/FinancialModule/FinancialSubmodule/czBillModule.vue
View file @ d454769a
......@@ -180,6 +180,37 @@
</tr>
</table>
</div>
</div>
<div v-if="details.SpecialType && details.SpecialType==16">
<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>
</tr>
<tr class="_color_b" v-for="(item,index) in saleClaimList" :key="index">
<td class="hover_text" @click="goClaim(item.ID)" ><span>{{item.ID}}</span></td>
<th>{{item.Remitter}}</th>
<td>{{item.Income}}</td>
<td>{{item.Fee}}</td>
<th>{{item.TradeDate}}</th>
<td>{{item.ClaimMoney}}</td>
<td>{{item.SurplusMoney}}</td>
</tr>
</table>
</div>
</div>
<div v-if="details.SpecialType && details.SpecialType==15">
<div class="_tit">
......@@ -444,7 +475,9 @@ export default {
zhaohongList: [],
KimonoList: [],
opFinanceFeeList: [],
JapanCarModel: {}
JapanCarModel: {},
saleClaimList: [],
IsFinanceORAdmin:false,
}
},watch:{
'GetDetail': {
......@@ -464,6 +497,9 @@ export default {
if (userInfo.ActionMenuCode.indexOf('F_AccountantFinanceMerge') != -1) {
this.IsFinancePermission = true;
}
if (userInfo.ActionMenuCode.indexOf('F_AccountantFinanceMerge') != -1 || userInfo.ActionMenuCode.indexOf('isManageFinance') != -1) {
this.IsFinanceORAdmin = true;
}
},
methods:{
sureAccount(){
......@@ -532,6 +568,8 @@ export default {
this.getOPFinanceFeeList(18);
}else if(this.details.SpecialType && this.details.SpecialType==15){
this.getOPFinanceFeeList(14);
}else if(this.details.SpecialType && this.details.SpecialType==16){
this.getSaleClaimList();
}
},
goTravelControlList(id){
......@@ -543,6 +581,13 @@ export default {
goDetail(id){
this.$router.push({ name: 'FinancialDocumentsDetail',query:{"id":id,blank:'y',tab:'单据详情'} })
},
goClaim(id){
if(this.IsFinanceORAdmin){
this.$router.push({ name: 'Manfunds',query:{"ClaimId":id,blank:'y',tab:'认领详情'} })
}else{
this.$router.push({ name: 'Maninfo',query:{"ClaimId":id,blank:'y',tab:'认领详情'} })
}
},
goElectricityGoods(id){
this.$router.push({ name: 'ElectricityGoods',query:{"Id":id,unEdit:true,blank:'y'} })
},
......@@ -627,8 +672,6 @@ export default {
}, err => {})
},
getOPFinanceFeeList(type){
console.log("我进来了。。。");
this.loading = true
let msg={
FrId:this.FrID,
......@@ -639,7 +682,22 @@ export default {
if (res.data.resultCode == 1) {
let data=res.data.data;
this.opFinanceFeeList=data;
console.log("我进来了1",data);
}
else{
this.Error(res.data.message)
}
}, err => {})
},
getSaleClaimList(){
this.loading = true
let msg={
FinanceId:this.FrID,
};
this.apipost('Financial_post_GetFinanceSaleClaimList', msg, res => {
this.loading = false
if (res.data.resultCode == 1) {
let data=res.data.data;
this.saleClaimList=data;
}
else{
this.Error(res.data.message)
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ d454769a
......@@ -346,6 +346,24 @@
cursor: pointer;
}
.ReceiptFlow-form{
width: 330px;
position: fixed;
z-index: 2;
right: 16px;
top: 100px;
background: #fff;
padding: 14px 26px 14px 13px;
border-radius: 8px;
}
.ReceiptFlow-title{
font-size: 18px;
font-weight: bold;
padding: 0 0 10px 0;
}
</style>
<template>
<div class="page_addFD" v-loading='loading'>
......@@ -563,7 +581,7 @@
</td>
<td>{{bankType==12&&msg&&msg.BankList[0]&&msg.BankList[0].AccountId==95?$t('objFill.zuiwanduifutime'):$t('fnc.hkshijian')}}</td>
<td colspan="2">
<el-date-picker clearable class="w150 _border_b_1" v-model="msg.TradeDate" type="date" format="yyyy-MM-dd"
<el-date-picker clearable class="w150 _border_b_1" v-model="msg.TradeDate" type="date" format="yyyy-MM-dd" @change="BankTradeDateChange"
value-format="yyyy-MM-dd">
</el-date-picker>
</td>
......@@ -806,6 +824,80 @@
<OrderReceivablesAccount v-if="isReceivablesAccount"
:clientData="clientData" @ClosePopup="isReceivablesAccount=false"></OrderReceivablesAccount>
<!-- 收款流水 -->
<div class="ReceiptFlow-form" :style="{'top':'110px','width':'650px'}" v-if="IsShowBankFlow">
<div class="ReceiptFlow-title">到账流水认领 <span style="font-size: 12px;">(财务每天中午与下午下班前会导入银行流水、如未查到流水请先暂存单据)</span></div>
<div class="flexOne">
<ul style="display: flex; font-size: 12px;">
<li>
<span>
<em>金额</em>
<el-input style="width:70px" v-model="BankFlowMsg.SIncome"></el-input>
-
<el-input style="width:70px" v-model="BankFlowMsg.EIncome"></el-input>
</span>
</li>
<li style="margin-left: 20px;">
<span>
<em>单位</em>
<el-input style="width:80px" v-model="BankFlowMsg.Remitter"></el-input>
</span>
</li>
<li style="margin-left: 20px;">
<span>
<em>{{$t('admin.admin_status')}}</em>
<el-select filterable v-model='BankFlowMsg.Type' style="width:90px" disabled >
<el-option :value="1" :label="$t('objFill.v101.yirenlin')"></el-option>
<el-option :value="2" :label="$t('objFill.v101.weirenlin')"></el-option>
</el-select>
</span>
</li>
<li style="margin-left: 20px;">
<button class="hollowFixedBtn" @click="GetBankFlowData(1)">{{$t('pub.searchBtn')}}</button>
</li>
</ul>
</div>
<el-table ref="multipleTable" :data="BankFlowData" max-height="600px" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="25">
</el-table-column>
<el-table-column label="编号" width="70">
<template slot-scope="scope">{{ scope.row.ID }}</template>
</el-table-column>
<el-table-column
prop="TradeDate"
label="汇款时间"
width="80">
</el-table-column>
<el-table-column
prop="TotalMoney"
label="客人付款"
show-overflow-tooltip>
</el-table-column>
<el-table-column width="65"
prop="Fee"
label="手续费"
show-overflow-tooltip>
</el-table-column>
<el-table-column width="125"
prop="Remitter"
label="对方单位"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="ClaimMoney" label="已认领" show-overflow-tooltip>
<template slot-scope="scope">{{ (scope.row.ClaimMoney>0?scope.row.ClaimMoney:'-') }}</template>
</el-table-column>
<el-table-column label="当前认领">
<template slot-scope="scope">
<template v-if="multipleSelection.length<=1">-</template>
<el-input v-else v-model="scope.row.AuditMoney" placeholder="请输入认领金额"></el-input>
</template>
</el-table-column>
</el-table>
</div>
</div>
</template>
<script>
......@@ -983,12 +1075,28 @@
isReceivablesAccount: false,
clientData: {},
PlatformUserNameList: [],
showSigningCustomer : false
showSigningCustomer : false,
IsShowBankFlow:false,
BankFlowData:[],
BankFlowMsg:{
AccountName:"",
BankType:1,
BankAccountId:0,
SIncome:"",
EIncome: "",
StartTime:"",
EndTime: "",
Remitter:"",
Type:2,
FinanceId:0
},
multipleSelection:[]
}
},
methods: {
// 获取订单客户收款账号
getReceivablesAccount(OrderID){
return;// 2025-03-25 这套24年初已经弃用了，暂时不请求接口
this.apipost('Financial_post_GetCanActivityContractInfo', {
OrderId: OrderID
}, res => {
......@@ -1655,6 +1763,19 @@
},
Financial_post_Set(){
this.loading = true;
//组装 银行流水
if(this.multipleSelection && this.multipleSelection.length>0){
this.msg.FinanceRelevanceList=[];
this.multipleSelection.forEach(x=>{
let frObj = {
Type:20,
RelevanceFrId:x.ID,
ShareMoney:x.AuditMoney
};
this.msg.FinanceRelevanceList.push(frObj);
});
}
this.apipost('Financial_post_Set', this.msg, res => {
if (res.data.resultCode == 1) {
this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
......@@ -2157,6 +2278,9 @@
this.detailList.CostTypeId = this.tradeObj.CostType
this.detailList.CostTypeName = "团费"
}
if(data.SpecialType && data.SpecialType==16){
this.GetBankFlowData(0);//显示认领单
}
} else {
this.loading = false;
this.$message.error(res.data.message);
......@@ -2304,6 +2428,55 @@
}
}, err => {})
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
GetBankFlowData(type){
if(!this.msg.BankList || this.msg.BankList.length<=0){return;}
if(!this.msg.detailList || this.msg.detailList.length<=0){return;}
if(this.msg.TradeDate==''){return;}
if(!(this.msg.BankList[0].Type==1 || (this.msg.BankList[0].Type==2 && this.msg.BankList[0].AccountId==92))){return;}
//验证日期 必须大于 上线的那一天 -------------------------------------------- 注意调整
const currentDate = new Date(this.msg.TradeDate);
const limitDate = new Date('2025-03-31');
if(currentDate < limitDate && this.EmployeeId!=955){return;}
if(this.msg.detailList[0].CurrencyId!=1){return;}
this.BankFlowMsg.BankType = this.msg.BankList[0].Type;
this.BankFlowMsg.BankAccountId = this.msg.BankList[0].AccountId;
this.BankFlowMsg.StartTime = this.msg.TradeDate;
this.BankFlowMsg.EndTime = this.msg.TradeDate;
if(type!=1){
this.BankFlowMsg.SIncome=0;
this.BankFlowMsg.EIncome=0;
this.msg.detailList.forEach(x => {
this.BankFlowMsg.SIncome += x.UnitPrice * x.Number;
this.BankFlowMsg.EIncome += x.UnitPrice * x.Number;
})
if(this.BankFlowMsg.SIncome<=0){return;}
}
this.BankFlowMsg.FinanceId = this.msg.FrID;
this.apipost('Financial_post_GetFinanceRemittanceClaimList', this.BankFlowMsg, res => {
if(res.data.resultCode == 1) {
this.BankFlowData = res.data.data;
this.IsShowBankFlow=true;
setTimeout(()=>{
this.BankFlowData.forEach(x => {
if(x.Mark == 1){
this.$refs.multipleTable.toggleRowSelection(x);
}
});
},300)
} else {
this.Error(res.data.message);
}
}, err => {})
},
BankTradeDateChange(){
this.GetBankFlowData(0);
}
},
created() {
let that = this;
......
src/components/systemManagement/Manfunds.vue
View file @ d454769a
......@@ -120,7 +120,7 @@
<li>
<span>
<em>{{$t('hotel.hotel_SerialNumber')}}</em>
<el-input onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" v-model="msg.ID"></el-input>
<el-input type="Number" v-model="msg.ID"></el-input>
</span>
</li>
<li>
......@@ -205,8 +205,10 @@
</div>
<div style="margin:15px 0;font-size:14px">
<span>{{$t('objFill.v101.weirenzongs')}}：{{datainfo.Income}}</span>
<span style="margin:0 15px">{{$t('objFill.v101.shenhejine')}}：{{datainfo.AuditMoney}}</span>
<span>{{$t('objFill.v101.jinribaob')}}：{{datainfo.ReportMoney}}</span>
<span>已认领：{{datainfo.ClaimMoney}}</span>
<span>待认领：{{datainfo.SurplusMoney}}</span>
<!-- <span style="margin:0 15px">{{$t('objFill.v101.shenhejine')}}：{{datainfo.AuditMoney}}</span>
<span>{{$t('objFill.v101.jinribaob')}}：{{datainfo.ReportMoney}}</span> -->
</div>
<div class="cm_content _scrollbar">
......@@ -217,13 +219,14 @@
<th>{{$t('fnc.bieming')}}/{{$t('objFill.huming')}}</th>
<th>{{$t('objFill.v101.kaihuhzhao')}}</th>
<th>{{$t('objFill.jiapyitime')}}</th>
<th>{{$t('objFill.v101.DomesticModule.shou')}}</th>
<th>{{$t('fnc.w_zhi')}}</th>
<th>客人付款</th>
<th>到账金额</th>
<th>手续费</th>
<th>{{$t('objFill.duifanghuming')}}</th>
<th>{{$t('objFill.v101.renlindanhao')}}</th>
<th>{{$t('objFill.v101.renkuanjine')}}</th>
<th>{{$t('fnc.a_yshenhe')}}</th>
<th>{{$t('objFill.v101.jinribaob')}}</th>
<th>{{$t('objFill.v101.renlindanhao')}}/销售/金额</th>
<th>{{$t('objFill.v101.renkuanjine')}}</th>
<th>余额</th>
<!-- <th>{{$t('objFill.v101.jinribaob')}}</th> -->
<th>{{$t('objFill.v101.caiwuryuan')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
......@@ -234,21 +237,32 @@
<span v-if="item.BankType==2">{{$t('fnc.pingtai')}}</span>
</td>
<td>{{item.Alias}}
<p>{{item.AccountName}}</p>
<!-- <p>{{item.AccountName}}</p> -->
</td>
<td>{{item.OpeningBank}}
<p>{{item.BackNo}}</p>
</td>
<td>{{item.TradeDate}}</td>
<td>{{item.TotalMoney}}</td>
<td>{{item.Income}}</td>
<td>{{item.Refund}}</td>
<td>{{item.Remitter}}</td>
<td>
<span class="hoverFriD" style="cursor: pointer;text-decoration: underline;margin-left:5px" @click="Gourl(i)" v-for="(i,index) in item.FinanceIdList" :key="index+500">{{i}}</span>&nbsp;
<template v-for="(i,index) in item.ClaimList">
<span v-if="i.Status==0" class="hoverFriD" style="cursor: pointer;text-decoration: underline;margin-left:5px; color:blue;" @click="Gourl(i.FinanceId)">
{{i.FinanceId}} / {{i.EmName}} / {{i.Money}} </br>
</span>
<span v-else-if="i.Status==3" class="hoverFriD" style="cursor: pointer;text-decoration: underline;margin-left:5px; color: red;" @click="Gourl(i.FinanceId)">
{{i.FinanceId}} / {{i.EmName}} / {{i.Money}} </br>
</span>
<span v-else class="hoverFriD" style="cursor: pointer;text-decoration: underline;margin-left:5px" @click="Gourl(i.FinanceId)">
{{i.FinanceId}} / {{i.EmName}} / {{i.Money}} </br>
</span>
</template>
</td>
<td>{{item.ClaimMoney}}</td>
<td>{{item.AuditMoney}}</td>
<td>{{item.ReportMoney}}</td>
<td>{{item.SurplusMoney}}</td>
<!-- <td>{{item.ReportMoney}}</td> -->
<td>
<div>{{item.UpdateBy}}</div>
<div style="font-size:12px;">{{item.UpdateDate}}</div>
......@@ -286,8 +300,8 @@
<el-form class="Rform" ref="form" :model="form" label-width="100px">
<p><span>{{$t('objFill.huming')}}：</span>{{form.AccountName}}</p>
<p><span>{{$t('system.table_acc')}}：</span>{{form.BackNo}}</p>
<p><span>{{$t('fnc.w_shou')}}：</span>{{form.Income}}</p>
<p><span>{{$t('fnc.w_zhi')}}：</span>{{form.Refund}}</p>
<p><span>到账：</span>{{form.Income}}</p>
<p><span>手续费：</span>{{form.Refund}}</p>
<el-form-item :label="$t('objFill.v101.bandincwdju')">
<el-input v-model="form.FrId" class="w180"></el-input>
</el-form-item>
......@@ -314,6 +328,7 @@
msg:{
pageIndex:1,
pageSize:14,
ID:'',
StartTime:"",
EndTime:"",
BankAccountId:"",
......@@ -344,6 +359,7 @@
this.importFileUrl2=this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=5&EmployeeId="+userInfo.EmployeeId;
this.downList =this.domainManager().LocalTemplateFileDownLoadUrl +"/Upload/Template/未认款导入模板.xls";
this.msg.ID = this.$route.query.ClaimId ? this.$route.query.ClaimId : '';
this.GetAccount();
this.GetAccount2();
this.getList();
......
src/components/systemManagement/Maninfo.vue
View file @ d454769a
......@@ -195,8 +195,9 @@
<th>{{$t('system.table_acc')}}</th>
<th>{{$t('objFill.jiapyitime')}}</th>
<th>{{$t('objFill.duifanghuming')}}</th>
<th>{{$t('objFill.v101.DomesticModule.shou')}}</th>
<th>{{$t('fnc.w_zhi')}}</th>
<th>到账金额</th>
<th>手续费</th>
<th>已认领</th>
</tr>
<tr v-for="(item,index) in DataList" :key="index">
<td>{{item.ID}}</td>
......@@ -213,9 +214,9 @@
</td>
<td>{{item.TradeDate}}</td>
<td>{{item.Remitter}}</td>
<td>{{item.Income | MoneyMu}}</td>
<td>{{item.Refund | MoneyMu}}</td>
<td>{{item.Income}}</td>
<td>{{item.Refund}}</td>
<td>{{(item.ClaimMoney>0?item.ClaimMoney:'-')}}</td>
</tr>
</table>
......@@ -310,6 +311,8 @@
},
},
mounted(){
this.msg.ID = this.$route.query.ClaimId ? this.$route.query.ClaimId : '';
this.GetAccount();
this.getList();
},
......
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