zhangdan преди 3 години
родител
ревизия
eac4afcd8a
променени са 25 файла, в които са добавени 189 реда и са изтрити 63 реда
  1. 1 1
      src/api/dowloadFile.js
  2. 5 0
      src/components/tools/UserMenu.vue
  3. 6 4
      src/libs/exportExcel.js
  4. 44 0
      src/views/common/reportModal.vue
  5. 13 38
      src/views/dowloadFile/list.vue
  6. 6 1
      src/views/reportData/actualSalesReport/list.vue
  7. 6 1
      src/views/reportData/allCountryCostReport/list.vue
  8. 6 1
      src/views/reportData/allocationDetails/list.vue
  9. 6 1
      src/views/reportData/allocationPresentation/list.vue
  10. 6 1
      src/views/reportData/billingReturnReport/list.vue
  11. 6 1
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  12. 6 1
      src/views/reportData/priceDifferenceDetailReport/list.vue
  13. 6 1
      src/views/reportData/regionTypeSalesReport/list.vue
  14. 6 1
      src/views/reportData/returnGoodsPresentation/list.vue
  15. 6 1
      src/views/reportData/returnSlipReport/list.vue
  16. 6 1
      src/views/reportData/salesAmountReport/list.vue
  17. 6 1
      src/views/reportData/salesDetails/list.vue
  18. 6 1
      src/views/reportData/salesOrderTotal/list.vue
  19. 6 1
      src/views/reportData/salesPresentation/list.vue
  20. 6 1
      src/views/reportData/salesReturnDetailReport/list.vue
  21. 6 1
      src/views/reportData/salesReturnReport/list.vue
  22. 6 1
      src/views/reportData/salesReturnsReport/list.vue
  23. 6 1
      src/views/reportData/salesSlipReport/list.vue
  24. 6 1
      src/views/reportData/warehousingOrder/list.vue
  25. 6 1
      src/views/reportData/warehousingOrderDetail/list.vue

+ 1 - 1
src/api/dowloadFile.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  下载中心  有分页
 export const taskList = (params) => {
-  const url = `exportTask/queryPage/${params.pageNo}/${params.pageSize}`
+  const url = `report/exportTask/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 5 - 0
src/components/tools/UserMenu.vue

@@ -108,3 +108,8 @@ export default {
   }
 }
 </script>
+<style>
+	.box-down{
+		cursor: pointer;
+	}
+</style>

+ 6 - 4
src/libs/exportExcel.js

@@ -14,10 +14,12 @@ export const hdExportExcel = function (url, params, fileName, callback) {
       var reader = new FileReader()
       reader.addEventListener('loadend', function () {
         const obj = JSON.parse(reader.result)
-        notification.error({
-          message: '提示',
-          description: obj.message
-        })
+        if (obj.status != 200) {
+          notification.error({
+            message: '提示',
+            description: obj.message
+          })
+        }
       })
       reader.readAsText(res)
     } else {

+ 44 - 0
src/views/common/reportModal.vue

@@ -0,0 +1,44 @@
+<template>
+  <div>
+    <a-modal v-model="isShow" :footer="null" centered :closable="false" width="480">
+      <div style="text-align: center; margin: 20px 0;">
+        <p>数据导出中,请稍后在右上角的【下载中心】功能中下载导出文件!</p>
+        <a-button type="primary" @click="cancel" size="small">好的</a-button>
+      </div>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      isShow: this.visible
+    }
+  },
+  methods: {
+    cancel () {
+      this.$emit('close')
+    }
+  },
+  watch: {
+    visible (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    isShow (nVal, oVal) {
+      if (!nVal) {
+        this.$emit('close')
+      }
+    }
+  }
+}
+</script>
+
+<style>
+</style>

+ 13 - 38
src/views/dowloadFile/list.vue

@@ -12,12 +12,12 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="文件名称">
-                <a-input id="noticeManagementList-fileName" v-model.trim="queryParam.fileName" allowClear placeholder="请输入标题"/>
+                <a-input id="noticeManagementList-fileName" v-model.trim="queryParam.fileName" allowClear placeholder="请输入文件名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="状态">
-                <v-select code="EXPORT_TASK_STATE" id="noticeManagementList-taskState" v-model="queryParam.taskState" allowClear placeholder="请选择发布状态"></v-select>
+                <v-select code="EXPORT_TASK_STATE" id="noticeManagementList-taskState" v-model="queryParam.taskState" allowClear placeholder="请选择状态"></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
@@ -28,9 +28,9 @@
         </a-form>
       </div>
       <!-- 总计 -->
-      <!-- <a-alert type="info" style="margin-bottom:10px">
-        <div slot="message">合计:<strong>{{ total || 0 }}</strong>条</div>
-      </a-alert> -->
+      <a-alert type="info" style="margin-bottom:10px">
+        <div slot="message">注意:所有文件只保留7天,超过7天后,状态变为过期,不能下载</div>
+      </a-alert>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
@@ -41,31 +41,12 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
+        :defaultLoadData="true"
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-info"
-            v-if="record.taskState=='0'"
-            @click="handleEdit(record)"
-            id="noticeManagementList-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-success"
-            v-if="record.taskState=='1'"
-            @click="handleDetail(record)"
-            id="noticeManagementList-detail-btn">详情</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-error"
-            v-if="record.taskState=='0'"
-            @click="handleDel(record)"
-            id="noticeManagementList-del-btn">删除</a-button>
+          <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>
     </a-spin>
@@ -90,14 +71,11 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { fileName: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { fileName: '创建时间', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { fileName: '类别', dataIndex: 'typeDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { fileName: '标题', dataIndex: 'fileName', align: 'center', width: '25%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { fileName: '可见性', dataIndex: 'toAppNameDictValue', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
-        { fileName: '发布时间', dataIndex: 'releaseDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { fileName: '发布状态', dataIndex: 'taskStateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { fileName: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
+        { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '文件名称', dataIndex: 'fileName', align: 'center', width: '40%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '状态', dataIndex: 'taskStateDictValue', align: 'center', width: '20%', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -110,9 +88,6 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
-              data.list[i].typeDictValue = data.list[i].type == 'notity' ? '公告' : data.list[i].type == 'news_company' ? '企业新闻' : data.list[i].type == 'news_trade' ? '行业咨询' : '--'
-              data.list[i].taskStateDictValue = data.list[i].taskState == 1 ? '已发布' : data.list[i].taskState == 0 ? '未发布' : '--'
-              data.list[i].toAppNameDictValue = data.list[i].toAppName == '1,2' ? '所有' : data.list[i].toAppName == '2' ? '经销商' : data.list[i].toAppName == '1' ? '总部' : '--'
             }
             this.total = data.count || 0
             this.disabled = false

+ 6 - 1
src/views/reportData/actualSalesReport/list.vue

@@ -131,6 +131,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -139,18 +141,20 @@ import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
+import reportModal from '@/views/common/reportModal.vue'
 import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesBillRealAmountQueryPageList, salesBillRealReportCount } from '@/api/salesBillReport'
 import { actualSalesExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, subarea, custList },
+  components: { STable, VSelect, rangeDate, subarea, custList,reportModal },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
+      showExport:false,// 导出弹窗初始值
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime,
@@ -391,6 +395,7 @@ export default {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
+          _this.showExport=true
           const params = _this.queryParam
           _this.exportLoading = true
           _this.spinning = true

+ 6 - 1
src/views/reportData/allCountryCostReport/list.vue

@@ -102,19 +102,22 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
 <script>
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
+import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import subarea from '@/views/common/subarea.js'
 import { reportSalesReturnThjdReportList } from '@/api/reportData'
 import moment from 'moment'
 import reportData from '@/libs/reportData.js'
 export default {
-  components: { STable, VSelect, rangeDate, subarea, moment },
+  components: { STable, VSelect, rangeDate, subarea, moment, reportModal },
   data () {
     return {
       spinning: false,
@@ -122,6 +125,7 @@ export default {
       activeKey: 0,
       open: false,
       year: '',
+      showExport: false, // 导出弹窗初始值
       queryParam: {
         time: [],
         beginDate: '',
@@ -533,6 +537,7 @@ export default {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
+          _this.showExport = true
           const params = _this.queryParam
           _this.exportLoading = true
           _this.spinning = true

+ 6 - 1
src/views/reportData/allocationDetails/list.vue

@@ -146,6 +146,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -153,6 +155,7 @@
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
+import reportModal from '@/views/common/reportModal.vue'
 import subarea from '@/views/common/subarea.js'
 import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQuery } from '@/api/productType'
@@ -163,13 +166,14 @@ import { hdExportExcel } from '@/libs/exportExcel'
 import { userQueryList } from '@/api/power-user'
 import { allocateReportDetailList, allocateReportDetailCount, allocateReportDetailExport } from '@/api/allocateReport'
 export default {
-  components: { STable, VSelect, rangeDate, subarea, ProductBrand },
+  components: { STable, VSelect, rangeDate, subarea, ProductBrand, reportModal },
   data () {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
       exportLoading: false,
       tableHeight: 0,
+      showExport: false,
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime,
@@ -352,6 +356,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(allocateReportDetailExport, params, '调拨明细报表', function () {

+ 6 - 1
src/views/reportData/allocationPresentation/list.vue

@@ -129,22 +129,26 @@
         </template>
       </s-table>
     </a-spin>
+	<!-- 导出提示框 -->
+	<reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
 <script>
 import { STable, VSelect } from '@/components'
 import rangeDateTime from '@/views/common/rangeDateTime.vue'
+import reportModal from '@/views/common/reportModal.vue'
 import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportAllocateDbjdReportList, reportAllocateDbjdReportCount, reportAllocateDbjdReportExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDateTime, subarea },
+  components: { STable, VSelect, rangeDateTime, subarea,reportModal },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
+	  showExport:false,
       queryParam: { //  查询条件
         time: [],
         beginDate: '',
@@ -316,6 +320,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport=true
           delete params.time
           _this.exportLoading = true
           _this.spinning = true

+ 6 - 1
src/views/reportData/billingReturnReport/list.vue

@@ -131,6 +131,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -140,16 +142,18 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
 import subarea from '@/views/common/subarea.js'
+import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesReportReturnList, salesReportReturnCount, billingReturnExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, custList, subarea, rangeDate },
+  components: { STable, VSelect, custList, subarea, rangeDate, reportModal },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
+      showExport: false,
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime,
@@ -391,6 +395,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(billingReturnExport, params, '开单退货报表', function () {

+ 6 - 1
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -121,6 +121,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -131,16 +133,18 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
 import subarea from '@/views/common/subarea.js'
+import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
 import { headRebateDetailReportList, headRebateDetailReportCount, headRebateDetailReportExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, custList, subarea, rangeDate, ProductBrand, ProductType },
+  components: { STable, VSelect, custList, subarea, rangeDate, ProductBrand, ProductType, reportModal },
   data () {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
+      showExport: false,
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime,
@@ -246,6 +250,7 @@ export default {
       _this.spinning = true
       headRebateDetailReportExport(params).then(res => {
         this.exportLoading = false
+        _this.showExport = true
         _this.spinning = false
         if (res.type == 'application/json') {
           var reader = new FileReader()

+ 6 - 1
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -80,6 +80,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -90,15 +92,17 @@ import custList from '@/views/common/custList.vue'
 import { getArea } from '@/api/data'
 import subarea from '@/views/common/subarea.js'
 import rangeDate from '@/views/common/rangeDate.vue'
+import reportModal from '@/views/common/reportModal.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportRebateReportList, reportRebateCount, reportRebateExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, custList, subarea, rangeDate },
+  components: { STable, VSelect, custList, subarea, rangeDate, reportModal },
   data () {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
       exportLoading: false,
+      showExport: false,
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime,
@@ -255,6 +259,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportRebateExport, params, '差价明细报表', function () {

+ 6 - 1
src/views/reportData/regionTypeSalesReport/list.vue

@@ -76,6 +76,8 @@
         bordered>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -85,9 +87,10 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import { getArea } from '@/api/data'
 import subarea from '@/views/common/subarea.js'
 import { hdExportExcel } from '@/libs/exportExcel'
+import reportModal from '@/views/common/reportModal.vue'
 import { realReportSalesByProvince, realReportSalesByProvinceExport, realReportSalesBySubArea, realReportSalesBySubAreaExport } from '@/api/reportData.js'
 export default {
-  components: { STable, VSelect, rangeDate, subarea },
+  components: { STable, VSelect, rangeDate, subarea, reportModal },
   data () {
     return {
       spinning: false,
@@ -95,6 +98,7 @@ export default {
       salesStatusTypeList: [{ code: 'SALES', name: '实售销售' }, { code: 'SALES_RETURN', name: '实售退货' }, { code: 'REAL_SALES', name: '实际销售' }],
       activeKey: 0,
       advanced: true, // 高级搜索 展开/关闭
+      showExport: false,
       queryParam: {
         time: [],
         beginDate: '',
@@ -252,6 +256,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(jkUrl, params, excelTitle, function () {

+ 6 - 1
src/views/reportData/returnGoodsPresentation/list.vue

@@ -136,6 +136,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -144,14 +146,16 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
+import reportModal from '@/views/common/reportModal.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesReturnThjdReportList, reportSalesReturnThjdReportCount, reportSalesReturnThjdReportExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, subarea },
+  components: { STable, VSelect, rangeDate, subarea, reportModal },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
+      showExport: false,
       queryParam: { //  查询条件
         time: [],
         beginDate: '',
@@ -390,6 +394,7 @@ export default {
         if (valid) {
           const params = _this.queryParam
           delete params.time
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportSalesReturnThjdReportExport, params, '退货交单报表', function () {

+ 6 - 1
src/views/reportData/returnSlipReport/list.vue

@@ -136,6 +136,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -145,16 +147,18 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
 import subarea from '@/views/common/subarea.js'
+import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesReportReturnBillList, salesReportReturnBillCount, returnSlipExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, custList, subarea, rangeDate },
+  components: { STable, VSelect, custList, subarea, rangeDate, reportModal },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
+      showExport: false,
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime,
@@ -397,6 +401,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(returnSlipExport, params, '开单退货单报表', function () {

+ 6 - 1
src/views/reportData/salesAmountReport/list.vue

@@ -131,6 +131,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -140,17 +142,19 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
 import subarea from '@/views/common/subarea.js'
+import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesBillReportGroupByBuyerList, salesBillReportCount } from '@/api/salesBillReport'
 import { salesAmountExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, subarea, custList },
+  components: { STable, VSelect, rangeDate, subarea, custList, reportModal },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
+      showExport: false,
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime,
@@ -392,6 +396,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(salesAmountExport, params, '开单销售报表', function () {

+ 6 - 1
src/views/reportData/salesDetails/list.vue

@@ -155,6 +155,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -164,6 +166,7 @@ import { STable, VSelect } from '@/components'
 import rangeDateTime from '@/views/common/rangeDateTime.vue'
 import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
+import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQuery } from '@/api/productType'
@@ -171,12 +174,13 @@ import ProductBrand from '@/views/common/productBrand.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesBillDetailList, reportSalesBillDetailCount, reportSalesBillDetailExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDateTime, custList, subarea, ProductBrand },
+  components: { STable, VSelect, rangeDateTime, custList, subarea, ProductBrand, reportModal },
   data () {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
+      showExport: false,
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime + ' 00:00:00',
@@ -348,6 +352,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportSalesBillDetailExport, params, '销售明细(开单统计)报表', function () {

+ 6 - 1
src/views/reportData/salesOrderTotal/list.vue

@@ -119,6 +119,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -128,17 +130,19 @@ import { STable, VSelect } from '@/components'
 import rangeDateTime from '@/views/common/rangeDateTime.vue'
 import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
+import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { userQueryList } from '@/api/power-user'
 import { reportSalesBillList, reportSalesBillCount, reportSalesBillExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDateTime, custList, subarea },
+  components: { STable, VSelect, rangeDateTime, custList, subarea, reportModal },
   data () {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
+      showExport: false,
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime + ' 00:00:00',
@@ -292,6 +296,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportSalesBillExport, params, '销售(开单统计)报表', function () {

+ 6 - 1
src/views/reportData/salesPresentation/list.vue

@@ -136,6 +136,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -144,15 +146,17 @@ import { STable, VSelect } from '@/components'
 import rangeDateTime from '@/views/common/rangeDateTime.vue'
 import custList from '@/views/common/custList.vue'
 import subarea from '@/views/common/subarea.js'
+import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportDispatchReportList, reportDispatchReportCount, reportDispatchReportExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDateTime, subarea, custList },
+  components: { STable, VSelect, rangeDateTime, subarea, custList, reportModal },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
+      showExport: false,
       queryParam: { //  查询条件
         time: [],
         beginDate: '',
@@ -391,6 +395,7 @@ export default {
         if (valid) {
           const params = _this.queryParam
           delete params.time
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportDispatchReportExport, params, '销售交单报表', function () {

+ 6 - 1
src/views/reportData/salesReturnDetailReport/list.vue

@@ -158,6 +158,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -167,6 +169,7 @@ import { STable, VSelect } from '@/components'
 import rangeDateTime from '@/views/common/rangeDateTime.vue'
 import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
+import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQuery } from '@/api/productType'
@@ -174,12 +177,13 @@ import ProductBrand from '@/views/common/productBrand.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesReturnDetailList, reportSalesReturnDetailCount, reportSalesReturnDetailExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDateTime, custList, subarea, ProductBrand },
+  components: { STable, VSelect, rangeDateTime, custList, subarea, ProductBrand, reportModal },
   data () {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
+      showExport: false,
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime,
@@ -361,6 +365,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportSalesReturnDetailExport, params, '销售退货明细报表', function () {

+ 6 - 1
src/views/reportData/salesReturnReport/list.vue

@@ -131,6 +131,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -139,18 +141,20 @@ import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
+import reportModal from '@/views/common/reportModal.vue'
 import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesReportReturnRebateList, salesReportReturnRebateCount, salesReturnExport } from '@/api/reportData'
 
 export default {
-  components: { STable, VSelect, custList, subarea, rangeDate },
+  components: { STable, VSelect, custList, subarea, rangeDate, reportModal },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
+      showExport: false,
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime,
@@ -390,6 +394,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(salesReturnExport, params, '实售退货报表', function () {

+ 6 - 1
src/views/reportData/salesReturnsReport/list.vue

@@ -121,6 +121,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -130,17 +132,19 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
+import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesReturnList, reportSalesReturnCount, salesReturnsExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, subarea, custList },
+  components: { STable, VSelect, rangeDate, subarea, custList, reportModal },
   data () {
     return {
       spinning: false,
       exportLoading: false,
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
+      showExport: false,
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime,
@@ -226,6 +230,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(salesReturnsExport, params, '销售退货单报表', function () {

+ 6 - 1
src/views/reportData/salesSlipReport/list.vue

@@ -136,6 +136,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -145,17 +147,19 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
 import subarea from '@/views/common/subarea.js'
+import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesBillReportList, salesBillReportCount } from '@/api/salesBillReport'
 import { salesSlipExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, subarea, custList },
+  components: { STable, VSelect, rangeDate, subarea, custList, reportModal },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
+      showExport: false,
       queryParam: { //  查询条件
         time: [
           getDate.getCurrMonthDays().starttime,
@@ -397,6 +401,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(salesSlipExport, params, '开单销售单报表', function () {

+ 6 - 1
src/views/reportData/warehousingOrder/list.vue

@@ -94,6 +94,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -101,14 +103,16 @@
 import { STable, VSelect } from '@/components'
 import rangeDateTime from '@/views/common/rangeDateTime.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
+import reportModal from '@/views/common/reportModal.vue'
 import { reportStockPutList, reportStockPutCount, reportStockPutExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDateTime },
+  components: { STable, VSelect, rangeDateTime, reportModal },
   data () {
     return {
       spinning: false,
       advanced: false,
       tableHeight: 0,
+      showExport: false,
       queryParam: { //  查询条件
         time: [],
         beginDate: '',
@@ -217,6 +221,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = _this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportStockPutExport, params, '入库单报表', function () {

+ 6 - 1
src/views/reportData/warehousingOrderDetail/list.vue

@@ -109,6 +109,8 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
@@ -116,14 +118,16 @@
 import { STable, VSelect } from '@/components'
 import rangeDateTime from '@/views/common/rangeDateTime.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
+import reportModal from '@/views/common/reportModal.vue'
 import { reportStockPutDetailList, reportStockPutDetailCount, reportStockPutDetailExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDateTime },
+  components: { STable, VSelect, rangeDateTime, reportModal },
   data () {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
+      showExport: false,
       queryParam: { //  查询条件
         time: [],
         beginDate: '',
@@ -242,6 +246,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = this.queryParam
+          _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
           hdExportExcel(reportStockPutDetailExport, params, '入库单明细报表', function () {