|
|
|
@ -199,6 +199,7 @@
|
|
|
|
|
]
|
|
|
|
|
var currentPageInfo: any = getPaginationRef()
|
|
|
|
|
let otherQueryCondition: any = []
|
|
|
|
|
let ConditionalList: any = []
|
|
|
|
|
let queryCondition: any = []
|
|
|
|
|
let postParam: API.PageRequest = {
|
|
|
|
|
queryCondition: '[]',
|
|
|
|
@ -212,7 +213,7 @@
|
|
|
|
|
|
|
|
|
|
for (let key in p) {
|
|
|
|
|
Arr.forEach((item) => {
|
|
|
|
|
if ((key.includes(':') && key.includes(item) && p[key]) || (key == item && p[key])) {
|
|
|
|
|
if (key.includes(':') && key.includes(item) && p[key]) {
|
|
|
|
|
// billNo
|
|
|
|
|
if (item == 'billNo') {
|
|
|
|
|
queryCondition.push({
|
|
|
|
@ -221,15 +222,38 @@
|
|
|
|
|
ConditionalType: 1,
|
|
|
|
|
})
|
|
|
|
|
} else {
|
|
|
|
|
otherQueryCondition.push({
|
|
|
|
|
FieldName: item,
|
|
|
|
|
FieldValue: p[key],
|
|
|
|
|
ConditionalType: 1,
|
|
|
|
|
// if (ConditionalList.length) {
|
|
|
|
|
// ConditionalList.push({
|
|
|
|
|
// Key: 1,
|
|
|
|
|
// Value: {
|
|
|
|
|
// FieldName: item,
|
|
|
|
|
// FieldValue: p[key],
|
|
|
|
|
// ConditionalType: 1,
|
|
|
|
|
// },
|
|
|
|
|
// })
|
|
|
|
|
// } else {
|
|
|
|
|
ConditionalList.push({
|
|
|
|
|
Key: 1,
|
|
|
|
|
Value: {
|
|
|
|
|
FieldName: item,
|
|
|
|
|
FieldValue: p[key],
|
|
|
|
|
ConditionalType: 1,
|
|
|
|
|
},
|
|
|
|
|
})
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
} else if (key == item && p[key]) {
|
|
|
|
|
otherQueryCondition.push({
|
|
|
|
|
FieldName: item,
|
|
|
|
|
FieldValue: p[key],
|
|
|
|
|
ConditionalType: 1,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
console.log(otherQueryCondition)
|
|
|
|
|
|
|
|
|
|
otherQueryCondition.push({ ConditionalList })
|
|
|
|
|
postParam.otherQueryCondition = JSON.stringify(otherQueryCondition)
|
|
|
|
|
postParam.queryCondition = JSON.stringify(queryCondition)
|
|
|
|
|
return postParam
|
|
|
|
|