#

src/components/pages/studentManageNew/component/addstu.vue

@@ -215,7 +215,7 @@
             >确 认</el-button
           > -->
           <div @click="closePop" class="kbtn" v-if="deltypy == 1">取消</div>
-          <div @click="confirmDelStu" class="kbtn" style="background: #3681FC; color: #E3EDFF;height: 32px;">确认</div>
+          <div @click="confirmDelStu" class="kbtn" style="background: #3681FC; color: #E3EDFF;">确认</div>
         </span>
       </el-dialog>
     </div>

src/components/pages/studentManageNew/component/table.vue

@@ -342,7 +342,7 @@
       </div>
       <div slot="footer" class="dialog-footer" style="display: flex;justify-content: flex-end;gap: 10px;">
         <div @click="addInterestClaVisible = false">取消</div>
-        <div @click="addInterestClaConfirm" style="background: #3681FC; color: #E6FFFFFF;height: 32px;">确认</div>
+        <div @click="addInterestClaConfirm" style="background: #3681FC; color: #E6FFFFFF;">确认</div>
       </div>
     </el-dialog>
 
@@ -380,8 +380,10 @@
         </el-cascader>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="moveClaVisible = false">取消</el-button>
-        <el-button type="primary" @click="confirmMoveClaEdit">确定</el-button>
+        <!-- <el-button @click="moveClaVisible = false">取消</el-button> -->
+        <div class="kbtn" @click="moveClaVisible = false">取消</div>
+        <div class="kbtn" @click="confirmMoveClaEdit" style="background: #3681FC; color: #E3EDFF;">确定</div>
+        <!-- <el-button type="primary" @click="confirmMoveClaEdit">确定</el-button> -->
       </div>
     </el-dialog>
     <!-- 编辑信息 -->
@@ -432,8 +434,10 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="closeEditStu">取消</el-button>
-        <el-button type="primary" @click="confirmEditStu">确定</el-button>
+        <!-- <el-button @click="closeEditStu">取消</el-button> -->
+        <div class="kbtn" @click="closeEditStu">取消</div>
+        <div class="kbtn" @click="confirmEditStu" style="background: #3681FC; color: #E3EDFF;">确认</div>
+        <!-- <el-button type="primary" @click="confirmEditStu">确定</el-button> -->
       </div>
     </el-dialog>
     <!-- 编辑兴趣班 -->
@@ -462,6 +466,8 @@
               <div v-if="deltypy == 4">确定从当前班级移除{{ selectedData.length }}名学生吗？ </div>
               <div v-if="deltypy == 5">确定要重置 {{selectedData.length}} 个学生的密码吗？ </div>
               <div v-if="deltypy == 6">确定要重置 {{this.stuEditInfo.username}} 的密码吗？ </div>
+              <div v-if="deltypy == 9">确定要移动到该班级吗？ </div>
+              <div v-if="deltypy == 10">确定要修改 {{this.stuEditInfo.username}} 的学生信息吗？ </div>
             </div>
             <div class="msgContxt" v-if="deltypy == 7 || deltypy == 8">
               <div v-if="deltypy == 7">对{{selectedData.length}}个账户重置密码成功！ </div>
@@ -486,7 +492,7 @@
             >取 消</el-button
           > -->
           <div @click="closeDia" v-if="deltypy != 7 && deltypy != 8">取消</div>
-          <div @click="confirmDelStu" style="background: #3681FC; color: #E3EDFF;height: 32px;">确认</div>
+          <div @click="confirmDelStu" style="background: #3681FC; color: #E3EDFF;">确认</div>
           <!-- <el-button type="primary" @click="confirmDelStu"
             >确 认</el-button
           > -->
@@ -542,7 +548,7 @@ export default {
 
       popBoxdia:false,
       insort:0,
-
+      EditStubox:'',
 
       delClaid:'',
       delClaidtype:'',
@@ -816,12 +822,16 @@ export default {
         });
         return;
       }
-      this.$confirm("确定要移动到该班级吗？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
+      this.deltypy = 9;
+      this.popBoxdia = true;
+    },
+    confirmMoveClaEditStu(){
+      // this.$confirm("确定要移动到该班级吗？", "提示", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   type: "warning",
+      // })
+      //   .then(() => {
           // 先移出班级
           const promises = this.selectedData.map((item) => {
             item.classid = item.classid
@@ -832,8 +842,6 @@ export default {
           });
           Promise.all(promises)
             .then(() => {
-              console.log("移除成功");
-
               // 再移入班级
               const promises2 = this.selectedData.map((item) => {
                 let box = [
@@ -852,6 +860,7 @@ export default {
                   });
                   this.moveClaVisible = false;
                   this.moveClaCascaderDataPath = [];
+                  this.popBoxdia = false;
                   this.$emit("getGrade");
                   this.refresh();
                 })
@@ -864,8 +873,8 @@ export default {
                 });
             })
             .catch(() => {});
-        })
-        .catch(() => {});
+        // })
+        // .catch(() => {});
     },
     moveClassStudentPromise(item, cid) {
       return new Promise((resolve, reject) => {
@@ -1073,6 +1082,10 @@ export default {
         this.popBoxdia = false;
       }else if(this.deltypy == 8){
         this.popBoxdia = false;
+      }else if(this.deltypy == 9){
+        this.confirmMoveClaEditStu();
+      }else if(this.deltypy == 10){
+        this.update_Student(this.EditStubox);
       }
     },
     onedelstu(){
@@ -1289,26 +1302,28 @@ export default {
         return;
       }
 
-      let box = this.cascaderDataPath.map((item) => item[1]).join(",");
+      this.EditStubox = this.cascaderDataPath.map((item) => item[1]).join(",");
       // console.log(box);
 
       // console.log("this.stuEditInfo", this.stuEditInfo);
 
-      this.$confirm(
-        `确定要修改 ${this.stuEditInfo.username} 的学生信息吗？`,
-        "提示",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
-        .then(() => {
-          this.update_Student(box);
-        })
-        .catch(() => {
-          return;
-        });
+      this.deltypy = 10;
+      this.popBoxdia = true;
+      // this.$confirm(
+      //   `确定要修改 ${this.stuEditInfo.username} 的学生信息吗？`,
+      //   "提示",
+      //   {
+      //     confirmButtonText: "确定",
+      //     cancelButtonText: "取消",
+      //     type: "warning",
+      //   }
+      // )
+      //   .then(() => {
+      //     this.update_Student(box);
+      //   })
+      //   .catch(() => {
+      //     return;
+      //   });
     },
     // 修改学生信息
     update_Student(cid) {
@@ -1332,6 +1347,8 @@ export default {
           });
           this.stuEditvisible = false;
           this.refresh();
+          this.popBoxdia = false;
+          this.EditStubox = '';
           this.stuEditInfo = {};
           this.cascaderDataPath = [];
         })

src/components/pages/studentManageNew/index.vue

@@ -18,7 +18,7 @@
           <span>新班级</span>
         </div>
       </div>
-
+        
         <el-menu
           :default-active="activeId"
           class="el-menu-vertical-demo"
@@ -113,7 +113,7 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <div @click="addClassVisible = false">取消</div>
-        <div @click="addClass" style="background: #3681FC; color: #E3EDFF;height: 32px;">确认</div>
+        <div @click="addClass" style="background: #3681FC; color: #E3EDFF;">确认</div>
       </div>
     </el-dialog>