11wqe1 2 дней назад
Родитель
Сommit
d0a94afb4b

+ 1 - 0
src/components/pages/studentManageNew/component/addstu.vue

@@ -716,6 +716,7 @@ export default {
   gap: 10px;
   flex: 1;
   padding: 10px;
+  flex-wrap: wrap;
   box-sizing: border-box;
 }
 .selected_stu_box_item {

+ 1 - 0
src/components/pages/studentManageNew/component/allClaAddStu.vue

@@ -556,6 +556,7 @@ export default {
   gap: 10px;
   flex: 1;
   padding: 10px;
+  flex-wrap: wrap;
   box-sizing: border-box;
 }
 .selected_stu_box_item {

+ 1 - 0
src/components/pages/studentManageNew/component/editInterstcla.vue

@@ -517,6 +517,7 @@ export default {
 .search_stu_box_content {
   display: flex;
   gap: 10px;
+  flex-wrap: wrap;
   flex: 1;
 }
 .selected_stu_box_item {

+ 35 - 15
src/components/pages/studentManageNew/component/table.vue

@@ -68,7 +68,7 @@
           :placeholder="boxType == 1 ? '搜索兴趣班...' : '搜索学生...'"
           v-model="inp"
           @keyup.enter.native="refresh"
-          v-if="boxType == 0 || boxType == 2"
+          v-if="boxType == 0 || boxType == 2 || (boxType == 1 && interestType == 1)"
         >
           <i slot="prefix" @click="refresh" class="el-input__icon el-icon-search"></i>
         </el-input>
@@ -340,7 +340,8 @@
         :options="cascaderData"
         v-model="moveClaCascaderDataPath"
         @change="handlemoveChangecascader"
-        popper-class="myCascader"
+        popper-class="myCascader2"
+        style="width: 100%;"
         :props="{
           label: 'name',
           value: 'id',
@@ -437,6 +438,7 @@
               <div v-if="deltypy == 2">确认删除这 {{selectedData.length}} 位学生? </div>
               <div v-if="deltypy == 3">此操作将删除该班级,及班级所有已产生的授课数据, 是否继续? </div>
               <div v-if="deltypy == 4">确定从当前班级移除{{ selectedData.length }}名学生吗? </div>
+              <div v-if="deltypy == 5">确定要重置 {{selectedData.length}} 个学生的密码吗? </div>
             </div>
         </div>
         <span slot="footer" class="dialog-footer">
@@ -869,24 +871,31 @@ export default {
 
     // 批量重置密码
     resetPassword() {
+      this.deltypy = 5;
+      this.popBoxdia = true;
       // return this.msgbox();
-      this.$confirm(
-        `确定要重置 ${this.selectedData.length} 个学生的密码吗?`,
-        "提示",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
-        .then(() => {
+      // this.$confirm(
+      //   `确定要重置 ${this.selectedData.length} 个学生的密码吗?`,
+      //   "提示",
+      //   {
+      //     confirmButtonText: "确定",
+      //     cancelButtonText: "取消",
+      //     type: "warning",
+      //   }
+      // )
+      //   .then(() => {
+        
+      //   })
+      //   .catch(() => {});
+    },
+    confirmrestpsd(){
           const promises = this.selectedData.map((item) => {
             return this.doResetPassword(item.userid);
           });
           Promise.all(promises)
             .then(() => {
               this.$refs.msgboxref.dialogVisible = true;
-
+              this.popBoxdia = false;
               this.cancelAllSelection();
             })
             .catch((err) => {
@@ -896,8 +905,6 @@ export default {
                 type: "error",
               });
             });
-        })
-        .catch(() => {});
     },
     // 执行重置密码操作(返回Promise)
     doResetPassword(id) {
@@ -975,6 +982,8 @@ export default {
         this.confirmdeleteCla()
       }else if(this.deltypy == 4){
         this.confirmRemove()
+      }else if(this.deltypy == 5){
+        this.confirmrestpsd()
       }
     },
     onedelstu(){
@@ -1562,9 +1571,20 @@ export default {
   .el-checkbox {
   display: none !important;
 }
+.myCascader2 .el-cascader{
+  /* width: 100% !important; */
+  display: block !important;
+}
+.myCascader2 .el-cascader-panel{
+  width: 460px !important;
+}
+.myCascader2 .el-cascader-menu__list{
+  width: 230px;
+}
 </style>
 
 <style scoped>
+
 .sortImg{
   width: 30px;
   background: #F4F4F4;