更新问题

src/layout/components/Navbar.vue

@@ -7,10 +7,18 @@
       to="/"
     >
       <img
+        v-if="tenantLogo"
+        :src="tenantLogo"
+        class="sidebar-logo"
+        style="width: 36px; height: 36px"
+      />
+      <img
+        v-else
         src="@/assets/images/base/logo.png"
         class="sidebar-logo"
-        style="width: 129px; height: 37px"
+        style="width: 36px; height: 36px"
       />
+      <span class="tenantName" :title="tenantName">{{ tenantName }}</span>
     </router-link>
     <!-- <breadcrumb class="breadcrumb-container" /> -->
     <div class="indexlayout-top-menu">
@@ -126,22 +134,22 @@
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
           <!-- divided -->
-          <el-dropdown-item v-if="tenantStatus">
+          <el-dropdown-item v-if="tenantStatus" @click.native="onTenantChange">
             <i class="icon_admin_tenant userSize"></i>
-            <span class="dropdown-text" @click="onTenantChange">{{ tenantName }}</span>
+            <span class="dropdown-text">{{ tenantName }}</span>
             <i style="margin-left: 3px" class="icon_admin_change userSize"></i>
           </el-dropdown-item>
-          <el-dropdown-item>
+          <el-dropdown-item @click.native="resetPassWord">
             <i class="icon_admin_edit userSize"></i>
-            <span class="dropdown-text" @click="resetPassWord">修改密码</span>
+            <span class="dropdown-text">修改密码</span>
           </el-dropdown-item>
-          <el-dropdown-item>
+          <el-dropdown-item @click.native="accountSetting">
             <i class="icon_admin_account userSize"></i>
-            <span class="dropdown-text" @click="accountSetting">账号设置</span>
+            <span class="dropdown-text">账号设置</span>
           </el-dropdown-item>
-          <el-dropdown-item style="border-top: 1px solid #EBEEF5;">
+          <el-dropdown-item style="border-top: 1px solid #EBEEF5;" @click.native="logout">
             <i class="icon_admin_exit userSize"></i>
-            <span class="dropdown-text" @click="logout">安全退出</span>
+            <span class="dropdown-text">安全退出</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
@@ -304,7 +312,8 @@ export default {
       tenantForm: {
         tenantId: Number(tenantConfig.tenantId) || null,
       },
-      tenantList: []
+      tenantList: [],
+      tenantLogo: tenantConfig.tenantLogo || null,
     };
   },
 
@@ -359,9 +368,11 @@ export default {
         if(res) {
           const tenantForm = this.tenantForm
           let tenantName = null
+          let tenantLogo = null
           this.tenantList.forEach(item => {
             if(item.id == tenantForm.tenantId) {
               tenantName = item.name
+              tenantLogo = item.logo
             }
           });
           let tenantConfig = sessionStorage.getItem('tenantConfig')
@@ -371,6 +382,7 @@ export default {
             // if(url == this.$route.path) {
               tenantConfig.tenantId = tenantForm.tenantId
               tenantConfig.tenantName = tenantName
+              tenantConfig.tenantLogo = tenantLogo
               sessionStorage.setItem('tenantConfig', JSON.stringify(tenantConfig))
               this.$router.push({
                   path: '/redirect',
@@ -683,4 +695,18 @@ export default {
   justify-content: center;
   height: 75px;
 }
+.sidebar-logo {
+  margin-right: 8px;
+}
+.tenantName {
+  font-size: 20px;
+  font-family: PingFangSC-Semibold, PingFang SC;
+  font-weight: 600;
+  color: #FFFFFF;
+  line-height: 28px;
+  max-width: 150px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
 </style>

src/views/categroyManager/generalSettings/groupMarkPrice.vue

@@ -168,7 +168,7 @@
       </el-form>
     </div>
     <el-button  type="primary" @click="save" class="saveBtn"
-     v-permission="'sysConfig/batchUpdate_loginRules'"
+     v-permission="'sysConfig/batchUpdate/groupMarkPrice'"
       >保存</el-button
     >
   </div>

src/views/organManager/components/memberSetting.vue

@@ -169,7 +169,9 @@ export default {
         ...tmpConfig.member_config,
         teachingMaterialId: tempIdArr
       }
-      this.onChange()
+      this.$nextTick(() => {
+        this.onChange()
+      })
     }
   },
   computed: {
@@ -208,7 +210,6 @@ export default {
           id: node.value
         })
       })
-      console.log(this.getValues())
     },
     formatParentId(id, list, ids = []) {
       for (const item of list) {

src/views/teachManager/modals/addRoot.vue

@@ -20,7 +20,7 @@
       >
         <el-input v-model="form.name" placeholder="请输入教材名称" style="width: 100%"></el-input>
       </el-form-item>
-      <el-form-item
+      <!-- <el-form-item
         label="适用分部"
         prop="organId"
         v-if="!(activeRow && activeRow.id)"
@@ -48,7 +48,7 @@
             :value="item.id"
           ></el-option>
         </select-all>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item
         label="音源设置"
         prop="soundResource"
@@ -133,10 +133,10 @@ export default {
     await this.$store.dispatch("setBranchs");
     if (this.activeRow?.id) {
       // 判断是否是根元素处理
-      // if(this.activeRow?.parentId != 0) {
+      if(this.activeRow?.parentId != 0 || this.type == 'create' ) {
         this.imageWidthM = 210
         this.imageHeightM = 268
-      // }
+      }
       this.level = this.activeRow?.level || 0
       try {
         const res = await getSysMusicScoreDetail({ id: this.activeRow.id });

src/views/tenantSetting/chargingRecord.vue

@@ -30,10 +30,9 @@
           collapse-tags
           clearable
           placeholder="请选择分部"
-          @change="onBranchChange"
         >
           <el-option
-            v-for="(item, index) in organList"
+            v-for="(item, index) in selects.branchs"
             :key="index"
             :label="item.name"
             :value="item.id"
@@ -129,7 +128,7 @@
         </el-table-column>
         <!-- <el-table-column align="center" label="姓名" prop="tenantId">
         </el-table-column> -->
-        <el-table-column align="center" label="老师" prop="teacherId">
+        <el-table-column align="center" label="老师" prop="teacherName">
         </el-table-column>
         <el-table-column align="center" label="课程人数" prop="studentNum">
         </el-table-column>
@@ -143,7 +142,7 @@
         </el-table-column> -->
         <el-table-column align="center" label="课程状态">
           <template slot-scope="scope">
-            {{ scope.row.actualAmount | coursesStatus }}
+            {{ scope.row.status | coursesStatus }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="扣费状态">
@@ -181,6 +180,7 @@ import { courseType, courseStatus } from "@/utils/searchArray";
 import { chargingStatus } from '@/constant'
 import OrderInfo from './model/orderInfo'
 import { getTimes } from "@/utils";
+import dayjs from 'dayjs'
 const initSearch = {
   type: null,
   organId: null,
@@ -213,6 +213,7 @@ export default {
     };
   },
   async mounted() {
+    this.$store.dispatch("setBranchs");
     await this.getTenant()
     this.getList();
   },
@@ -232,8 +233,14 @@ export default {
           page: this.pageInfo.page,
           rows: this.pageInfo.limit,
         });
-        this.pageInfo.total = res.total;
-        this.tableList = res.rows;
+        this.pageInfo.total = res.data.total;
+        const rows = res.data.rows || []
+        rows.forEach(item => {
+          item.classDate = item.classDate ? dayjs(item.classDate).format('YYYY-MM-DD') : item.classDate
+          item.startClassTime = item.startClassTime ? dayjs(item.startClassTime).format('HH:mm') : item.startClassTime
+          item.endClassTime = item.endClassTime ? dayjs(item.endClassTime).format('HH:mm') : item.endClassTime
+        });
+        this.tableList = rows;
       } catch (e) {}
     },
     search() {