diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts b/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts index 5954742..10d7a1d 100644 --- a/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts +++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts @@ -5,20 +5,40 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '单位名称', + title: '学院', align: "center", dataIndex: 'dwmc' }, { - title: '教师', + title: '教师工号', align: "center", - dataIndex: 'gh_dictText' + dataIndex: 'gh' + }, + { + title: '教师姓名', + align: "center", + dataIndex: 'xm' }, { title: '听课类型', align: "center", dataIndex: 'tklx_dictText' }, + { + title: '身份', + align: "center", + dataIndex: 'sf' + }, + { + title: '状态', + align: "center", + dataIndex: 'zt' + }, + { + title: '每学期应听课次数', + align: "center", + dataIndex: 'ytkcs' + }, ]; //查询数据 diff --git a/src/views/kc/config/components/KcExportConfigTpkwcqkjzglxForm.vue b/src/views/kc/config/components/KcExportConfigTpkwcqkjzglxForm.vue index ec5954d..fdeced2 100644 --- a/src/views/kc/config/components/KcExportConfigTpkwcqkjzglxForm.vue +++ b/src/views/kc/config/components/KcExportConfigTpkwcqkjzglxForm.vue @@ -3,8 +3,18 @@ - - + + + + + + + + + + + + @@ -12,6 +22,21 @@ + + + + + + + + + + + + + + + diff --git a/src/views/site/pjjgPage/components/jspjList.vue b/src/views/site/pjjgPage/components/jspjList.vue index 568c160..ecc28f0 100644 --- a/src/views/site/pjjgPage/components/jspjList.vue +++ b/src/views/site/pjjgPage/components/jspjList.vue @@ -40,6 +40,11 @@ enum Api { // ans = '/qa/kcEvaluationans/list', } +const props = defineProps({ + param: { type: Object, default: () => ({}) }, +}); + + const viewModal = ref({}); const queryParam:Ref = ref({}); const loading = ref(false); @@ -75,7 +80,7 @@ function view(record){ // list.value = res?.records || []; // }); - queryParam.value.kechengbiaoid = record.id + queryParam.value.kechengbiaoid = record.id; loadData(1); } @@ -95,7 +100,10 @@ function loadData(pageNo?){ if(pageNo === 1){ params.pageNo = 1; } - defHttp.get({ url: Api.list, params: { ...params, ...queryParam.value, jgh: getUserId(), searchByNowXqxn: true }}).then(res => { + + console.log('参数',props, props.param, props.param.value,{ ...params, ...queryParam.value, jgh: getUserId(), searchByNowXqxn: true, ...props.param.value }); + + defHttp.get({ url: Api.list, params: { ...params, ...queryParam.value, jgh: getUserId(), searchByNowXqxn: true, ...props.param } }).then(res => { dataSource.value = (res?.records) ?? []; ipagination.value.total = res.total; }).finally(() => { diff --git a/src/views/site/pjjgPage/more.vue b/src/views/site/pjjgPage/more.vue index 2e3d520..c90b581 100644 --- a/src/views/site/pjjgPage/more.vue +++ b/src/views/site/pjjgPage/more.vue @@ -76,7 +76,7 @@ function onSearch(){ function changeParam(pageNo){ queryParam.value.pageNo = pageNo; - onSearch(); + //onSearch(); }