Skip to content

S
SuperMan
Commit 3b610874 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 12c514e8 b06530a0
Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 2 deletions
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 3b610874
......@@ -280,7 +280,7 @@
<td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
<td height="34px" colspan="7" class="_color_b">
<template v-for="(item,index) in GetDetail.CashierDetail">
<p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（<span v-if="item.Rate!=1" style="margin-right:10px;">{{item.OriginalMoney}}/</span>{{item.Money}}） </p>
<p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（<span v-if="item.Rate!=1" style="margin-right:10px;">{{item.OriginalMoney}}/</span>{{item.Money}}） <span v-if="item.MultiplePay>0">{{item.MultPayDate}}[{{item.MultiplePay}}]</span></p>
</template>
</td>
</tr>
......
src/components/FinancialModule/accDetail/AccountStatementDetail.vue
View file @ 3b610874
......@@ -182,7 +182,7 @@
<td>
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
</td>
<td>{{item.AllotDate}}</td>
<td>{{item.AllotDate}}<span v-if="item.MultiplePay>0"> [{{item.MultiplePay}}]</span></td>
<td>{{(item.FType==1?$t('restaurant.res_income'):item.FType==2?$t('restaurant.res_outcome'):item.FType==4?$t('objFill.tiaobo'):'-')}}</td>
<!-- <td>{{item.FrIdStr}}</td> -->
<td>{{item.SubjectName}}</td>
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 3b610874
......@@ -183,6 +183,7 @@
</el-form>
<ul>
<li>
<input type="button" class="hollowFixedBtn" value="追加付款" @click="MultPay"/>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
......@@ -488,6 +489,211 @@
</div>
</el-dialog>
<el-dialog custom-class='w750 height="34px"' title="多期付款" :visible.sync="MultPayShow" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit">
单据应付 <span>{{ moneyFormat(MultPayData.WBAgoMoney) }}</span>{{MultPayData.CurrencyName}} &nbsp;&nbsp;&nbsp;&nbsp;
剩余待付 <span>{{ moneyFormat(MultPayData.WBMoney) }}{{MultPayData.CurrencyName}}</span>
</p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;">
<template>
<tr >
<th height="34px">{{$t('fnc.zhfenlei')}}</th>
<th height="34px">{{$t('fnc.fkfangshi')}}</th>
<th height="34px">{{$t('fnc.acc')}}</th>
<th height="34px">{{$t('fnc.jine')}}</th>
<th height="34px" width="70">{{$t('hotel.hotel_Currency')}}</th>
<th height="34px" width="50px">{{$t('hotel.hotel_CurrentRate')}}</th>
<th height="34px" width="100px">{{$t('fnc.a_zongjine')}}</th>
</tr>
<template v-for="(item,index) in payMsgList">
<tr v-if="!item.show" @click="payMsgList[index].show=true">
<td height="34px">{{item.AccName}}</td>
<td height="34px">{{item.Name}}</td>
<td height="34px">{{item.Account}}</td>
<td height="34px">{{moneyFormat(item.OriginalMoney)}}</td>
<td height="34px">{{item.CurrenName}}</td>
<td height="34px">{{item.Rate}}</td>
<td height="34px">{{moneyFormat(item.allMoney)}}</td>
</tr>
<tr v-else class="_show_class">
<td>
<el-select filterable v-model='item.AccName' @change="clearAccBank()" class=" _border_b_1">
<el-option v-for='i in AccListT'
:label='i.Name'
:value='i.Name'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='item.Type' @change="getAccountList(item.Type)" class=" _border_b_1">
<el-option v-for='i in GetAccountType'
:label='i.Name'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-input v-model="item.OriginalMoney" @change="Calculation(1,index)"
@blur="item.show=false,CalculationMoney()"
:placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{item.CurrenName}}</p>
</td>
<td>
<el-input v-model="item.Rate" @blur="item.show=false,CalculationMoney()" @change="Calculation(1,index)"
type="number" class=" _border_b_1"></el-input>
</td>
<td>{{moneyFormat(item.allMoney)}} <i @click="deleteRow(item,index),CalculationMoney()" class="_delete_row iconfont icon-img_delete_small"></i></td>
</tr>
</template>
<tr>
<td>
<el-select filterable v-model='payMsg.AccName' @change="clearAccBank(),addList()" class=" _border_b_1">
<el-option v-for='i in AccListT'
:label='i.Name'
:value='i.Name'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.Type' @change="getAccountList(payMsg.Type),addList()" class=" _border_b_1">
<el-option v-for='i in GetAccountType'
:label='i.Name'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.AccountId' :placeholder="$t('rule.qxzzhanghu')"
@change="setAccountName(payMsg.AccountId,2),addList()" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" :placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{payMsg.CurrenName}}</p>
</td>
<td>
<el-input v-model="payMsg.Rate" @blur="addList()" @change="Calculation(2)" type="number" class=" _border_b_1"></el-input>
</td>
<td>{{moneyFormat(payMsg.allMoney)}}</td>
</tr>
</template>
<tr>
<td height="34px">{{$t('fnc.a_zongjine')}}</td>
<td height="34px" colspan="7">
<el-input v-model="listAllMoney" type="number" :placeholder="$t('rule.qsrzjine')" class=" _border_b_1"></el-input>
</td>
</tr>
<tr v-if="BillType===2">
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="5">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
type="date"
:default-value="TradeDate"
value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
</tr>
<tr v-if="BillType===1">
<td>{{$t('fnc.huikuanren')}}</td>
<td colspan="1">
<el-input v-model="addMsg.RemitterName" type="text" class=" _border_b_1"></el-input>
</td>
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="1">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
<td>{{$t('objFill.v103.liushukemu')}}</td>
<td colspan="2">
<el-select class="width100b" v-model="addMsg.BankSubjectId"
filterable
:placeholder="$t('objFill.v103.qingxuanzlskm')">
<el-option
v-for="item in SubjectTypeList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
/>
</el-select>
</td>
</tr>
</table>
<el-form label-width="110px">
<el-row>
<el-col :span="12" :gutter="35">
<el-form-item :label="$t('objFill.shangchuanpz')">
<div class="_addUpload_box clearfix" >
<template v-for="(file,fIndex) in saveMsg">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==1">
<div class="iconfont " :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
</template>
<div class="_pic_upload">
<el-upload
drag
:http-request="uploadFileBtn"
:multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
</el-upload>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitMultPay">{{$t('pub.saveBtn')}}</button>
&nbsp;
<button class="hollowFixedBtn" @click="initAddChuNa">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<div v-if='picIsShow' class="_show_img_box" @click="picIsShow=false,picObj=[]">
<div style="position: absolute; width: 800px; height: 600px; left: 50%; top: 50%; margin-left: -400px; margin-top: -300px;">
<el-carousel :initial-index=initialIndex height="600px" :interval="5000" trigger="click">
......@@ -601,6 +807,8 @@ export default {
TradeDate:'',
initialIndex: 0,
SubjectTypeList: [],
MultPayShow:false,
MultPayData:{}
}
},
created(){
......@@ -842,6 +1050,7 @@ export default {
this.huikuanren = '';
this.TradeDate='';
this.addChuNa = false;
this.MultPayShow= false;
this.payMsg = {
ID:0,
FinanceId:'',
......@@ -1000,6 +1209,47 @@ export default {
this.payMsg.Type = '';
this.payMsg.AccountId = '';
},
submitMultPay(){
if(this.addMsg.TradeDate==='') return this.$message.error(this.$t('fnc.a_qxzjyriqi'));
if(this.BillType===1&&this.addMsg.RemitterName==='') return this.$message.error(this.$t('rule.qtxhkuanren')) ;
let str = '';
this.checkList.forEach(x=>{
if(x.FinanceId){
str = str+x.FinanceId+','
}
});
this.addMsg.FrIDs = str.substring(0,str.length-1);
this.addMsg.BankList = this.payMsgList;
this.addMsg.Money = this.listAllMoney;
this.allLoading = true
this.apipost('Financial_post_SetMultipleMergePay',this.addMsg,r=>{
if(r.data.resultCode === 1) {
this.MultPayShow = false;
this.saveMsg=[];
this.payMsgList = []
this.payMsg = {
ID:0,
FinanceId:'',
Type:'',
AccountId:'',
OriginalMoney:0,
CurrencyId:'',
Rate:0,
Fee:0,
Name:'',
CurrenName:'',
Account:'',
balance:'',
allMoney:0,
show:false,
}
this.$message.success(r.data.message)
}else{
this.$message.error(r.data.message)
}
this.allLoading = false
},null)
},
submitAddChuNa(){
// if(this.payMsgList.length===0) return this.$message.error(this.$t('fnc.a_qxzjyfangshi'));
if(this.addMsg.TradeDate==='') return this.$message.error(this.$t('fnc.a_qxzjyriqi'));
......@@ -1139,6 +1389,30 @@ export default {
this.$message.error(this.$t('fnc.a_qxzdanju'))
}
},
MultPay(){ // 添加出纳按钮点击事件
this.checkList.forEach(x=>{
if(x.FinanceId){
this.addMsg.FrIDs = this.addMsg.FrIDs + x.FinanceId + ',';
}
});
if(this.addMsg.FrIDs){
let s = this.addMsg.FrIDs;
s = s.substring(0,s.length - 1);
this.addMsg.FrIDs = s;
this.addMsg.IsAdvanceFinance='0';
this.addMsg.vorcherInos=[];
}else{
this.$message.error(this.$t('fnc.a_qxzdanju'))
}
this.apipost('Financial_post_GetMultipleMergePayBalance',this.addMsg,res=>{
if(res.data.resultCode==1){
this.MultPayData = res.data.data;
this.MultPayShow=true;
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
addList(){
if(this.payMsg.AccountId==='')return;
if(this.payMsg.OriginalMoney===0||this.payMsg.OriginalMoney==='')return;
......
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