mo vor 2 Jahren
Ursprung
Commit
dbc1233c5c

+ 2 - 2
src/views/main/constant.js

@@ -120,7 +120,7 @@ export const errorType = {
     permission: '/teamCLassList',
     always: true,
     query: {
-      lessThenThreeHighOnline: '1',
+      lessThenThreeHighOnline: 'true',
     },
   },
   HIGH_CLASS_STUDENT_LESS_THAN_THREE_INFO: {
@@ -130,7 +130,7 @@ export const errorType = {
     permission: '/teamCLassList',
     always: true,
     query: {
-      lessThenThreeHighOnline: '2',
+      lessThenThreeHighOnline: 'false',
     },
   },
 

+ 42 - 29
src/views/teamDetail/components/modals/class-resetclass-name.vue

@@ -7,21 +7,34 @@
       label-width="80px;"
       :inline="true"
     >
-     <el-form-item
-            label="班级名称"
-            prop="name"
-            :rules="[
-              { required: true, message: '请输入班级名称', trigger: 'blur' },
-            ]"
-          >
-            <el-input
-              v-model="form.name"
-              style="width: 100%"
-              placeholder="请输入班级名称"
-            />
-          </el-form-item>
+      <el-form-item
+        label="班级名称"
+        prop="name"
+        :rules="[
+          { required: true, message: '请输入班级名称', trigger: 'blur' },
+        ]"
+      >
+        <el-input
+          v-model="form.name"
+          style="width: 100%"
+          placeholder="请输入班级名称"
+        />
+      </el-form-item>
+      <el-form-item
+        label="备注"
+        prop="memo"
+        :rules="[
+          { required: true, message: '请输入班级备注', trigger: 'blur' },
+        ]"
+      >
+        <el-input
+          v-model="form.memo"
+          style="width: 100%"
+          placeholder="请输入班级备注"
+        />
+      </el-form-item>
     </el-form>
-    <div slot="footer" class="dialog-footer" style="text-align: right;">
+    <div slot="footer" class="dialog-footer" style="text-align: right">
       <el-button @click="$emit('close')">取 消</el-button>
       <el-button type="primary" @click="subResetName">确 定</el-button>
     </div>
@@ -29,32 +42,32 @@
 </template>
 <script>
 export default {
-  props: [ 'detail'],
+  props: ["detail"],
   data() {
     return {
       form: {
-        name: '',
-         id:''
-      }
-    }
-  },
-  computed: {
-
+        name: "",
+        id: "",
+        memo:""
+      },
+    };
   },
+  computed: {},
   mounted() {
-    this.form.name = this.detail.name
-      this.form.id= this.detail.id
+    this.form.name = this.detail.name;
+    this.form.memo = this.detail.memo;
+    this.form.id = this.detail.id;
   },
   methods: {
-    subResetName () {
-      this.$refs.form.validate(some => {
+    subResetName() {
+      this.$refs.form.validate((some) => {
         if (some) {
-          this.$emit('submited', {...this.form});
+          this.$emit("submited", { ...this.form });
         } else {
           return;
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>

+ 13 - 5
src/views/teamDetail/teamClassList.vue

@@ -194,11 +194,19 @@
                 v-if="
                  permission('classGroup/update')
                 "
-                @click="resetClassName(scope.row)"
+                @click="resetClassName(scope.row,true)"
                 >班级名称调整</el-button
               >
               <el-button
                 type="text"
+                v-if="
+                 permission('classGroup/update')
+                "
+                @click="resetClassName(scope.row,false)"
+                >备注</el-button
+              >
+              <el-button
+                type="text"
                 @click="addCompound(scope.row)"
                 v-if="
                   scope.row.type != 'MUSIC_NETWORK' &&
@@ -311,9 +319,8 @@ export default {
       },
       classNameVisible:false,
       classDetail:null,
-      activeClass:''
-
-
+      activeClass:'',
+      resetName:false
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
@@ -466,8 +473,9 @@ export default {
         "是否确认导出报表?"
       );
     },
-        resetClassName(row) {
+        resetClassName(row,flag) {
       this.classDetail = row;
+      this.resetName = flag;
       this.classNameVisible = true;
     },
     async submitedResetClassName(data) {