diff --git a/src/hooks/system/useListPage.ts b/src/hooks/system/useListPage.ts index b6f6c85..e949fd1 100644 --- a/src/hooks/system/useListPage.ts +++ b/src/hooks/system/useListPage.ts @@ -79,12 +79,16 @@ export function useListPage(options: ListPageOptions) { //如果参数不为空,则整合到一起 //update-begin-author:taoyan date:20220507 for: erp代码生成 子表 导出动态设置mainId if (params) { - Object.keys(params).map((k) => { - let temp = (params as object)[k]; - if (temp) { - paramsForm[k] = unref(temp); - } - }); + if(typeof params == 'function'){ + paramsForm = { ...paramsForm, ...params()} + }else{ + Object.keys(params).map((k) => { + let temp = (params as object)[k]; + if (temp) { + paramsForm[k] = unref(temp); + } + }); + } } //update-end-author:taoyan date:20220507 for: erp代码生成 子表 导出动态设置mainId if (selectedRowKeys.value && selectedRowKeys.value.length > 0) { diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts b/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts index 5021810..2f8d3a5 100644 --- a/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts +++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts @@ -35,7 +35,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'zt' }, { - title: '每学期应听课次数', + title: '本学期应听课次数', align: "center", dataIndex: 'ytkcs' }, @@ -45,7 +45,7 @@ export const columns: BasicColumn[] = [ // dataIndex: 'yskcs' // }, { - title: '每学期听课次数', + title: '本学期已听课次数', align: "center", dataIndex: 'tkxttj' }, diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue index f6db149..fe21264 100644 --- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue +++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue @@ -136,6 +136,7 @@ exportConfig: { name: "人员信息", url: getExportUrl, + params: () => Object.assign({},queryParam.value) }, importConfig: { url: getImportUrl, @@ -290,8 +291,6 @@ } - -