Bladeren bron

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

chenrui 3 jaren geleden
bovenliggende
commit
19471ad1be
2 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 1 1
      src/api/reportData.js
  2. 2 2
      src/views/reportData/salesReturnsReport/list.vue

+ 1 - 1
src/api/reportData.js

@@ -172,7 +172,7 @@ export const salesReturnDetailExport = (params) => {
 // 开单销售单 导出
 export const salesSlipExport = (params) => {
   return axios({
-    url: '/report/reportRebate/export',
+    url: '/report/salesBillReport/export',
     data: params,
     method: 'post',
     responseType: 'blob'

+ 2 - 2
src/views/reportData/salesReturnsReport/list.vue

@@ -81,14 +81,14 @@
                 id="salesReturnsReportList-stockDate">盘点区间日期</a-button>
               <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnsReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnsReportList-reset">重置</a-button>
-              <!-- <a-button
+              <a-button
                 style="margin-left: 10px"
                 type="primary"
                 class="button-warning"
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                id="salesReturnsReportList-export">导出</a-button> -->
+                id="salesReturnsReportList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>