|
@@ -535,26 +535,38 @@ const submitForm = async (formEl) => {
|
|
// "addParams", addParams.value
|
|
// "addParams", addParams.value
|
|
// );
|
|
// );
|
|
|
|
|
|
|
|
+ // let classInfoArray = [];
|
|
|
|
+ // if (addParams.value.classInfo != null && addParams.value.classInfo != undefined) {
|
|
|
|
+ // for (let i = 0; i < addParams.value.classInfo.length; i++) {
|
|
|
|
+ // let thisClassInfo = addParams.value.classInfo[i];
|
|
|
|
+ // let schoolIdJson = getSchoolIdJson(thisClassInfo);
|
|
|
|
+ // if (schoolIdJson != null && schoolIdJson != undefined) {
|
|
|
|
+ // // console.log( "schoolIdJson", schoolIdJson );
|
|
|
|
+ // // 特殊处理,必须选中的是班级
|
|
|
|
+ // if (schoolIdJson.type == 3) {
|
|
|
|
+ // let addJson = {
|
|
|
|
+ // "id": schoolIdJson.id,
|
|
|
|
+ // "name": schoolIdJson.name,
|
|
|
|
+ // "remark": schoolIdJson.remark,
|
|
|
|
+ // "schoolId": schoolIdJson.schoolId,
|
|
|
|
+ // };
|
|
|
|
+ // classInfoArray.push(addJson);
|
|
|
|
+ // }
|
|
|
|
+ // }
|
|
|
|
+ // }
|
|
|
|
+ // }
|
|
|
|
+
|
|
let classInfoArray = [];
|
|
let classInfoArray = [];
|
|
- if (addParams.value.classInfo != null && addParams.value.classInfo != undefined) {
|
|
|
|
- for (let i = 0; i < addParams.value.classInfo.length; i++) {
|
|
|
|
- let thisClassInfo = addParams.value.classInfo[i];
|
|
|
|
- let schoolIdJson = getSchoolIdJson(thisClassInfo);
|
|
|
|
- if (schoolIdJson != null && schoolIdJson != undefined) {
|
|
|
|
- // console.log( "schoolIdJson", schoolIdJson );
|
|
|
|
- // 特殊处理,必须选中的是班级
|
|
|
|
- if (schoolIdJson.type == 3) {
|
|
|
|
- let addJson = {
|
|
|
|
- "id": schoolIdJson.id,
|
|
|
|
- "name": schoolIdJson.name,
|
|
|
|
- "remark": schoolIdJson.remark,
|
|
|
|
- "schoolId": schoolIdJson.schoolId,
|
|
|
|
- };
|
|
|
|
- classInfoArray.push(addJson);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ let getSchoolIdJsonDb = getSchoolIdJson(props.configDb?.classId);
|
|
|
|
+ let addJson = {
|
|
|
|
+ "id": getSchoolIdJsonDb.id,
|
|
|
|
+ "name": getSchoolIdJsonDb.name,
|
|
|
|
+ "remark": getSchoolIdJsonDb.remark,
|
|
|
|
+ "schoolId": getSchoolIdJsonDb.schoolId,
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+ classInfoArray.push(addJson);
|
|
|
|
+
|
|
|
|
|
|
let submit = {
|
|
let submit = {
|
|
// 账号
|
|
// 账号
|
|
@@ -835,7 +847,8 @@ const btnDel = (res) => {
|
|
// );
|
|
// );
|
|
|
|
|
|
let delIdArray = [
|
|
let delIdArray = [
|
|
- { "id" : res.id }
|
|
|
|
|
|
+ // { "id" : res.id }
|
|
|
|
+ { "id" : res.userId }
|
|
];
|
|
];
|
|
|
|
|
|
idDelAll(
|
|
idDelAll(
|
|
@@ -877,7 +890,8 @@ const btnBatchDel = () => {
|
|
for (let i = 0; i < state.value.ids.length; i++) {
|
|
for (let i = 0; i < state.value.ids.length; i++) {
|
|
|
|
|
|
let thisIds = state.value.ids[i];
|
|
let thisIds = state.value.ids[i];
|
|
- let addJson = { "id" : thisIds.id };
|
|
|
|
|
|
+ // let addJson = { "id" : thisIds.id };
|
|
|
|
+ let addJson = { "id" : thisIds.userId };
|
|
delIdArray.push(addJson);
|
|
delIdArray.push(addJson);
|
|
|
|
|
|
}
|
|
}
|