|
|
@ -134,10 +134,9 @@ export function updateFormItem(updateSchema, formNo) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 返回表格查询的参数 multipleList(需要多选查询的字段名数组)
|
|
|
|
// 返回表格查询的参数 multipleList(需要多选查询的字段名数组)
|
|
|
|
export function formatParams(params = {}, equal: any = [], otherQuery: any = []) {
|
|
|
|
export function formatParams(params = {}, equal:any = []) {
|
|
|
|
const postData = {
|
|
|
|
const postData = {
|
|
|
|
queryCondition: '',
|
|
|
|
queryCondition: '',
|
|
|
|
otherQueryCondition: {},
|
|
|
|
|
|
|
|
pageCondition: {
|
|
|
|
pageCondition: {
|
|
|
|
pageIndex: params?.page,
|
|
|
|
pageIndex: params?.page,
|
|
|
|
pageSize: params?.pageSize,
|
|
|
|
pageSize: params?.pageSize,
|
|
|
@ -146,17 +145,8 @@ export function formatParams(params = {}, equal: any = [], otherQuery: any = [])
|
|
|
|
}
|
|
|
|
}
|
|
|
|
const conditions = [] as any
|
|
|
|
const conditions = [] as any
|
|
|
|
for (let key in params) {
|
|
|
|
for (let key in params) {
|
|
|
|
let IsContinue = true
|
|
|
|
|
|
|
|
if (otherQuery.length) {
|
|
|
|
|
|
|
|
otherQuery.forEach((item) => {
|
|
|
|
|
|
|
|
if (key == item) {
|
|
|
|
|
|
|
|
IsContinue = false
|
|
|
|
|
|
|
|
postData.otherQueryCondition[key]=params[key]
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// 排除不是分页排序等字段
|
|
|
|
// 排除不是分页排序等字段
|
|
|
|
if (IsContinue && key != 'page' && key != 'pageSize' && key != 'order' && key != 'field') {
|
|
|
|
if (key != 'page' && key != 'pageSize' && key != 'order' && key != 'field') {
|
|
|
|
if (key == 'advancedSearchParams') {
|
|
|
|
if (key == 'advancedSearchParams') {
|
|
|
|
// 高级查询
|
|
|
|
// 高级查询
|
|
|
|
conditions.push(params[key])
|
|
|
|
conditions.push(params[key])
|
|
|
|