diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglx.api.ts b/src/views/kc/config/KcExportConfigTpkwcqkjzglx.api.ts index c979745..aeabde4 100644 --- a/src/views/kc/config/KcExportConfigTpkwcqkjzglx.api.ts +++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglx.api.ts @@ -4,7 +4,7 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/config/kcExportConfigTpkwcqkjzglx/list', + list = '/config/kcExportConfigTpkwcqkjzglx/list2', save='/config/kcExportConfigTpkwcqkjzglx/add', edit='/config/kcExportConfigTpkwcqkjzglx/edit', deleteOne = '/config/kcExportConfigTpkwcqkjzglx/delete', diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue index 0c13ab7..ea2bfd4 100644 --- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue +++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue @@ -38,12 +38,16 @@ - - - - + + + + diff --git a/src/views/kc/config/StaticCon/StaticCon.api.ts b/src/views/kc/config/StaticCon/StaticCon.api.ts index 9720b23..059fdc8 100644 --- a/src/views/kc/config/StaticCon/StaticCon.api.ts +++ b/src/views/kc/config/StaticCon/StaticCon.api.ts @@ -10,7 +10,7 @@ enum Api { deleteOne = '/config/kcExportConfigTpkwcqkjzglx/delete', deleteBatch = '/config/kcExportConfigTpkwcqkjzglx/deleteBatch', importExcel = '/config/kcExportConfigTpkwcqkjzglx/importExcel', - exportXls = '/config/kcExportConfigTpkwcqkjzglx/exportXls', + exportXls = '/config/kcExportConfigTpkwcqkjzglx/exportXls2', } /** diff --git a/src/views/kc/config/StaticCon/StaticCon.vue b/src/views/kc/config/StaticCon/StaticCon.vue index 27758da..d9d5237 100644 --- a/src/views/kc/config/StaticCon/StaticCon.vue +++ b/src/views/kc/config/StaticCon/StaticCon.vue @@ -13,6 +13,7 @@ 查询 + 导出 @@ -101,8 +102,8 @@ url: getExportUrl, params: () => { let params:any = {}; - params.findByDwmc = !roleList.value.filter(x => x.roleCode == 'admin' ).length - params.findGh = getUserId() + params.code = queryParam.value.code + params.type = queryParam.value.type return Object.assign(params,queryParam.value); } }, diff --git a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyue.data.ts b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyue.data.ts index cf7a092..3f3603f 100644 --- a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyue.data.ts +++ b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyue.data.ts @@ -5,12 +5,22 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '账号', + title: '所在院校', + align: "center", + dataIndex: 'dwmc' + }, + { + title: '任教专业', + align: "center", + dataIndex: 'rjzy' + }, + { + title: '工号', align: "center", dataIndex: 'userid' }, { - title: '用户名', + title: '教师姓名', align: "center", dataIndex: 'username' }, diff --git a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue index e2bb3a6..3f22863 100644 --- a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue +++ b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue @@ -5,18 +5,19 @@ - - + + - - + + 查询 + 导出 diff --git a/src/views/kc/kcZwtksfInfo/KcZwtksfInfoListModal.vue b/src/views/kc/kcZwtksfInfo/KcZwtksfInfoListModal.vue new file mode 100644 index 0000000..a42b39d --- /dev/null +++ b/src/views/kc/kcZwtksfInfo/KcZwtksfInfoListModal.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/views/kc/kcZzThpjb/KcZzThpjbList.vue b/src/views/kc/kcZzThpjb/KcZzThpjbList.vue index 3efe269..2ae88b4 100644 --- a/src/views/kc/kcZzThpjb/KcZzThpjbList.vue +++ b/src/views/kc/kcZzThpjb/KcZzThpjbList.vue @@ -4,28 +4,43 @@
- + + + + + + - + - + + + + + + + + + + + + @@ -102,6 +117,8 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcZzThpjb.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import KcZzThpjbModal from './components/KcZzThpjbModal.vue' + import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; + import { JInput } from '/@/components/Form'; const queryParam = ref({}); const toggleSearchStatus = ref(false); diff --git a/src/views/kc/kcZzXstkb/KcZzXstkbList.vue b/src/views/kc/kcZzXstkb/KcZzXstkbList.vue index 52aa3ad..ccb0cf7 100644 --- a/src/views/kc/kcZzXstkb/KcZzXstkbList.vue +++ b/src/views/kc/kcZzXstkb/KcZzXstkbList.vue @@ -4,47 +4,52 @@
- + + + + + + - + - + - + + - - + + - - + + - - - + @@ -112,6 +117,8 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcZzXstkb.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import KcZzXstkbModal from './components/KcZzXstkbModal.vue' + import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; + import { JInput } from '/@/components/Form'; const queryParam = ref({}); const toggleSearchStatus = ref(false); diff --git a/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue b/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue index 4e22d7c..bb1a1d6 100644 --- a/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue +++ b/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue @@ -4,40 +4,29 @@
- - - + + + - + - - - - - - - + - + - - - - - - + @@ -107,6 +96,8 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcZzYbtkb.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import KcZzYbtkbModal from './components/KcZzYbtkbModal.vue' + import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; + import { JInput } from '/@/components/Form'; const queryParam = ref({}); const toggleSearchStatus = ref(false);