Explorar o código

Merge branch 'develop_yh48-2' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh48-2

lilei hai 8 meses
pai
achega
8fb432c38b

+ 1 - 1
src/api/reportStock.js

@@ -95,7 +95,7 @@ export const freezeReportCount = (params) => {
 // 冻结产品报表 导出
 export const freezeReportExport = params => {
   return axios.request({
-    url: `/report//reportStockOut/freezeReportExport`,
+    url: '/report/reportStockOut/freezeReportExport',
     data: params,
     method: 'post',
     responseType: 'blob',

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

@@ -2479,7 +2479,7 @@ export const asyncRouterMap = [
             meta: {
               title: '冻结产品报表',
               icon: 'profile',
-              // permission: 'M_frozenProductReportList'
+              permission: 'M_frozenProductReportList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -2491,7 +2491,7 @@ export const asyncRouterMap = [
                   title: '冻结产品报表列表',
                   icon: 'profile',
                   hidden: true,
-                  // permission: 'M_frozenProductReportList'
+                  permission: 'M_frozenProductReportList'
                 }
               }
             ]

+ 1 - 1
src/views/productManagement/productInfo/list.vue

@@ -57,6 +57,7 @@
       <!-- 操作按钮 -->
       <div class="table-operator">
         <a-button v-if="$hasPermissions('B_product_dealerProduct_add')" id="productInfoList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button class="button-primary" v-if="$hasPermissions('B_product_dealerProduct_Export')" type="primary" @click="importProduct">导入</a-button>
         <a-dropdown v-if="$hasPermissions('B_product_dealerProduct_enable')">
           <a-menu slot="overlay" @click="handleMenuClick" id="productInfoList-menus">
             <a-menu-item key="1" id="productInfoList-menus-1"> 批量启用</a-menu-item>
@@ -65,7 +66,6 @@
           <a-button id="productInfoList-menus-action" type="danger" ghost style="margin:0 15px 0 5px;">批量操作 <a-icon type="down" /> </a-button>
         </a-dropdown>
         <span v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys">已选 {{ rowSelectionInfo.selectedRowKeys.length }} 项</span>
-        <a-button class="button-primary" type="primary" @click="importProduct">导入</a-button>
       </div>
       <!-- 列表 -->
       <s-table

+ 1 - 1
src/views/reportData/frozenProductReport/list.vue

@@ -80,7 +80,7 @@
                 type="primary"
                 class="button-warning"
                 @click="handleExport"
-                v-if="$hasPermissions('B_receivedSendStorageReportExport')"
+                v-if="$hasPermissions('B_frozenProductExport')"
                 :disabled="disabled"
                 :loading="exportLoading"
                 id="frozenProductReportList-export">导出</a-button>