Commit 3176d417 authored by 332784038@qq.com's avatar 332784038@qq.com

佣金请款汇率业务修改

parent 93d1d869
......@@ -42,6 +42,13 @@ export function getExchangeRatePage(query) {
params: query
})
}
// 获取全部的未过期的可用汇率信息列表
export function getCurrencyRateAllAvailable() {
return request({
url: '/ecw/currency-rate/all/available',
method: 'get'
})
}
// 汇率日志查询
export function getExchangeRateLogList(params){
return request({
......
import request from "@/utils/request"
import { data } from "vue2-ace-editor"
export function getCommissionPaymentList() {
}
// 创建收款单
export function createReceipt(data) {
return request({
......
......@@ -231,7 +231,7 @@
<el-table-column :label="$t('价税合计(RMB)')" align="center" prop="total">
<template slot-scope="scope">
<span>{{
scope.row.total = ((scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate / 100)).toFixed(2)
scope.row.total = (((scope.row.totalAmount * scope.row.targetAmount) / scope.row.sourceAmount).toFixed(2) + ((scope.row.totalAmount * scope.row.targetAmount) / scope.row.sourceAmount).toFixed(2) * (scope.row.taxRate / 100)).toFixed(2)
}}</span>
<!-- <span>{{scope.row.total}}</span> -->
</template>
......@@ -453,20 +453,12 @@ import {getChannelList} from "@/api/ecw/channel";
import CustomerSelector from "@/components/CustomerSelector";
import {listSimpleDepts} from "@/api/system/dept";
import {getTradeCityList} from "@/api/ecw/region";
import {getSupplierPage, getSupplier} from "@/api/ecw/supplier";
import {
getPayableList,
getPayableInfoByIds,
getPaymentInfoByIds,
getPaymentItem,
updatePayment,
payablePage,
commissionPayment,
commissionPaymentUpdate,
getCommissionPayable,
getCommissionPayment,
getCommissionPaymentList, getCommissionPayableList
getCommissionPayment
} from "@/api/ecw/financial"
import {getCurrencyPage} from "@/api/ecw/currency";
import NP from 'number-precision'
......@@ -474,7 +466,7 @@ import {getWarehouseList} from '@/api/ecw/warehouse'
import WorkFlow from '@/components/WorkFlow/'
import {getCustomer, getCustomerPage} from "@/api/ecw/customer";
import Template from "@/views/cms/template/index.vue";
import {getExchangeRatePage} from "@/api/ecw/exchangeRate";
import {getCurrencyRateAllAvailable} from "@/api/ecw/exchangeRate";
export default {
name: "commission-requestFunds",
......@@ -521,7 +513,7 @@ export default {
},
async created() {
await getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
await getExchangeRatePage({page:1,rows: 100}).then(res => this.rateList = res.data.list)
await getCurrencyRateAllAvailable().then(res => this.rateList = res.data)
getWarehouseList().then(res => this.warehouseList = res.data)
let that = this;
if (that.$route.query.payableId && that.$route.query.payableId !== '0') {
......@@ -746,7 +738,13 @@ export default {
handleSelectionChange(val) {
this.multipleSelection = val.map(v => {
let p = this.rateList.find(i =>i.sourceCurrencyId === v.currencyId && i.targetCurrencyId === 3)
return Object.assign(v, {exchangeRate: p.currencyRate})
return Object.assign(v, {
exchangeRate : (p.sourceCurrencyCode+" "+p.sourceAmount+" : "+p.targetAmount+" "+p.targetCurrencyCode),
sourceAmount : p.sourceAmount,
sourceCurrencyCode : p.sourceCurrencyCode,
targetAmount : p.targetAmount,
targetCurrencyCode : p.targetCurrencyCode
})
});
},
hiddenDialog() {
......
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