mirror of
https://github.com/PanJiaChen/vue-element-admin.git
synced 2025-08-10 12:01:57 +08:00
Fix Overdrawn Invoice (#1018)
Co-authored-by: elsiosanchez <elsiossanches@gmail.com>
This commit is contained in:
parent
cbca721eaa
commit
632e7623dd
@ -79,13 +79,16 @@ export default [
|
|||||||
elementColumnName: 'EMail',
|
elementColumnName: 'EMail',
|
||||||
columnName: 'EMail',
|
columnName: 'EMail',
|
||||||
tableName: 'AD_user',
|
tableName: 'AD_user',
|
||||||
tabindex: '3',
|
|
||||||
isFromDictionary: true,
|
isFromDictionary: true,
|
||||||
overwriteDefinition: {
|
overwriteDefinition: {
|
||||||
sequence: 4,
|
sequence: 9,
|
||||||
isCustomField: true,
|
handleActionKeyPerformed: true,
|
||||||
displayLogic: `@TenderType@=='D'`,
|
handleContentSelection: true,
|
||||||
size: 24
|
handleActionPerformed: true,
|
||||||
|
size: 24,
|
||||||
|
displayLogic: `@TenderType@=='D' || @TenderType@=='Z'`,
|
||||||
|
isActiveLogics: true,
|
||||||
|
isMandatory: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -116,7 +119,7 @@ export default [
|
|||||||
handleActionKeyPerformed: true,
|
handleActionKeyPerformed: true,
|
||||||
handleActionPerformed: true,
|
handleActionPerformed: true,
|
||||||
handleContentSelection: true,
|
handleContentSelection: true,
|
||||||
displayLogic: `@TenderType@<>'X'`,
|
displayLogic: `@TenderType@<>'X' & @TenderType@<>'Z'`,
|
||||||
size: 24,
|
size: 24,
|
||||||
isActiveLogics: true,
|
isActiveLogics: true,
|
||||||
isMandatory: true
|
isMandatory: true
|
||||||
@ -169,7 +172,7 @@ export default [
|
|||||||
handleContentSelection: true,
|
handleContentSelection: true,
|
||||||
handleActionPerformed: true,
|
handleActionPerformed: true,
|
||||||
size: 24,
|
size: 24,
|
||||||
displayLogic: `@TenderType@=='M'`,
|
displayLogic: `@TenderType@=='M' || @TenderType@=='D'`,
|
||||||
isActiveLogics: true,
|
isActiveLogics: true,
|
||||||
isMandatory: true
|
isMandatory: true
|
||||||
}
|
}
|
||||||
|
@ -112,9 +112,6 @@
|
|||||||
<el-card>
|
<el-card>
|
||||||
<div slot="header" class="clearfix">
|
<div slot="header" class="clearfix">
|
||||||
<span> {{ $t('form.pos.collect.overdrawnInvoice.below') }} </span>
|
<span> {{ $t('form.pos.collect.overdrawnInvoice.below') }} </span>
|
||||||
<el-radio v-model="option" :label="1" style="float: right; padding: 3px 0">
|
|
||||||
{{ $t('form.pos.collect.overdrawnInvoice.adjustDocument') }}
|
|
||||||
</el-radio>
|
|
||||||
</div>
|
</div>
|
||||||
<el-form label-width="120px">
|
<el-form label-width="120px">
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
@ -211,7 +208,7 @@ export default {
|
|||||||
containerUuid: 'OverdrawnInvoice',
|
containerUuid: 'OverdrawnInvoice',
|
||||||
columnName: 'TenderType'
|
columnName: 'TenderType'
|
||||||
})
|
})
|
||||||
if (tenderType === 'D' && tenderType === 'P') {
|
if (tenderType === 'D') {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
@ -286,6 +283,7 @@ export default {
|
|||||||
break
|
break
|
||||||
case 3:
|
case 3:
|
||||||
if (this.isEmptyValue(this.emptyMandatoryFields)) {
|
if (this.isEmptyValue(this.emptyMandatoryFields)) {
|
||||||
|
this.completePreparedOrder(posUuid, orderUuid, payments)
|
||||||
overdrawnInvoice({
|
overdrawnInvoice({
|
||||||
posUuid,
|
posUuid,
|
||||||
orderUuid,
|
orderUuid,
|
||||||
|
@ -493,7 +493,7 @@ export default {
|
|||||||
},
|
},
|
||||||
overdrawnInvoice: {
|
overdrawnInvoice: {
|
||||||
title: 'OverdrawnInvoice',
|
title: 'OverdrawnInvoice',
|
||||||
below: 'Would you like to leave the Invoice with an Open balance',
|
below: 'Invoice will remain with an open balance',
|
||||||
above: 'Customer Details',
|
above: 'Customer Details',
|
||||||
returned: 'Your change is',
|
returned: 'Your change is',
|
||||||
coupon: 'Generate a Gift Card or Vale',
|
coupon: 'Generate a Gift Card or Vale',
|
||||||
|
@ -469,7 +469,7 @@ export default {
|
|||||||
},
|
},
|
||||||
overdrawnInvoice: {
|
overdrawnInvoice: {
|
||||||
title: 'Factura Sobregirada',
|
title: 'Factura Sobregirada',
|
||||||
below: 'Desea dejar la Factura con un saldo Abierto',
|
below: 'Factura quedará con un saldo abierto',
|
||||||
above: 'Datos del Cliente',
|
above: 'Datos del Cliente',
|
||||||
returned: 'Su vuelto es',
|
returned: 'Su vuelto es',
|
||||||
coupon: 'Generar una Tarjeta de Regalo o Vale',
|
coupon: 'Generar una Tarjeta de Regalo o Vale',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user