Bladeren bron

Merge branch 'develop_yh21' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh21

lilei 1 jaar geleden
bovenliggende
commit
69c087bfaa
2 gewijzigde bestanden met toevoegingen van 8 en 7 verwijderingen
  1. 6 6
      src/config/router.config.js
  2. 2 1
      src/views/salesManagement/salesOrderWarehouse/list.vue

+ 6 - 6
src/config/router.config.js

@@ -217,8 +217,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '销售单仓库',
-              icon: 'vertical-align-bottom'
-              // permission: 'M_salesOrderWarehouseList'
+              icon: 'vertical-align-bottom',
+              permission: 'M_salesOrderWarehouseList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -229,8 +229,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '销售单仓库列表',
                   icon: 'vertical-align-bottom',
-                  hidden: true
-                  // permission: 'M_salesOrderWarehouseList'
+                  hidden: true,
+                  permission: 'M_salesOrderWarehouseList'
                 }
               },
               {
@@ -241,8 +241,8 @@ export const asyncRouterMap = [
                   title: '销售单仓库列表详情',
                   icon: 'vertical-align-bottom',
                   replaceTab: true,
-                  hidden: true
-                  // permission: 'B_dispatchDetail'
+                  hidden: true,
+                  permission: 'B_salesOrderWarehouseDetail'
                 }
               }
             ]

+ 2 - 1
src/views/salesManagement/salesOrderWarehouse/list.vue

@@ -51,6 +51,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
+                v-if="$hasPermissions('B_salesOrderWarehouseExport')"
               >导出</a-button>
             </a-col>
           </a-row>
@@ -77,7 +78,7 @@
         :defaultLoadData="false"
         bordered>
         <!-- 单号 -->
-        <template slot="stockOutNo" slot-scope="text, record">
+        <template slot="stockOutNo" slot-scope="text, record" v-if="$hasPermissions('B_salesOrderWarehouseDetail')">
           <span class="link-bule" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
         </template>
       </s-table>