lilei před 3 roky
rodič
revize
ab1dd6c2e9

+ 3 - 2
src/api/reportData.js

@@ -482,9 +482,10 @@ export const allocateReturnReportQueryCount = (params) => {
     method: 'post'
   })
 }
+// 导出
 export const allocateReturnReportExport = (params) => {
   return axios({
-    url: '/report/allocateReturnReport/export',
+    url: '/report/allocateReturnReport/exportExcel',
     data: params,
     method: 'post',
     responseType: 'blob'
@@ -513,7 +514,7 @@ export const allocateReturnReportDetailQueryCount = (params) => {
 // 导出
 export const allocateReturnReportDetailExport = (params) => {
   return axios({
-    url: '/report/allocateReturnReport/detail/export',
+    url: '/report/allocateReturnReport/detail/exportExcel',
     data: params,
     method: 'post',
     responseType: 'blob'

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

@@ -1395,7 +1395,7 @@ export const asyncRouterMap = [
             meta: {
               title: '调拨退货单报表',
               icon: 'profile',
-              // permission: 'M_transferReturnReportList'
+              permission: 'M_transferReturnReportList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1407,7 +1407,7 @@ export const asyncRouterMap = [
                   title: '调拨退货单报表列表',
                   icon: 'profile',
                   hidden: true,
-                  // permission: 'M_transferReturnReportList'
+                  permission: 'M_transferReturnReportList'
                 }
               }
             ]
@@ -1420,7 +1420,7 @@ export const asyncRouterMap = [
             meta: {
               title: '调拨退货单明细报表',
               icon: 'profile',
-              // permission: 'M_transferReturnDetailReportList'
+              permission: 'M_transferReturnDetailReportList'
             },
             hideChildrenInMenu: true,
             children: [{
@@ -1431,7 +1431,7 @@ export const asyncRouterMap = [
                 title: '调拨退货单明细报表列表',
                 icon: 'profile',
                 hidden: true,
-                // permission: 'M_transferReturnDetailReportList'
+                permission: 'M_transferReturnDetailReportList'
               }
             }]
           },

+ 9 - 9
src/views/dowloadFile/list.vue

@@ -45,7 +45,7 @@
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a href="javascript:void(0)" @click="dowloadExcel(record.fileUrl)" style="padding: 5px 0 0 23px;display: block;" v-if="record.taskState=='SUCCESS'">下载文件</a>
+          <a :href="record.fileUrl" style="padding: 5px 0 0 23px;display: block;" v-if="record.taskState=='SUCCESS'">下载文件</a>
           <span v-else>--</span>
         </template>
       </s-table>
@@ -107,14 +107,14 @@ export default {
   },
   methods: {
     dowloadExcel (url) {
-      // dowloadFile(url, '')
-      const elt = document.createElement('a')
-      elt.setAttribute('href', url)
-      elt.setAttribute('download', '')
-      elt.style.display = 'none'
-      document.body.appendChild(elt)
-      elt.click()
-      document.body.removeChild(elt)
+      dowloadFile(url, '')
+      // const elt = document.createElement('a')
+      // elt.setAttribute('href', url)
+      // elt.setAttribute('download', '')
+      // elt.style.display = 'none'
+      // document.body.appendChild(elt)
+      // elt.click()
+      // document.body.removeChild(elt)
     },
     //  时间  change
     dateChange (date) {