Merge branch '03/12permission' into dev

src/permission.js

@@ -43,12 +43,21 @@ function getFirstMenu(routes) {
   routes.forEach(item => {
     if(!firstMenu && item.children?.length > 0) {
       item.children.forEach(child => {
-        if(!firstMenu && !child.hidden) {
-          firstMenu = item.path + '/' + child.path
+        if(!firstMenu && child.children?.length > 0) {
+          child.children.forEach(sChild => {
+            if(!firstMenu && !sChild.hidden) {
+              firstMenu = child.path + '/' + sChild.path
+            }
+          })
+        } else {
+          if(!firstMenu && !child.hidden) {
+            firstMenu = item.path + '/' + child.path
+          }
         }
       })
     }
   })
+  console.log(firstMenu)
   return firstMenu
 }
 

src/views/auditList/index.vue

@@ -219,11 +219,9 @@
             fixed="right"
           >
             <template slot-scope="scope">
-              <auth :auths="scope.row.auditStatus === 'AUDITING' ? 'musicGroupPaymentCalender/auditListDetail/update' : 'musicGroupPaymentCalender/auditListDetail/look'">
-                <el-button @click="lookDetail(scope.row)" type="text">
+              <el-button @click="lookDetail(scope.row)" type="text" v-if="$helpers.permission(scope.row.auditStatus === 'AUDITING' ? 'musicGroupPaymentCalender/auditListDetail/update' : 'musicGroupPaymentCalender/auditListDetail/look')">
                   {{ scope.row.auditStatus === "AUDITING" ? "审核" : "查看" }}
-                </el-button>
-              </auth>
+              </el-button>
             </template>
           </el-table-column>
         </el-table>

src/views/serverDetail/index.vue

@@ -399,14 +399,21 @@ export default {
       };
     },
     onExport() {
-      const {orderDate, ...rest} = this.searchForm;
-      Export(this, {
-        url: '/api-web/export/teacherServeInfo',
-        fileName: '退团申请.xlsx',
-        method: 'post',
-        params: qs.stringify({ ...rest, ...getTimes(this.orderDate, ["monday", "sunday"]) })
-      }, '您确定导出退团申请列表?')
-    }
+      const { orderDate, ...rest } = this.searchForm;
+      Export(
+        this,
+        {
+          url: "/api-web/export/teacherServeInfo",
+          fileName: "服务指标明细.xlsx",
+          method: "post",
+          params: qs.stringify({
+            ...rest,
+            ...getTimes(this.orderDate, ["monday", "sunday"]),
+          }),
+        },
+        "您确定导出服务指标明细?"
+      );
+    },
   },
 };
 </script>