blackteay/vue-element-admin
1
0
Fork 0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-10 20:39:48 +08:00
Code Issues Releases Wiki Activity

fix: Empty mandatory fields. (#699)

Browse Source 
Co-authored-by: EdwinBetanc0urt <EdwinBetanco0urt@outlook.com>
This commit is contained in:
Edwin Betancourt 2021-03-30 14:17:51 -04:00 committed by GitHub
parent 0d30213637
commit 2e39e18c8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/store/modules/ADempiere/panel/getters.js
View File

@ -102,8 +102,9 @@ const getters = {
}
})
if (!isEmptyValue(formatReturn)) {
if (formatReturn) {
return fieldsNameEmpty.map(fieldItem => {
// fieldItem.name by default
return fieldItem[formatReturn]
})
}

22
src/store/modules/ADempiere/windowControl/actions.js
View File

@ -842,20 +842,22 @@ export default {
}).value
}
if (isReference) {
if (!isEmptyValue(parsedWhereClause)) {
parsedWhereClause += ` AND ${referenceWhereClause}`
} else {
parsedWhereClause += referenceWhereClause
const addWhereClause = (currentWhereClause, newWhereClause) => {
if (isEmptyValue(currentWhereClause)) {
return newWhereClause
}
if (isEmptyValue(newWhereClause)) {
return currentWhereClause
}
return `${currentWhereClause} AND ${newWhereClause}`
}
if (isReference) {
parsedWhereClause = addWhereClause(parsedWhereClause, referenceWhereClause)
}
if (!isEmptyValue(criteria)) {
if (!isEmptyValue(parsedWhereClause)) {
parsedWhereClause += ` AND ${criteria.whereClause}`
} else {
parsedWhereClause += criteria.whereClause
}
parsedWhereClause = addWhereClause(parsedWhereClause, criteria.whereClause)
}
const conditionsList = []