|
@@ -157,7 +157,7 @@ export default {
|
|
|
const [allResult, allResultKey] = [[], []]
|
|
|
formItemCopy.map(({ dropdownlist, pagecode, defaultfilter }) => {
|
|
|
if (dropdownlist || dropdownlist == 0) {
|
|
|
- const datacontent = { filter: dropdownlist == 19 ? this.formatDefault(defaultfilter) : { 1: 1 } }
|
|
|
+ const datacontent = dropdownlist == 19 ? this.formatDefault(defaultfilter) : { filter: { 1: 1 } }
|
|
|
allResultKey.push(pagecode)
|
|
|
allResult.push(Query({ serviceid: dropdownlist, datacontent, event: '0' }))
|
|
|
}
|
|
@@ -173,7 +173,7 @@ export default {
|
|
|
const { status, value } = item
|
|
|
if (status == 'fulfilled') {
|
|
|
const { code, returnData } = value
|
|
|
- this.tableOptions[allResultKey[index]] = code == 0 && returnData?.length ? returnData : []
|
|
|
+ this.tableOptions[allResultKey[index]] = code == 0 && returnData?.length ? this.formatData(returnData) : []
|
|
|
}
|
|
|
})
|
|
|
this.formItemArr = formItem
|
|
@@ -181,6 +181,9 @@ export default {
|
|
|
this.formItemArr = formItem
|
|
|
}
|
|
|
},
|
|
|
+ formatData (returnData) {
|
|
|
+ return typeof returnData == 'string' ? JSON.parse(returnData) : returnData
|
|
|
+ },
|
|
|
//设置下拉数据
|
|
|
formatSelectData () {
|
|
|
|