全选

1

src/components/select-all/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="wrap">
     <el-tooltip
       v-if="isShow"
       class="item"
@@ -39,10 +39,9 @@ export default {
     };
   },
   mounted() {
-    this.isShow = this.$refs?.select?.disabled || false;
-    console.log(this.$refs?.select?.disabled);
     const { selected } = this.$refs.select;
-    this.labelStr = selected.map((item) => item.label).join(",");
+    this.labelStr = selected.map((item) => item.label?item.label:item.value).join(",");
+    this.isShow = (this.$refs?.select?.disabled || false)&&this.labelStr.length>0;
   },
   methods: {
     selectAll() {
@@ -63,7 +62,9 @@ export default {
 
 </style>
 <style lang="less" scoped>
-
+.wrap {
+  position: relative;
+}
 
 .select-all {
   display: flex;

src/views/HumanResources/form.vue

@@ -109,7 +109,6 @@
                     clearable
                     filterable
                     multiple
-
                     collapse-tags
                     placeholder='请选择声部'
                   >

src/views/teamBuild/components/soundSetComponents/chioseAccessory.vue

@@ -34,8 +34,8 @@ export default {
 <style lang="scss" scoped>
 .coreItemRow {
   padding-left: 20px;
-  height: 50px;
-  line-height: 50px;
+  // height: 50px;
+  // line-height: 50px;
   display: flex;
   flex-direction: row;
   align-items: center;
@@ -51,4 +51,4 @@ export default {
 .marginLeft10 {
   margin-left: 10px;
 }
-</style>
+</style>

src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -714,7 +714,7 @@ export default {
 }
 .coreItemRow {
   padding: 0 20px;
-  line-height: 50px;
+  // line-height: 50px;
   display: flex;
   flex-direction: row;
   align-items: center;

src/views/teamBuild/components/teamSoundSet.vue

@@ -226,7 +226,7 @@ export default {
 }
 .coreItemRow {
   padding: 0 20px;
-  line-height: 50px;
+  // line-height: 50px;
   display: flex;
   flex-direction: row;
   align-items: center;

src/views/teamDetail/componentClass/classCompound.vue

@@ -190,6 +190,7 @@ export default {
       this.$emit("cancleCompound", row);
     },
     clearCom() {
+      this.radio = "";
       this.$emit("clearCom");
     },
     async submitClass() {

src/views/teamDetail/components/modals/select-student.vue

@@ -78,7 +78,7 @@
           </el-form-item>
         </el-col>
         <!-- :offset="showName ? 4 : 0" -->
-        <el-col :span="10" >
+        <el-col :span="12" >
           <el-form-item label="声部" style="margin-right: 0;" prop="sound"  :rules="(isOnlyChangeUser||activeType == 'MUSIC_NETWORK')?null:[{ required: true, message: '请选择声部',trigger: 'blur' }]">
             <select-all
               v-model="form.sound"

src/views/teamDetail/teamClassList.vue

@@ -26,7 +26,6 @@
             class="multiple"
             filterable
             multiple
-            style="width: 180px !important"
             v-model.trim="searchForm.organIdList"
             clearable
             placeholder="请选择分部"
@@ -225,7 +224,7 @@
     </div>
     <classCompound
       :compoundList="compoundList"
-      v-if="permission('classGroup/spanGroupMergeClassSplitClassAffirm')"
+      v-if="permission('classGroup/spanGroupMergeClassSplitClassAffirm')&&compoundList.length>0"
       @clearCom="clearCom"
       @getList="getList"
       @cancleCompound="cancleCompound"