Skip to content

J
jiedao-app-operator-master
Commit f8bef492 authored by 我在何方's avatar 我在何方
Browse files
Options

请款单bug

parent a741ccc9
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 13 deletions
src/views/ecw/financial/creatCollection.vue
View file @ f8bef492
...@@ -305,6 +305,7 @@ ...@@ -305,6 +305,7 @@
v-if="scope.row.type !== 'total'" v-if="scope.row.type !== 'total'"
label="" label=""
label-width="0" label-width="0"
required
style="margin-bottom: 0" style="margin-bottom: 0"
:prop="`receiptAccountList.${scope.$index}.platformAccountId`" :prop="`receiptAccountList.${scope.$index}.platformAccountId`"
> >
...@@ -719,7 +720,6 @@ export default { ...@@ -719,7 +720,6 @@ export default {
selectListRow: {}, selectListRow: {},
selectListIndex: 0, selectListIndex: 0,
flag: false, flag: false,
orderData:{}
}; };
}, },
async created() { async created() {
...@@ -909,8 +909,8 @@ export default { ...@@ -909,8 +909,8 @@ export default {
receivableAmount: dollar, receivableAmount: dollar,
writeOffRate: t?.writeOffRate || (this.showCurrencyId === 1 ? 1 : this.showCurrencyId === 2 ? this.UStoRMB() : this.UStoNAN()), writeOffRate: t?.writeOffRate || (this.showCurrencyId === 1 ? 1 : this.showCurrencyId === 2 ? this.UStoRMB() : this.UStoNAN()),
platformAccountId: t?.platformAccountId || '', platformAccountId: t?.platformAccountId || '',
collectionCurrencyId: t?.collectionCurrencyId || '', collectionCurrencyId: t?.collectionCurrencyId || 1,
collectionRate: t?.collectionRate || '' collectionRate: t?.collectionRate || 1
} }
] ]
this.calculationCount(NP.minus(dollar, discountDollar), 1) this.calculationCount(NP.minus(dollar, discountDollar), 1)
...@@ -950,7 +950,8 @@ export default { ...@@ -950,7 +950,8 @@ export default {
writeOffRate: t?.writeOffRate || (this.showCurrencyId === 1 ? this.NANtoUS() : this.showCurrencyId === 2 ? this.NANtoRMB() : 1), writeOffRate: t?.writeOffRate || (this.showCurrencyId === 1 ? this.NANtoUS() : this.showCurrencyId === 2 ? this.NANtoRMB() : 1),
platformAccountId: t?.platformAccountId || '', platformAccountId: t?.platformAccountId || '',
collectionCurrencyId: t?.collectionCurrencyId || '', collectionCurrencyId: t?.collectionCurrencyId || '',
collectionRate: t?.collectionRate || '' collectionRate: t?.collectionRate || '',
collectionAmount:discountNaira
} }
] ]
this.calculationCount(NP.minus(naira, discountNaira), 3) this.calculationCount(NP.minus(naira, discountNaira), 3)
...@@ -961,7 +962,7 @@ export default { ...@@ -961,7 +962,7 @@ export default {
this.form.receiptAccountList = [...this.form.receiptAccountList, { this.form.receiptAccountList = [...this.form.receiptAccountList, {
type: 'total', type: 'total',
writeOffAmount: totalt, writeOffAmount: totalt,
collectionAmount: [0, 0, 0] collectionAmount: [this.form.receiptAccountList.discountNaira, 0, 0]
}] }]
this.form.receivableTotalAmount = totalt this.form.receivableTotalAmount = totalt
...@@ -1136,6 +1137,10 @@ export default { ...@@ -1136,6 +1137,10 @@ export default {
this.$modal.msgError(this.$t('请添加未收客户款项')); this.$modal.msgError(this.$t('请添加未收客户款项'));
return return
} }
if(!params.platformAccountId){
this.$modal.msgError(this.$t('请选择期望收款账户'));
return
}
// params.receiptAccountList.length = params.receiptAccountList.length - 1 // params.receiptAccountList.length = params.receiptAccountList.length - 1
params.receiptAccountList.splice(params.receiptAccountList.length - 1,1) params.receiptAccountList.splice(params.receiptAccountList.length - 1,1)
params.receiptAccountList.map(v => { params.receiptAccountList.map(v => {
......
src/views/ecw/financial/printPaymentVoucher.vue
View file @ f8bef492
...@@ -9,15 +9,18 @@ ...@@ -9,15 +9,18 @@
</div> </div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('申请日期') }}：</div> <span>{{ form.applicationAt || '-' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('申请日期') }}：</div> <span>{{ form.applicationAt || '-' }}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('结算方式') }}：</div><span>{{ form.settlementType || '-' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('结算方式') }}：</div><span> <dict-tag
:type="DICT_TYPE.CUSTOMER_BALANCE"
v-model="form.settlementType"
/></span></div>
</div> </div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('付款公司') }}：</div><span>{{ form.supplierName || '-' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('付款公司') }}：</div><span>{{ form.supplierName || '-' }}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行户名') }}：</div><span>{{ findBank(form.supplierBankAccount).baAccountName || '-' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行户名') }}：</div><span>{{ form.supplierBankAccountName || '-' }}</span></div>
</div> </div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行名称') }}：</div><span>{{ findBank(form.supplierBankAccount).baBankName || '-' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行名称') }}：</div><span>{{ form.supplierBank|| '-' }}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行账号') }}：</div><span>{{ findBank(form.supplierBankAccount).baAccountNum || '-' }}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行账号') }}：</div><span>{{ form.supplierBankAccount || '-' }}</span></div>
</div> </div>
<!-- <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <!-- <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;">水单号：</div><span>{{form?form.accountBank:'无'}}</span></div> <div style="flex:1"><div style="width: 120px;text-align: right;">水单号：</div><span>{{form?form.accountBank:'无'}}</span></div>
...@@ -174,6 +177,7 @@ ...@@ -174,6 +177,7 @@
}, },
findBank(val) { findBank(val) {
const t = this.bankData.find(v => v.id == val) const t = this.bankData.find(v => v.id == val)
console.log(t)
return t || {} return t || {}
}, },
totalMoney() { totalMoney() {
...@@ -205,7 +209,7 @@ ...@@ -205,7 +209,7 @@
var chineseStr = ''; var chineseStr = '';
//分离金额后用的数组，预定义 //分离金额后用的数组，预定义
var parts; var parts;
// 传入的参数为空情况 // 传入的参数为空情况
if(money === '') { if(money === '') {
return ''; return '';
} }
...@@ -213,7 +217,7 @@ ...@@ -213,7 +217,7 @@
if(money >= maxNum){ if(money >= maxNum){
return '' return ''
} }
// 传入的参数为0情况 // 传入的参数为0情况
if (money === 0) { if (money === 0) {
chineseStr = cnNums[0] + cnIntLast + cnInteger; chineseStr = cnNums[0] + cnIntLast + cnInteger;
return chineseStr return chineseStr
...@@ -248,7 +252,7 @@ ...@@ -248,7 +252,7 @@
chineseStr += cnNums[parseInt(n)] + cnIntRadice[m]; chineseStr += cnNums[parseInt(n)] + cnIntRadice[m];
} }
if(m == 0 && zeroCount < 4){ if(m == 0 && zeroCount < 4){
chineseStr += cnIntUnits[q]; chineseStr += cnIntUnits[q];
} }
} }
// 最后+ 元 // 最后+ 元
......
src/views/ecw/financial/receivable.vue
View file @ f8bef492
...@@ -193,7 +193,11 @@ ...@@ -193,7 +193,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="num" /> <el-table-column :label="$t('箱数')" align="center" prop="num" />
<el-table-column :label="$t('体积/重量')" align="center" prop="weight" /> <el-table-column :label="$t('体积/重量')" align="center" prop="weight" >
<template slot-scope="scope">
{{ scope.row.volume}}/ {{ scope.row.weight}}
</template>
</el-table-column>
<el-table-column :label="$t('发货人')" align="center" prop="consignorName" /> <el-table-column :label="$t('发货人')" align="center" prop="consignorName" />
<el-table-column :label="$t('收货人')" align="center" prop="consigneeName" /> <el-table-column :label="$t('收货人')" align="center" prop="consigneeName" />
<el-table-column :label="$t('订单状态')" align="center" prop="status"> <el-table-column :label="$t('订单状态')" align="center" prop="status">
......
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