diff --git a/jeecgboot-vue3/src/views/bl/blStuInfo/BlStuInfo.data.ts b/jeecgboot-vue3/src/views/bl/blStuInfo/BlStuInfo.data.ts index 7c67a4f..64e7987 100644 --- a/jeecgboot-vue3/src/views/bl/blStuInfo/BlStuInfo.data.ts +++ b/jeecgboot-vue3/src/views/bl/blStuInfo/BlStuInfo.data.ts @@ -25,16 +25,34 @@ export const columns: BasicColumn[] = [ dataIndex: 'xuenian' }, { - title: '调研时点', + title: '调查时点', align: "center", dataIndex: 'dysd' }, { - title: '导入', + title: '调研总人数', align: "center", - dataIndex: 'dysd', - slots: { customRender: 'importXlsBtn' }, + dataIndex: 'stuSumno' }, + { + title: '最小有效样本数', + align: "center", + dataIndex: 'minNum' + }, + { + title: '是否生成报告', + align: "center", + dataIndex: 'filePath', + customRender: ({ record }) => { + return record.filePath ? '是' : '否' + } + }, + // { + // title: '导入', + // align: "center", + // dataIndex: 'dysd', + // slots: { customRender: 'importXlsBtn' }, + // }, ]; //查询数据 diff --git a/jeecgboot-vue3/src/views/bl/blStuInfo/components/BlStuInfoV2Form.vue b/jeecgboot-vue3/src/views/bl/blStuInfo/components/BlStuInfoV2Form.vue index 3bad1f5..8503000 100644 --- a/jeecgboot-vue3/src/views/bl/blStuInfo/components/BlStuInfoV2Form.vue +++ b/jeecgboot-vue3/src/views/bl/blStuInfo/components/BlStuInfoV2Form.vue @@ -38,9 +38,9 @@ - + @@ -108,7 +108,7 @@ const formData = reactive>({ pgrq: '', xuenian: '', dysd: '', - teacherSumno: '', + stuSumno: '', minNum: '', }); @@ -143,7 +143,7 @@ const validatorRules = { pgrq: [{ required: true, message: '请输入评估日期!' }], xuenian: [{ required: true, message: '请输入学年!' }], dysd: [{ required: true, message: '请输入调查时点!' }], - teacherSumno: [{ required: true, message: '请输入学生总人数!' }], + stuSumno: [{ required: true, message: '请输入学生总人数!' }], minNum: [{ required: true, message: '请输入最小有效样本数!' }], }; const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false }); diff --git a/jeecgboot-vue3/src/views/bl/blTeacherInfo/BlTeacherInfo.data.ts b/jeecgboot-vue3/src/views/bl/blTeacherInfo/BlTeacherInfo.data.ts index a76e8e0..b7d48c9 100644 --- a/jeecgboot-vue3/src/views/bl/blTeacherInfo/BlTeacherInfo.data.ts +++ b/jeecgboot-vue3/src/views/bl/blTeacherInfo/BlTeacherInfo.data.ts @@ -43,8 +43,8 @@ export const columns: BasicColumn[] = [ title: '是否生成报告', align: "center", dataIndex: 'filePath', - customRender: (text) => { - return text ? '是' : '否' + customRender: ({ record }) => { + return record.filePath ? '是' : '否' } }, // { diff --git a/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue b/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue index b0469ae..9221d77 100644 --- a/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue +++ b/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue @@ -59,7 +59,7 @@
- + 温馨提示:点击导入后选择数据模板进行导入!