update

user_web/src/view/admin/ManageUser.vue

@@ -353,15 +353,17 @@ const pageUpdateEvent = () => {
 
         let dataOld = response?.data?.data;
         let data = dataOld?.list;
+        state.value.total = dataOld.total;
+        state.value.list = data;
 
         // console.log(
         //     "userListEvent response", response, data
         // );
 
-        pageDb = [];
-        pageDb = data;
+        // pageDb = [];
+        // pageDb = data;
 
-        pageDbUpdateEvent();
+        // pageDbUpdateEvent();
         
     }).catch(error => {
         
@@ -370,40 +372,40 @@ const pageUpdateEvent = () => {
 }
 
 
-/**
- * 因为接口不是标准的分页接口，是直接返回所有数据的
- * 这里进行单独处理，来展示第几页的数据
- */
-const pageDbUpdateEvent = () => {
+// /**
+//  * 因为接口不是标准的分页接口，是直接返回所有数据的
+//  * 这里进行单独处理，来展示第几页的数据
+//  */
+// const pageDbUpdateEvent = () => {
 
-    // console.log(
-    //     "查找分页数据 pageDbUpdateEvent", state.value.listParams, pageDb
-    // );
+//     // console.log(
+//     //     "查找分页数据 pageDbUpdateEvent", state.value.listParams, pageDb
+//     // );
 
-    state.value.total = pageDb.length;
-    state.value.list = [];
+//     state.value.total = pageDb.length;
+//     state.value.list = [];
 
-    let page = state.value.listParams.page;
-    let limit = state.value.listParams.limit;
-    let keyword = state.value.listParams.keyword;
+//     let page = state.value.listParams.page;
+//     let limit = state.value.listParams.limit;
+//     let keyword = state.value.listParams.keyword;
 
-    // 从第几个数组下标开始
-    let indexStart = (page - 1) * limit;
-    // 到第几个数组下标结束
-    let indexEnd = indexStart + limit - 1;
+//     // 从第几个数组下标开始
+//     let indexStart = (page - 1) * limit;
+//     // 到第几个数组下标结束
+//     let indexEnd = indexStart + limit - 1;
 
-    for (let i = 0; i < pageDb.length; i++) {
+//     for (let i = 0; i < pageDb.length; i++) {
 
-        // 在范围内
-        if (i >= indexStart && i <= indexEnd) {
-            let thisPageDb = pageDb[i];
-            state.value.list.push(thisPageDb);
+//         // 在范围内
+//         if (i >= indexStart && i <= indexEnd) {
+//             let thisPageDb = pageDb[i];
+//             state.value.list.push(thisPageDb);
             
-        }
+//         }
         
-    }
+//     }
     
-}
+// }
 
 /**
  * 弹出添加UI
@@ -422,6 +424,7 @@ const btnAddStudent = (formEl) => {
  * 触发搜索逻辑
  */
 const btnSearchName = () => {
+    state.value.listParams.page = 1;
     pageUpdateEvent();
 }
 
@@ -462,13 +465,6 @@ const selectionChange = (res) => {
     console.log("分页多选，更新多选的相关数据", state.value.ids);
 }
 
-/**
- * 添加的时候，选中的班级的时候
- * @param val
- */
-const selectClass = (val) => {
-    addParams.value.orgId = val;
-}
 
 /**
  * 添加 点击提交
@@ -479,9 +475,30 @@ const submitForm = async (formEl) => {
     await formEl.validate((valid, fields) => {
         if (valid) {
             
-            console.log(
-                "addParams", addParams.value
-            );
+            // console.log(
+            //     "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 submit = {
                 // 账号
@@ -491,27 +508,42 @@ const submitForm = async (formEl) => {
                 // 昵称
                 "nickName": addParams.value.nickName,
                 // 用户分配到的班级数组，可以是多个
-                "classInfo": [
-                    // {
-                    //     "id": 0,
-                    //     "name": "",
-                    //     "remark": "",
-                    //     "schoolId": 0
-                    // }
-                ],
+                // "classInfo": [
+                //     // {
+                //     //     "id": 0,
+                //     //     "name": "",
+                //     //     "remark": "",
+                //     //     "schoolId": 0
+                //     // }
+                // ],
+                "classInfo": classInfoArray,
                 // 密码
                 "password": addParams.value.password,
                 // 确认密码
                 "password2": addParams.value.password2
             };
 
-            console.log(
-                "添加账号的相关数据 submit", submit
-            );
-
-            // 接口请求完成，隐藏模态框
-            state.value.showDialog = false;
+            // console.log(
+            //     "添加账号的相关数据 submit", submit
+            // );
 
+            userAdd(submit)
+            .then(response => {
+
+                let data = response?.data?.data;
+                // console.log(
+                //     "userAddEvent response", response, data
+                // );
+                
+                // 重新查找分页数据
+                pageUpdateEvent();
+                // 接口请求完成，隐藏模态框
+                state.value.showDialog = false;
+                
+            }).catch(error => {
+                
+            });
+            
         } else {
             // console.log('error submit!', fields)
         }