diff --git a/.gitignore b/.gitignore index a0b9717..d9f7c8d 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ pnpm-debug.log* /.vscode/ /.history/ /svn clear.bat + +nodePath.txt \ No newline at end of file diff --git a/changePath.bat b/changePath.bat new file mode 100644 index 0000000..f1e9fb1 --- /dev/null +++ b/changePath.bat @@ -0,0 +1,25 @@ +@echo off & chcp 65001 +echo 原node版本 +node -v +echo 如果运行错误请设置node版本 +if not exist nodePath.txt ( + echo 请在项目根目录创建【nodePath.txt】文件并填写jdk路径,文件内容大致为【D:\ProgramGreeFile\nodejs\node-21.2.0】 + pause + exit +) +set /P nodePath= + + + + + diff --git a/src/views/student/tFreshman/TFreshmanList.vue b/src/views/student/tFreshman/TFreshmanList.vue index 757129c..ba6e3c7 100644 --- a/src/views/student/tFreshman/TFreshmanList.vue +++ b/src/views/student/tFreshman/TFreshmanList.vue @@ -54,6 +54,11 @@ + + + + + @@ -118,7 +123,7 @@ import { downloadFile } from '/@/utils/common/renderUtils'; import TFreshmanModal from './components/TFreshmanModal.vue' import { useMethods } from '/@/hooks/system/useMethods'; -import { filterObj } from '/@/utils/common/compUtils'; + import { filterObj } from '/@/utils/common/compUtils'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import {JInput } from '/@/components/Form'; diff --git a/src/views/student/tFreshmanException/TFreshmanExceptionList.vue b/src/views/student/tFreshmanException/TFreshmanExceptionList.vue index 884733e..cf537ba 100644 --- a/src/views/student/tFreshmanException/TFreshmanExceptionList.vue +++ b/src/views/student/tFreshmanException/TFreshmanExceptionList.vue @@ -39,6 +39,11 @@ + + + + + diff --git a/src/views/student/tGkPicinfo/TGkPicinfoList.vue b/src/views/student/tGkPicinfo/TGkPicinfoList.vue index 6c30b67..9efa2c8 100644 --- a/src/views/student/tGkPicinfo/TGkPicinfoList.vue +++ b/src/views/student/tGkPicinfo/TGkPicinfoList.vue @@ -29,6 +29,11 @@ + + + + + diff --git a/src/views/student/tSfzPicinfo/TSfzPicinfo.data.ts b/src/views/student/tSfzPicinfo/TSfzPicinfo.data.ts index 5756abc..c340c94 100644 --- a/src/views/student/tSfzPicinfo/TSfzPicinfo.data.ts +++ b/src/views/student/tSfzPicinfo/TSfzPicinfo.data.ts @@ -56,11 +56,11 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'endYxq' }, - // { - // title: '年级', - // align: "center", - // dataIndex: 'nj' - // }, + { + title: '年级', + align: "center", + dataIndex: 'nj' + }, { title: '是否有效', align: "center", diff --git a/src/views/student/tSfzPicinfo/TSfzPicinfoList.vue b/src/views/student/tSfzPicinfo/TSfzPicinfoList.vue index 2ea8eaf..839630c 100644 --- a/src/views/student/tSfzPicinfo/TSfzPicinfoList.vue +++ b/src/views/student/tSfzPicinfo/TSfzPicinfoList.vue @@ -14,6 +14,11 @@ + + + + + @@ -40,6 +45,7 @@ 新增 批量新增 + 自动批量新增 港澳台新增 导出 下载驱动 @@ -89,6 +95,7 @@ + @@ -104,6 +111,7 @@ import TSfzPicinfoModal from './components/TSfzPicinfoModal.vue' import TSfzPicinfoAllModal from './components/TSfzPicinfoAllModal.vue' import TSfzPicinfoGATModal from './components/TSfzPicinfoGATModal.vue' + import TSfzPicinfoAllBatchModal from './components/TSfzPicinfoAllBatchModal.vue' import { defHttp } from '/@/utils/http/axios'; import { useMessage } from '/@/hooks/web/useMessage'; import { getFileAccessHttpUrl } from '/@/utils/common/compUtils'; @@ -118,6 +126,7 @@ const registerModal = ref(); const registerAllModal = ref(); const registerGATModal = ref(); + const registerAllBatchModal = ref(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { @@ -174,7 +183,6 @@ registerModal.value.add(); } - /** * 新增事件 */ @@ -191,6 +199,14 @@ registerGATModal.value.add(); } + /** + * 新增事件 + */ + function handleAllBatchAdd() { + registerAllBatchModal.value.disableSubmit = false; + registerAllBatchModal.value.add(); + } + /** * 编辑事件 */ diff --git a/src/views/student/tSfzPicinfo/components/TSfzPicinfoAllBatchModal.vue b/src/views/student/tSfzPicinfo/components/TSfzPicinfoAllBatchModal.vue new file mode 100644 index 0000000..aeed2e4 --- /dev/null +++ b/src/views/student/tSfzPicinfo/components/TSfzPicinfoAllBatchModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/student/tSfzPicinfo/components/TSfzPicinfoAllForm.vue b/src/views/student/tSfzPicinfo/components/TSfzPicinfoAllForm.vue index 548500a..9761879 100644 --- a/src/views/student/tSfzPicinfo/components/TSfzPicinfoAllForm.vue +++ b/src/views/student/tSfzPicinfo/components/TSfzPicinfoAllForm.vue @@ -113,6 +113,7 @@ import { Form } from 'ant-design-vue'; import { getIdCardAllInfo, idCardConvert } from '/@/utils/idCardUtil'; import { getFileAccessHttpUrl } from '/@/utils/common/compUtils'; + import { getCurrentSchoolYear } from '/@/views/student/common/commonConfig'; const props = defineProps({ formDisabled: { type: Boolean, default: false }, @@ -165,6 +166,12 @@ return props.formDisabled; }); + const currentSchoolYear = ref(''); + //获取当前学期学年 + getCurrentSchoolYear().then(res => { + let paramDate = res; + currentSchoolYear.value = paramDate?.paramValue;; + }) /** * 新增 @@ -290,6 +297,7 @@ formData.startYxq = data.IssuedData;//有效期限(开始日期) formData.endYxq = data.ValidDate;//有效期限(结束日期) //formData.sfzflag = data.Nation;//是否有效:0-有效 1-无效 无效:照片不存在 有效:照片存在并且以身份证命名或者通过学号已经清洗成以身份证命名 + formData.nj = currentSchoolYear.value; }else{ createMessage[data.type](data.message) resetFields(); diff --git a/src/views/student/tSfzPicinfo/components/TSfzPicinfoForm.vue b/src/views/student/tSfzPicinfo/components/TSfzPicinfoForm.vue index 84e6775..91ee968 100644 --- a/src/views/student/tSfzPicinfo/components/TSfzPicinfoForm.vue +++ b/src/views/student/tSfzPicinfo/components/TSfzPicinfoForm.vue @@ -112,6 +112,7 @@ import { Form } from 'ant-design-vue'; import { getIdCardAllInfo, idCardConvert } from '/@/utils/idCardUtil'; import { getFileAccessHttpUrl } from '/@/utils/common/compUtils'; + import { getCurrentSchoolYear } from '/@/views/student/common/commonConfig'; const props = defineProps({ formDisabled: { type: Boolean, default: false }, @@ -164,6 +165,12 @@ return props.formDisabled; }); + const currentSchoolYear = ref(''); + //获取当前学期学年 + getCurrentSchoolYear().then(res => { + let paramDate = res; + currentSchoolYear.value = paramDate?.paramValue;; + }) /** * 新增 @@ -249,6 +256,7 @@ formData.startYxq = data.IssuedData;//有效期限(开始日期) formData.endYxq = data.ValidDate;//有效期限(结束日期) //formData.sfzflag = data.Nation;//是否有效:0-有效 1-无效 无效:照片不存在 有效:照片存在并且以身份证命名或者通过学号已经清洗成以身份证命名 + formData.nj = currentSchoolYear.value; }else{ createMessage[data.type](data.message) resetFields(); diff --git a/src/views/student/tSfzPicinfo/components/TSfzPicinfoGATForm.vue b/src/views/student/tSfzPicinfo/components/TSfzPicinfoGATForm.vue index 4f2d9b3..3038535 100644 --- a/src/views/student/tSfzPicinfo/components/TSfzPicinfoGATForm.vue +++ b/src/views/student/tSfzPicinfo/components/TSfzPicinfoGATForm.vue @@ -93,6 +93,7 @@ import { Form } from 'ant-design-vue'; import { getIdCardAllInfo, idCardConvert } from '/@/utils/idCardUtil'; import { getFileAccessHttpUrl } from '/@/utils/common/compUtils'; + import { getCurrentSchoolYear } from '/@/views/student/common/commonConfig'; const props = defineProps({ formDisabled: { type: Boolean, default: false }, @@ -145,6 +146,12 @@ return props.formDisabled; }); + const currentSchoolYear = ref(''); + //获取当前学期学年 + getCurrentSchoolYear().then(res => { + let paramDate = res; + currentSchoolYear.value = paramDate?.paramValue;; + }) /** * 新增 @@ -226,6 +233,7 @@ formData.startYxq = data.IssuedData;//有效期限(开始日期) formData.endYxq = data.ValidDate;//有效期限(结束日期) //formData.sfzflag = data.Nation;//是否有效:0-有效 1-无效 无效:照片不存在 有效:照片存在并且以身份证命名或者通过学号已经清洗成以身份证命名 + formData.nj = currentSchoolYear.value; }else{ createMessage[data.type](data.message) resetFields(); diff --git a/src/views/student/tXjPicinfo/TXjPicinfoList.vue b/src/views/student/tXjPicinfo/TXjPicinfoList.vue index f963e0e..f99ec7d 100644 --- a/src/views/student/tXjPicinfo/TXjPicinfoList.vue +++ b/src/views/student/tXjPicinfo/TXjPicinfoList.vue @@ -29,6 +29,11 @@ + + + + + diff --git a/tbdm.bat b/tbdm.bat new file mode 100644 index 0000000..877739f --- /dev/null +++ b/tbdm.bat @@ -0,0 +1,3 @@ +@echo off +TortoiseGitProc /command:sync /path:"./" /seq:0 /hwnd:0000000000390AF0 x64 TortoiseGitProc.exe +exit \ No newline at end of file