Commit 9c72dc3c authored by liudong1993's avatar liudong1993

1 月结

parent 6facbb85
...@@ -125,6 +125,11 @@ ...@@ -125,6 +125,11 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="close">{{$t('pub.cancelBtn')}}</el-button> <el-button class="hollowFixedBtn" @click="close">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="clicksubmit">{{$t('pub.sureBtn')}}生成</el-button> <el-button class="normalBtn" type="primary" @click="clicksubmit">{{$t('pub.sureBtn')}}生成</el-button>
<el-select style="width: 90px;" filterable v-model="financeType" placeholder="请选择">
<el-option label="收款单" :value="1"></el-option>
<el-option label="支出单" :value="2"></el-option>
</el-select>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -136,6 +141,7 @@ ...@@ -136,6 +141,7 @@
data() { data() {
return { return {
showDialog: true, showDialog: true,
financeType : 2,
dataList: [], dataList: [],
OriginalMoney: 0,//原币合计 OriginalMoney: 0,//原币合计
OriginalMoneyThe: 0,//原币合计支 OriginalMoneyThe: 0,//原币合计支
...@@ -195,6 +201,12 @@ ...@@ -195,6 +201,12 @@
// 收入 // 收入
this.OriginalMoneyClosed = OriginalMoneyClosed/100 this.OriginalMoneyClosed = OriginalMoneyClosed/100
this.HandlingChargeMoneyClosed = HandlingChargeMoneyClosed/100 this.HandlingChargeMoneyClosed = HandlingChargeMoneyClosed/100
if(this.OriginalMoney>=0){
this.financeType=2;
}else{
this.financeType=1;
}
}, },
deep: true, deep: true,
immediate: true immediate: true
...@@ -204,12 +216,13 @@ ...@@ -204,12 +216,13 @@
clicksubmit(){ clicksubmit(){
let ids let ids
ids = this.dataList.map(x=>{ return x.FrID}) ids = this.dataList.map(x=>{ return x.FrID})
if(this.financeType==2){
let orderObj = { let orderObj = {
CostType: this.OriginalMoneyThe!=0?1547:null, CostType: this.OriginalMoneyThe!=0?1547:null,
CostType2: this.isHandlingChargeThe?1547:null, CostType2: this.isHandlingChargeThe!=0?1547:null,
CostType3: this.isHandlingChargeThe&&this.balanceMoney?114:null,//114转账手续费 CostType3: this.isHandlingChargeThe!=0&&this.balanceMoney!=0?114:null,//114转账手续费
HandlingChargeMoney: this.isHandlingChargeThe?this.HandlingChargeMoneyThe:null,//手续费 HandlingChargeMoney: this.isHandlingChargeThe!=0?this.HandlingChargeMoneyThe:null,//手续费
balanceMoney: this.isHandlingChargeThe&&this.balanceMoney?this.balanceMoney:null,//差额 balanceMoney: this.isHandlingChargeThe!=0&&this.balanceMoney!=0?this.balanceMoney:null,//差额
OtherType: 75, OtherType: 75,
Money: this.OriginalMoneyThe!=0?this.OriginalMoneyThe:null, Money: this.OriginalMoneyThe!=0?this.OriginalMoneyThe:null,
MoneyClosed: this.OriginalMoneyClosed!=0?Number(`-${this.OriginalMoneyClosed}`):null, MoneyClosed: this.OriginalMoneyClosed!=0?Number(`-${this.OriginalMoneyClosed}`):null,
...@@ -227,7 +240,31 @@ ...@@ -227,7 +240,31 @@
'orderObj': JSON.stringify(orderObj), 'orderObj': JSON.stringify(orderObj),
} }
}); });
// this.$emit('success') }else{
let orderObj = {
CostType: this.OriginalMoneyClosed!=0?1547:null,
CostType2: this.isHandlingChargeThe!=0?1547:null,
CostType3: this.isHandlingChargeThe!=0&&this.balanceMoney!=0?114:null,//114转账手续费
HandlingChargeMoney: this.isHandlingChargeThe!=0?this.HandlingChargeMoneyThe:null,//手续费
balanceMoney: this.isHandlingChargeThe!=0&&this.balanceMoney!=0?this.balanceMoney:null,//差额
OtherType: 75,
Money: this.OriginalMoneyClosed!=0?this.OriginalMoneyClosed - this.OriginalMoneyThe:null,
MoneyClosed: this.OriginalMoneyThe!=0?Number(`-${this.OriginalMoneyThe}`):null,
isVerifyMoney: true,
ReFinanceIds: ids.join(','),//单号
ReFinanceId2: 3,//成本
}
this.$emit('close')
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query: {
'Type': 1,
'searchTitle': '月结',
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
}
});
}
}, },
close(){ close(){
this.$emit('close') this.$emit('close')
......
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