chenrui 4 jaren geleden
bovenliggende
commit
d1b612f290

+ 14 - 15
src/config/router.config.js

@@ -129,10 +129,9 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '订单',
-      icon: 'profile'
-      // permission: 'M_tenants_list'
+      icon: 'profile',
+      permission: 'M_order'
     },
-    // hideChildrenInMenu: true,
     children: [
       {
         path: '/order/orderManage',
@@ -141,8 +140,8 @@ export const asyncRouterMap = [{
         component: RouteView,
         meta: {
           title: '订单管理',
-          icon: 'profile'
-        // permission: 'M_tenants_list'
+          icon: 'profile',
+          permission: 'M_orderManage_list'
         },
         hideChildrenInMenu: true,
         children: [
@@ -153,8 +152,8 @@ export const asyncRouterMap = [{
             meta: {
               title: '订单列表',
               icon: 'shopping',
-              hidden: true
-              // permission: 'M_goodsManage_list'
+              hidden: true,
+              permission: 'M_orderManage_list'
             }
           },
           {
@@ -164,8 +163,8 @@ export const asyncRouterMap = [{
             meta: {
               title: '订单详情',
               icon: 'profile',
-              hidden: true
-            // permission: 'M_tenants_list'
+              hidden: true,
+              permission: 'B_orderManage_detail'
             }
           }
         ]
@@ -268,8 +267,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '网点/设备',
-      icon: 'apartment'
-      // permission: 'M_tenants_list'
+      icon: 'apartment',
+      permission: 'M_networkEquipment'
     },
     children: [{
       path: '/equipmentManage/network',
@@ -277,8 +276,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "equipmentManage" */ '@/views/equipmentManage/network/network.vue'),
       meta: {
         title: '网点管理',
-        icon: 'cluster'
-        // permission: 'M_tenants_list'
+        icon: 'cluster',
+        permission: 'M_network_list'
       }
     },
     {
@@ -287,8 +286,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "equipmentManage" */ '@/views/equipmentManage/equipment/equipment.vue'),
       meta: {
         title: '设备管理',
-        icon: 'usb'
-        // permission: 'M_tenants_list'
+        icon: 'usb',
+        permission: 'M_equipment_list'
       }
     },
     {

+ 2 - 0
src/views/equipmentManage/equipment/equipment.vue

@@ -45,10 +45,12 @@
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button
+          v-if="$hasPermissions('B_equipment_log')"
           type="primary"
           class="btn-edit-s"
           id="equipment-log-btn"
           @click="checkLog(record)">掉线日志</a-button>
+        <span v-else>--</span>
       </template>
     </s-table>
     <!-- 掉线日志 -->

+ 17 - 4
src/views/equipmentManage/network/network.vue

@@ -38,7 +38,7 @@
     </div>
     <a-divider />
     <div class="table-operator">
-      <a-button class="add-btn" id="network-btn-add" type="primary" @click="handleEdit">新增网点</a-button>
+      <a-button v-if="$hasPermissions('B_network_add')" class="add-btn" id="network-btn-add" type="primary" @click="handleEdit">新增网点</a-button>
     </div>
     <!-- 合计 -->
     <div class="total">
@@ -54,11 +54,24 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-icon type="eye" id="network-handleView" title="详情" class="actionBtn icon-green" @click="handleView(record)" />
-        <a-icon type="edit" id="network-handleEdit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" />
-        <a-badge :count="record.deviceNum">
+        <a-icon
+          v-if="$hasPermissions('B_network_look')"
+          type="eye"
+          id="network-handleView"
+          title="详情"
+          class="actionBtn icon-green"
+          @click="handleView(record)" />
+        <a-icon
+          v-if="$hasPermissions('B_network_edit')"
+          type="edit"
+          id="network-handleEdit"
+          title="编辑"
+          class="actionBtn icon-blues"
+          @click="handleEdit(record)" />
+        <a-badge v-if="$hasPermissions('B_network_bind')" :count="record.deviceNum">
           <a-icon type="link" id="network-handleLink" title="绑定箱体设备" class="actionBtn icon-orange" @click="handleBind(record)" />
         </a-badge>
+        <span v-if="!$hasPermissions('B_network_look') && !$hasPermissions('B_network_edit') && !$hasPermissions('B_network_bind')">--</span>
       </template>
     </s-table>
     <!-- 新增编辑 -->

+ 1 - 1
src/views/shop/GoodsOrder.vue

@@ -5,7 +5,7 @@
       <!-- 待发货 -->
       <div class="unDelivered" v-if="type == 'orderGoods'">
         <p class="order-status">待发货</p>
-        <a-button id="goodsOrder-send" type="primary" size="small" @click="sendGoods">立即发货</a-button>
+        <a-button v-if="$hasPermissions('B_order_sendGoods')" id="goodsOrder-send" type="primary" size="small" @click="sendGoods">立即发货</a-button>
       </div>
       <!-- 已发货 -->
       <div class="delivered" v-if="type == 'express'">

+ 1 - 1
src/views/shop/goodsList.vue

@@ -121,7 +121,7 @@ export default {
   methods: {
     //  商品分类下拉数据
     getGoodsType () {
-      goodsTypeQueryList().then(res => {
+      goodsTypeQueryList({}).then(res => {
         if (res.status == 200) {
           this.goodsTypeList = res.data
         } else {

+ 9 - 2
src/views/shop/shopOrder.vue

@@ -44,7 +44,13 @@
     </div>
     <a-divider />
     <div class="table-operator">
-      <a-button class="export-btn" id="shopOrder-btn-export" type="" :loading="loading" @click="handleExport">导出</a-button>
+      <a-button
+        v-if="$hasPermissions('B_orderManage_export')"
+        class="export-btn"
+        id="shopOrder-btn-export"
+        type=""
+        :loading="loading"
+        @click="handleExport">导出</a-button>
     </div>
     <s-table
       ref="table"
@@ -59,7 +65,8 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button id="shopOrder-handleView" type="link" @click="handleView(record)">详情</a-button>
+        <a-button v-if="$hasPermissions('B_orderManage_detail')" id="shopOrder-handleView" type="link" @click="handleView(record)">详情</a-button>
+        <span v-else>--</span>
       </template>
     </s-table>
   </a-card>