mirror of
https://github.com/PanJiaChen/vue-element-admin.git
synced 2025-08-10 12:01:57 +08:00
Error loading Tender Type fields (#877)
* add Documente activity * add traslate * add traslation zh * Error loading Tender Type fields * delete changes * minimal changes * minimal changes Co-authored-by: elsiosanchez <elsiossanches@gmail.com>
This commit is contained in:
parent
348ae22dc4
commit
d9568e84b7
@ -53,6 +53,7 @@ export default [
|
|||||||
columnName: 'TenderType',
|
columnName: 'TenderType',
|
||||||
isFromDictionary: true,
|
isFromDictionary: true,
|
||||||
overwriteDefinition: {
|
overwriteDefinition: {
|
||||||
|
defaultValue: 'X',
|
||||||
handleActionKeyPerformed: true,
|
handleActionKeyPerformed: true,
|
||||||
handleContentSelection: true,
|
handleContentSelection: true,
|
||||||
handleActionPerformed: true,
|
handleActionPerformed: true,
|
||||||
|
@ -480,6 +480,9 @@ export default {
|
|||||||
return currency
|
return currency
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
},
|
||||||
|
fieldsPaymentType() {
|
||||||
|
return this.fieldsList[2]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
@ -534,6 +537,15 @@ export default {
|
|||||||
value: this.pending
|
value: this.pending
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
fieldsPaymentType(value) {
|
||||||
|
const displayPaymentType = this.$store.getters.getValueOfField({
|
||||||
|
containerUuid: 'Collection',
|
||||||
|
columnName: 'DisplayColumn_PaymentType'
|
||||||
|
})
|
||||||
|
if (!this.isEmptyValue(value.reference) && this.isEmptyValue(displayPaymentType)) {
|
||||||
|
value.reference.directQuery = value.reference.query
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
@ -451,11 +451,10 @@ export default {
|
|||||||
formatPrice,
|
formatPrice,
|
||||||
formatQuantity,
|
formatQuantity,
|
||||||
openCollectionPanel() {
|
openCollectionPanel() {
|
||||||
this.isShowedPOSKeyLayout = !this.isShowedPOSKeyLayout
|
this.isShowedPOSKeyLayout = true
|
||||||
this.$store.commit('setShowPOSCollection', true)
|
this.$store.commit('setShowPOSCollection', true)
|
||||||
const orderUuid = this.$route.query.action
|
const orderUuid = this.$route.query.action
|
||||||
this.$store.dispatch('listPayments', { orderUuid })
|
this.$store.dispatch('listPayments', { orderUuid })
|
||||||
this.isShowedPOSKeyLaout = !this.isShowedPOSKeyLaout
|
|
||||||
this.$store.commit('setShowPOSOptions', false)
|
this.$store.commit('setShowPOSOptions', false)
|
||||||
},
|
},
|
||||||
open() {
|
open() {
|
||||||
|
@ -54,7 +54,9 @@ const lookup = {
|
|||||||
isBooleanToString: true
|
isBooleanToString: true
|
||||||
}).value
|
}).value
|
||||||
}
|
}
|
||||||
|
if (parsedDirectQuery.includes('?')) {
|
||||||
|
parsedDirectQuery = directQuery.replace('?', value)
|
||||||
|
}
|
||||||
return requestLookup({
|
return requestLookup({
|
||||||
tableName,
|
tableName,
|
||||||
directQuery: parsedDirectQuery,
|
directQuery: parsedDirectQuery,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user