Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-09-05 8b2c74fb6842e8af60f70e7df6eef8837d74be07

 north-glass-erp/northglass-erp/src/layout/MainErpView.vue

@@ -170,7 +170,7 @@
          </el-menu>-->
          <div class="menu"  >
              <div v-for="items in menuList">
                <div class='menu_title' @click="openMenu(items.id)"  >{{items.menuName}}<span class='indicator' >▼</span></div>
                <div class='menu_title' @click="openMenu(items.id)"  >{{$t('menu.'+items.id)}}<span class='indicator' >▼</span></div>
                <ul class='enter-x-left' v-show="openFlag==items.id">

                  <li v-for="menuItem in menuItemList"
@@ -179,7 +179,7 @@
                  >
                    <router-link
                        :to="{path:menuItem.url}">
                      {{ menuItem.itemName}}
                      {{ $t('menu.'+menuItem.menu)}}
                    </router-link>

                  </li>