mirror of
https://github.com/PanJiaChen/vue-element-admin.git
synced 2025-08-07 18:25:45 +08:00
convert the values to be sent and delete unnecessary console.logs (#784)
This commit is contained in:
parent
256af25448
commit
78c4dfaeaa
@ -491,12 +491,12 @@ export default {
|
||||
})
|
||||
},
|
||||
currencyUuid(value) {
|
||||
const alo = this.$store.getters.getConvertionRate.find(currency => {
|
||||
const listCurrency = this.$store.getters.getConvertionRate.find(currency => {
|
||||
if (currency.uuid === value) {
|
||||
return currency
|
||||
}
|
||||
})
|
||||
if (alo === undefined) {
|
||||
if (listCurrency === undefined) {
|
||||
this.$store.dispatch('conversionDivideRate', {
|
||||
conversionTypeUuid: this.currentPointOfSales.conversionTypeUuid,
|
||||
currencyFromUuid: this.pointOfSalesCurrency.uuid,
|
||||
@ -536,7 +536,6 @@ export default {
|
||||
}
|
||||
},
|
||||
created() {
|
||||
console.log(this.$store.getters.getConvertionRate)
|
||||
this.$store.dispatch('addRateConvertion', this.pointOfSalesCurrency)
|
||||
this.unsubscribe = this.subscribeChanges()
|
||||
this.defaultValueCurrency()
|
||||
|
@ -248,14 +248,10 @@ export default {
|
||||
}
|
||||
},
|
||||
loadOrdersList() {
|
||||
let values = this.$store.getters.getValuesView({
|
||||
containerUuid: this.metadata.containerUuid
|
||||
})
|
||||
values = this.convertValuesToSend(values)
|
||||
const point = this.$store.getters.posAttributes.currentPointOfSales.uuid
|
||||
if (!this.isEmptyValue(point)) {
|
||||
this.$store.dispatch('listOrdersFromServer', {
|
||||
...values
|
||||
posUuid: point
|
||||
})
|
||||
}
|
||||
},
|
||||
@ -294,55 +290,6 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
convertValuesToSend(values) {
|
||||
const valuesToSend = {}
|
||||
|
||||
values.forEach(element => {
|
||||
const { value, columnName } = element
|
||||
|
||||
if (this.isEmptyValue(value)) {
|
||||
return
|
||||
}
|
||||
|
||||
switch (columnName) {
|
||||
case 'DocumentNo':
|
||||
valuesToSend['documentNo'] = value
|
||||
break
|
||||
case 'C_BPartner_ID_UUID':
|
||||
valuesToSend['businessPartnerUuid'] = value
|
||||
break
|
||||
case 'GrandTotal':
|
||||
valuesToSend['grandTotal'] = value
|
||||
break
|
||||
case 'OpenAmt':
|
||||
valuesToSend['openAmount'] = value
|
||||
break
|
||||
case 'IsPaid':
|
||||
valuesToSend['isPaid'] = value
|
||||
break
|
||||
case 'Processed':
|
||||
valuesToSend['isProcessed'] = value
|
||||
break
|
||||
case 'IsAisleSeller':
|
||||
valuesToSend['isAisleSeller'] = value
|
||||
break
|
||||
case 'IsInvoiced':
|
||||
valuesToSend['isInvoiced'] = value
|
||||
break
|
||||
case 'DateOrderedFrom':
|
||||
valuesToSend['dateOrderedFrom'] = value
|
||||
break
|
||||
case 'DateOrderedTo':
|
||||
valuesToSend['dateOrderedTo'] = value
|
||||
break
|
||||
case 'SalesRep_ID_UUID':
|
||||
valuesToSend['salesRepresentativeUuid'] = value
|
||||
break
|
||||
}
|
||||
})
|
||||
|
||||
return valuesToSend
|
||||
},
|
||||
orderPrpcess(row) {
|
||||
const parametersList = [{
|
||||
columnName: 'C_Order_ID',
|
||||
|
@ -21,7 +21,7 @@ import {
|
||||
requestCreateOrderLine,
|
||||
requestListOrders
|
||||
} from '@/api/ADempiere/form/point-of-sales.js'
|
||||
import { isEmptyValue, extractPagingToken } from '@/utils/ADempiere/valueUtils.js'
|
||||
import { isEmptyValue, extractPagingToken, convertValuesToSend } from '@/utils/ADempiere/valueUtils.js'
|
||||
import { showMessage } from '@/utils/ADempiere/notification.js'
|
||||
|
||||
/**
|
||||
@ -189,18 +189,7 @@ export default {
|
||||
dispatch('listOrdersFromServer', {})
|
||||
},
|
||||
listOrdersFromServer({ state, commit, getters }, {
|
||||
posUuid,
|
||||
documentNo,
|
||||
businessPartnerUuid,
|
||||
grandTotal,
|
||||
openAmount,
|
||||
isPaid,
|
||||
isProcessed,
|
||||
isAisleSeller,
|
||||
isInvoiced,
|
||||
dateOrderedFrom,
|
||||
dateOrderedTo,
|
||||
salesRepresentativeUuid
|
||||
posUuid
|
||||
}) {
|
||||
if (isEmptyValue(posUuid)) {
|
||||
posUuid = getters.posAttributes.currentPointOfSales.uuid
|
||||
@ -214,6 +203,11 @@ export default {
|
||||
if (!isEmptyValue(token)) {
|
||||
pageToken = token + '-' + pageNumber
|
||||
}
|
||||
let values = getters.getValuesView({
|
||||
containerUuid: 'Orders-List'
|
||||
})
|
||||
values = convertValuesToSend(values)
|
||||
const { documentNo, businessPartnerUuid, grandTotal, openAmount, isPaid, isProcessed, isAisleSeller, isInvoiced, dateOrderedFrom, dateOrderedTo, salesRepresentativeUuid } = values
|
||||
requestListOrders({
|
||||
posUuid,
|
||||
documentNo,
|
||||
|
@ -112,7 +112,6 @@ export default {
|
||||
payment.splice(0)
|
||||
},
|
||||
conversionDivideRate({ commit, dispatch }, params) {
|
||||
console.log('conversionDivideRate')
|
||||
requestGetConversionRate({
|
||||
conversionTypeUuid: params.conversionTypeUuid,
|
||||
currencyFromUuid: params.currencyFromUuid,
|
||||
|
@ -24,5 +24,6 @@ export {
|
||||
currencyFind,
|
||||
tenderTypeFind,
|
||||
formatConversionCurrenty,
|
||||
convertValuesToSend,
|
||||
typeValue
|
||||
} from '@/utils/ADempiere/valueUtils.js'
|
||||
|
@ -558,3 +558,56 @@ export function formatConversionCurrenty(params) {
|
||||
}
|
||||
return params
|
||||
}
|
||||
/**
|
||||
* convert Values To Send
|
||||
* @param {string, number, boolean, date} values
|
||||
*/
|
||||
|
||||
export function convertValuesToSend(values) {
|
||||
const valuesToSend = {}
|
||||
|
||||
values.forEach(element => {
|
||||
const { value, columnName } = element
|
||||
|
||||
if (isEmptyValue(value)) {
|
||||
return
|
||||
}
|
||||
|
||||
switch (columnName) {
|
||||
case 'DocumentNo':
|
||||
valuesToSend['documentNo'] = value
|
||||
break
|
||||
case 'C_BPartner_ID_UUID':
|
||||
valuesToSend['businessPartnerUuid'] = value
|
||||
break
|
||||
case 'GrandTotal':
|
||||
valuesToSend['grandTotal'] = value
|
||||
break
|
||||
case 'OpenAmt':
|
||||
valuesToSend['openAmount'] = value
|
||||
break
|
||||
case 'IsPaid':
|
||||
valuesToSend['isPaid'] = value
|
||||
break
|
||||
case 'Processed':
|
||||
valuesToSend['isProcessed'] = value
|
||||
break
|
||||
case 'IsAisleSeller':
|
||||
valuesToSend['isAisleSeller'] = value
|
||||
break
|
||||
case 'IsInvoiced':
|
||||
valuesToSend['isInvoiced'] = value
|
||||
break
|
||||
case 'DateOrderedFrom':
|
||||
valuesToSend['dateOrderedFrom'] = value
|
||||
break
|
||||
case 'DateOrderedTo':
|
||||
valuesToSend['dateOrderedTo'] = value
|
||||
break
|
||||
case 'SalesRep_ID_UUID':
|
||||
valuesToSend['salesRepresentativeUuid'] = value
|
||||
break
|
||||
}
|
||||
})
|
||||
return valuesToSend
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user