Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/constant/guide.js

@@ -44,7 +44,7 @@ export const guideList = {
   memberList: {
     name: '团练宝定价',
     desc: '可对不同分部设置团练宝学员购买价格，若不设置则学员不可购买团练宝',
-    path: '/productSystem?tabrouter=2',
+    path: '/memberFeeSet',
     permission: '/memberFeeSet'
   },
   teacher:{

src/layout/components/Navbar.vue

@@ -49,6 +49,7 @@
         placement="bottom"
         trigger="hover"
         style="display: flex;"
+        v-if="tenantForm.tenantId == 1"
       >
         <div class="popover-container" style="text-align: center">OA审批</div>
 

src/store/modules/permission.js

@@ -830,7 +830,19 @@ function setDetailRoute(accessedRoutes) {
             activeMenu: '/parameter/adminManager',
             id: '3993'
           }
-        },
+        }, {
+          name: '扣费记录',
+          path: 'chargingRecord',
+          component: () => import('@/views/tenantSetting/chargingRecord.vue'),
+          hidden: true,
+          meta: {
+            noCache: '1',
+            title: '扣费记录',
+            belongTopMenu: "/systemManager",
+            activeMenu: '/productService',
+            id: '4741'
+          }
+        }
         // /parameter/adminManager adminOperation
       ])
     }
@@ -847,13 +859,7 @@ function setDetailRoute(accessedRoutes) {
           activeMenu: '/serviceManager/serviceList',
           id: '4631'
         }
-      }])
-    }
-    if (route.path == '/federationManager') {
-      if (!route.children) {
-        route.children = []
-      }
-      route.children = route.children.concat([{
+      }, {
         name: '添加&修改',
         path: 'organOperation',
         component: () => import('@/views/organManager/organOperation'),
@@ -861,24 +867,30 @@ function setDetailRoute(accessedRoutes) {
         meta: {
           noCache: '1',
           title: '添加&修改',
-          belongTopMenu: "/federationManager",
+          belongTopMenu: "/platformManager",
           activeMenu: '/organManager/organList',
           id: '4652'
         }
-      }, {
-        name: '扣费记录',
-        path: 'chargingRecord',
-        component: () => import('@/views/tenantSetting/chargingRecord.vue'),
-        hidden: true,
-        meta: {
-          noCache: '1',
-          title: '扣费记录',
-          belongTopMenu: "/federationManager",
-          activeMenu: '/productService',
-          id: '4741'
-        }
       }])
     }
+    // if (route.path == '/federationManager') {
+    //   if (!route.children) {
+    //     route.children = []
+    //   }
+    //   route.children = route.children.concat([{
+    //     name: '扣费记录',
+    //     path: 'chargingRecord',
+    //     component: () => import('@/views/tenantSetting/chargingRecord.vue'),
+    //     hidden: true,
+    //     meta: {
+    //       noCache: '1',
+    //       title: '扣费记录',
+    //       belongTopMenu: "/federationManager",
+    //       activeMenu: '/productService',
+    //       id: '4741'
+    //     }
+    //   }])
+    // }
   })
   return accessedRoutes
 }

src/views/accompaniment/index.vue

@@ -455,7 +455,6 @@ export default {
         let { categoriesId, organId, ...search } = deepClone(this.searchForm);
         const res = await QueryPage({
           ...search,
-          organId: organId.join(","),
           categoriesId:
             categoriesId && categoriesId.length > 0 ? categoriesId.pop() : null,
           page: this.rules.page,

src/views/organManager/index.vue

@@ -218,7 +218,7 @@ export default {
       }
 
       this.$router.push({
-        path: '/federationManager/organOperation',
+        path: '/platformManager/organOperation',
         query: {
           type: type,
           id: row?.id || null

src/views/productService/index.vue

@@ -115,7 +115,7 @@ export default {
       } catch(e) { }
     },
     onDetail() {
-      this.$router.push('/federationManager/chargingRecord')
+      this.$router.push('/systemManager/chargingRecord')
     }
   }
 };