Merge branch '03/12permission' into 04/13classAddSound

src/App.vue

@@ -377,7 +377,7 @@ input[type="number"] {
     background-color: #F56C6C;
     border-radius: 50%;
     right: -10px;
-    top: -4px;
+    top: 15px;
   }
 }
 </style>

src/layout/components/Navbar.vue

@@ -36,6 +36,24 @@
         <img src="@/assets/images/base/base-bell.svg" />
         <!-- <div class="active"></div> -->
       </div>
+      <div class="left-menu">
+        <el-popover placement="top-start" width="300" trigger="hover" style="display: flex;height: 59px;">
+          <div class="popover-container">
+            <el-tag
+              class="navbar_tag"
+              type="info"
+              v-for="item in organNameList"
+              :key="item"
+              >{{ item }}</el-tag
+            >
+          </div>
+          <span slot="reference" style="display: flex;align-items: center;justify-content: center;">
+            <!-- {{ organName.length > 10 ? organName.substr(0, 10) + "..." : organName }} -->
+            <!-- <i class="el-icon-s-home" style="font-size: 23px; color: #1A1A1A;"></i> -->
+            <img src="@/assets/images/base/base-home.svg" style="width: 23px;">
+          </span>
+        </el-popover>
+      </div>
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
           <img
@@ -53,7 +71,6 @@
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
           <!-- divided -->
-
           <el-dropdown-item>
             <span style="display: block" @click="resetPassWord">修改密码</span>
           </el-dropdown-item>
@@ -62,25 +79,6 @@
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-
-      <div class="left-menu">
-        <i class="el-icon-location-information topIcon"></i>
-
-        <el-popover placement="top-start" width="300" trigger="hover">
-          <div class="popover-container">
-            <el-tag
-              class="navbar_tag"
-              type="info"
-              v-for="item in organNameList"
-              :key="item"
-              >{{ item }}</el-tag
-            >
-          </div>
-          <span slot="reference">{{
-            organName.length > 10 ? organName.substr(0, 10) + "..." : organName
-          }}</span>
-        </el-popover>
-      </div>
     </div>
     <el-dialog
       title="修改密码"
@@ -312,7 +310,7 @@ export default {
     padding: 0 15px;
     height: 57px;
     text-decoration: none;
-    color: #fff;
+    color: #303133;
     font-size: 15px;
     transition: all .3s ease;
     span {
@@ -323,13 +321,11 @@ export default {
     }
     &:hover,
     &.active{
+      color: #14928a;
       span {
         border-bottom-color: #209e91;
       }
     }
-    &.active {
-      background-color: #2C3246;
-    }
   }
   .breadcrumb{
     line-height: 60px;
@@ -351,7 +347,7 @@ export default {
   height: 60px;
   overflow: hidden;
   position: relative;
-  background: #363d55;
+  background: #fff;
   box-shadow: 0px 8px 20px 0px rgba(0, 0, 0, 0.1);
   h2 {
     font-size: 18px;
@@ -377,7 +373,7 @@ export default {
   }
   .left-menu {
     line-height: 60px;
-    padding-right: 42px;
+    padding-right: 22px;
     font-size: 16px;
     color: #fff;
     .topIcon {
@@ -438,7 +434,7 @@ export default {
 
     .avatar-container {
       height: 60px;
-      margin-right: 12px;
+      margin-right: 42px;
       cursor: pointer;
 
       .avatar-wrapper {
@@ -452,7 +448,7 @@ export default {
           font-size: 14px;
           font-weight: 500;
           // color: rgba(68, 68, 68, 1);
-          color: #fff;
+          color: #444;
         }
 
         .user-avatar {

src/layout/components/Sidebar/SidebarItem.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="!item.hidden" class="menu-wrapper">
+  <div v-if="!item.hidden" v-show="menuIsShow(item)" class="menu-wrapper">
     <template
       v-if="
         hasOneShowingChild(item.children, item) &&
@@ -52,7 +52,7 @@ import { isExternal } from "@/utils/validate";
 import Item from "./Item";
 import AppLink from "./Link";
 import FixiOSBug from "./FixiOSBug";
-
+import { getBelongTopMenuPath } from '@/utils/permission';
 export default {
   name: "SidebarItem",
   components: { Item, AppLink },
@@ -71,6 +71,10 @@ export default {
       type: String,
       default: "",
     },
+    activeTopMenu: {
+          type: String,
+          default: ''
+      }
   },
   data() {
     // To fix https://github.com/PanJiaChen/vue-admin-template/issues/237
@@ -81,7 +85,33 @@ export default {
   mounted() {
     this.onlyOneChild = null;
   },
+  computed: {
+    getActiveTopMenu: function () {
+      if (this.activeTopMenu !== '') {
+          return this.activeTopMenu;
+      }
+      const route = this.$route;
+      /*
+      const { meta, path } = route;
+      if (meta.belongTopMenu) {
+          return meta.belongTopMenu;
+      }
+      return '/' + path.split('/')[1];
+      */
+      return getBelongTopMenuPath(route);
+    },
+  },
   methods: {
+    menuIsShow(route) {
+        let activeTopMenu = this.basePath;
+        const { meta } = route;
+        if (meta.belongTopMenu) {
+            activeTopMenu = meta.belongTopMenu;
+        }
+        //
+        // console.log(activeTopMenu, this.getActiveTopMenu)
+        return activeTopMenu === this.getActiveTopMenu;
+    },
     hasOneShowingChild(children = [], parent) {
       const showingChildren = children.filter((item) => {
         if (item.hidden) {

src/layout/components/Sidebar/index.vue

@@ -15,7 +15,12 @@
         <template v-for="route in permission_routes">
           <template v-if="!route.hidden">
             <!-- <sidebar-item  v-for="route2 in route.children" :key="route.path + '/' + route2.path" :item="route2" :base-path="route.path" :resolve-path="route.path" :active-top-menu="getTopMenuActive" /> -->
-            <sidebar-menu-item v-for="route2 in route.children" :key="route.path + '/' + route2.path" :routes="route2" :base-path="route.path" :resolve-path="route.path" :active-top-menu="getTopMenuActive"/>
+            <!-- <sidebar-menu-item v-for="route2 in route.children" :key="route.path + '/' + route2.path" :routes="route2" :base-path="route.path" :resolve-path="route.path" :active-top-menu="getTopMenuActive"/> -->
+            <sidebar-item v-for="(route2) in route.children"
+                      :key="route.path + '/' + route2.path"
+                      :item="route2"
+                      :active-top-menu="getTopMenuActive"
+                      :base-path="route2.path" />
           </template>
         </template>
         <!-- <sidebar-item v-for="(route,index) in permission_routes"

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -410,11 +410,14 @@
             :label-width="formLabelWidth"
              :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
           >
-            <el-input
+            <!-- <el-input
               v-model.trim="form.calenderId"
               :disabled="!isAdd"
               placeholder="请输入缴费单号"
-            ></el-input>
+            ></el-input> -->
+            <el-select v-model="form.calenderId" :disabled="!isAdd" placeholder="请选择缴费单号" style="width: 100% !important" filterable>
+              <el-option v-for="(item, index) in getCalenderList" :key="index" :label="item.id" :value="item.id"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item
             label="学员编号"
@@ -622,6 +625,7 @@ import {
   routeOrderAdd,
   getOrderInfo,
   orderDelete,
+  getCalenders
 } from "@/api/orderManager";
 import { goodsQuery } from "@/api/businessManager";
 import { getEmployeeOrgan, getAddress, getCooperation } from "@/api/buildTeam";
@@ -748,6 +752,7 @@ export default {
       headers: {
         Authorization: getToken(),
       },
+      getCalenderList: []
     };
   },
   created() {
@@ -1070,7 +1075,15 @@ export default {
         });
       }
     },
-    checkSchool(val) {},
+    async checkSchool(val) {
+      this.form.calenderId = null
+      try {
+        let res = await getCalenders({id : val})
+        this.getCalenderList = res.data
+      } catch {
+        //
+      }
+    },
     checkgoods(val) {
       for (let i = 0; i <= this.form.goodsList.length - 1; i++) {
         if (

src/views/businessManager/orderManager/financeManager.vue

@@ -771,7 +771,7 @@ export default {
     //   }
     // });
     this.$store.dispatch("setBranchs");
-    goodsQuery({ status: 1, rows: 99999 }).then((res) => {
+    goodsQuery({ rows: 99999 }).then((res) => {
       if (res.code === 200) {
         this.shopList = res.data.rows;
       }

src/views/businessManager/orderManager/orderAudit-taoqi/index.vue

@@ -233,7 +233,8 @@ export default {
       }
     });
     // 获取分部
-    goodsQuery({ status: 1, rows: 99999 }).then((res) => {
+     this.$store.dispatch("setBranchs");
+    goodsQuery({ rows: 99999 }).then((res) => {
       if (res.code === 200) {
         this.shopList = res.data.rows;
       }

src/views/businessManager/orderManager/orderAudit/index.vue

@@ -265,7 +265,7 @@ export default {
     // });
     // 获取分部
      this.$store.dispatch("setBranchs");
-    goodsQuery({ status: 1, rows: 99999 }).then((res) => {
+    goodsQuery({ rows: 99999 }).then((res) => {
       if (res.code === 200) {
         this.shopList = res.data.rows;
       }