Merge branch '0601Action' into test

src/components/select-all/index.vue

@@ -36,22 +36,34 @@ export default {
   data() {
     return {
       isShow: false,
+      labelStr: null,
     };
   },
   mounted() {
     this.$nextTick((res) => {
       this.isShow =
-        (this.$refs?.select?.disabled || false) && this.labelStr.length > 0;
+        (this.$refs?.select?.disabled || false) && this.labelStr?.length > 0;
     });
   },
-  computed: {
-    labelStr() {
+  // computed: {
+  //   labelStr() {
+  //     const { selected } = this.$refs.select;
+  //     let labelStr = selected
+  //       .map((item) => (item.label ? item.label : item.value))
+  //       .join(",");
+  //     return labelStr;
+  //   },
+  // },
+  watch: {
+    '$attrs.value': function(newVal, oldVal) {
+      // 优化页面使用多组件时，tooltip不显示的问题
       const { selected } = this.$refs.select;
       let labelStr = selected
         .map((item) => (item.label ? item.label : item.value))
         .join(",");
-      return labelStr;
-    },
+      this.labelStr = labelStr
+      this.isShow = (this.$refs?.select?.disabled || false) && this.labelStr?.length > 0
+    }
   },
   methods: {
     selectAll() {

src/views/businessManager/shopManager/shopList.vue

@@ -317,6 +317,11 @@
               <img class="shopImage" :src="scope.row.image" alt="" srcset="" />
             </template>
           </el-table-column>
+          <el-table-column align="center" label="所属分部">
+            <template slot-scope="scope">
+              <Tooltip :content="scope.row.organName" />
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="商品描述">
             <template slot-scope="scope">
               <Tooltip :content="scope.row.brief" />

src/views/businessManager/shopManager/shopOperation.vue

@@ -186,17 +186,6 @@
             <el-option label="系统收费" value="1"></el-option>
             <el-option label="云教练收费" value="2"></el-option>
           </select-all>
-          <!-- <el-select
-            v-model="form.courseViewType"
-            :disabled="pageDisabled"
-            multiple
-            placeholder="请选择乐团收费模式"
-            style="width: 400px !important"
-          >
-            <el-option label="课程收费" :value="0"></el-option>
-            <el-option label="系统收费" :value="1"></el-option>
-            <el-option label="云教练收费" :value="2"></el-option>
-          </el-select> -->
         </el-form-item>
         <el-form-item label="是否库存预警" prop="stockWarning">
           <el-select

src/views/teamBuild/signupList.vue

@@ -78,14 +78,6 @@
             报名链接
           </div>
           <div class="newBand" @click="onCreateQRCode('detail')">缴费详情</div>
-          <div
-            class="newBand"
-            v-show="rightList.length > 0"
-            v-permission="'studentRegistration/queryStudentApplyDetailExport'"
-            @click="onDownLoadExecl"
-          >
-            报表导出
-          </div>
           <auth :auths="'studentRegistration/queryPreApplyList/4263'">
             <div
               class="newBand"
@@ -124,6 +116,13 @@
           >
             报名链接（无乐器）
           </div>
+          <div
+            class="newBand"
+            v-permission="'studentRegistration/queryStudentApplyDetailExport'"
+            @click="onDownLoadExecl"
+          >
+            名单导出
+          </div>
         </div>
       </div>
       <el-dialog