staging #27

Merged
hy merged 3 commits from staging into master 2025-10-16 10:51:15 +08:00
1 changed files with 23 additions and 8 deletions
Showing only changes of commit b5d5ebb422 - Show all commits

View File

@ -108,16 +108,27 @@ const tableData: TableConfig = intTableData({
rules: ruleClassName, rules: ruleClassName,
}, },
}, },
type: { elective1: {
label: "类型", label: "主修",
width: "100px",
type: "dropdown",
edit: {
edit: true,
},
},
elective2: {
label: "选修1",
width: "100px",
type: "dropdown",
edit: {
edit: true,
},
},
elective3: {
label: "选修2",
type: "dropdown", type: "dropdown",
search: {
yes: true,
},
edit: { edit: {
add: true,
edit: true, edit: true,
rules: ruleRequired,
}, },
}, },
}, },
@ -131,9 +142,13 @@ const tableData: TableConfig = intTableData({
const showTable = ref(false); const showTable = ref(false);
onMounted(async () => { onMounted(async () => {
// //
const subjectC = (await getenum("SubjectEnum")).data;
tableData.column.elective1.setting.datasource = subjectC;
tableData.column.elective2.setting.datasource = subjectC;
tableData.column.elective3.setting.datasource = subjectC;
tableData.column.Grade.setting.datasource = gradeComboModel(); tableData.column.Grade.setting.datasource = gradeComboModel();
tableData.column.type.setting.datasource = (await getenum("ClassTypeEnum")).data; // tableData.column.type.setting.datasource = (await getenum("ClassTypeEnum")).data;
tableData.column.schoolId.setting.datasource = ( tableData.column.schoolId.setting.datasource = (
await SchoolApi.querycombo({ TextName: "Name", ValueName: "Id" }) await SchoolApi.querycombo({ TextName: "Name", ValueName: "Id" })
).data; ).data;