Ver Fonte

Merge branch 'develop_export' of jianguan-web/jg-ocs-html into pre-release

李磊 há 3 anos atrás
pai
commit
78d076beed
28 ficheiros alterados com 374 adições e 57 exclusões
  1. 1 1
      public/version.json
  2. 13 0
      src/api/dowloadFile.js
  3. 13 0
      src/components/tools/UserMenu.vue
  4. 10 0
      src/config/router.config.js
  5. 6 4
      src/libs/exportExcel.js
  6. 44 0
      src/views/common/reportModal.vue
  7. 155 0
      src/views/dowloadFile/list.vue
  8. 6 1
      src/views/reportData/actualSalesReport/list.vue
  9. 6 1
      src/views/reportData/allCountryCostReport/list.vue
  10. 6 1
      src/views/reportData/allocationDetails/list.vue
  11. 6 1
      src/views/reportData/allocationPresentation/list.vue
  12. 6 1
      src/views/reportData/billingReturnReport/list.vue
  13. 16 30
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  14. 6 1
      src/views/reportData/priceDifferenceDetailReport/list.vue
  15. 6 1
      src/views/reportData/regionTypeSalesReport/list.vue
  16. 6 1
      src/views/reportData/returnGoodsPresentation/list.vue
  17. 6 1
      src/views/reportData/returnSlipReport/list.vue
  18. 6 1
      src/views/reportData/salesAmountReport/list.vue
  19. 6 1
      src/views/reportData/salesDetails/list.vue
  20. 6 1
      src/views/reportData/salesOrderTotal/list.vue
  21. 6 1
      src/views/reportData/salesPresentation/list.vue
  22. 6 1
      src/views/reportData/salesReturnDetailReport/list.vue
  23. 6 1
      src/views/reportData/salesReturnReport/list.vue
  24. 6 1
      src/views/reportData/salesReturnsReport/list.vue
  25. 6 1
      src/views/reportData/salesSlipReport/list.vue
  26. 6 1
      src/views/reportData/warehousingOrder/list.vue
  27. 6 1
      src/views/reportData/warehousingOrderDetail/list.vue
  28. 2 3
      vue.config.js

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "1.0.5",
+    "version": "1.0.8",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 13 - 0
src/api/dowloadFile.js

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

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

@@ -1,6 +1,9 @@
 <template>
   <div class="user-wrapper">
     <div class="content-box">
+      <span @click="toPage" class="box-down">
+        <a-icon type="vertical-align-bottom" style="font-size: 16px; padding: 0 5px" />下载中心
+      </span>
       <notice-icon class="action"/>
       <!-- <a href="https://pro.loacg.com/docs/getting-started" target="_blank">
         <span class="action">
@@ -67,6 +70,11 @@ export default {
   },
   methods: {
     ...mapActions(['Logout']),
+    toPage () {
+    	this.$router.push({
+    		path: '/dowloadFile'
+    	})
+    },
     handleLogout () {
       this.$confirm({
         title: '提示',
@@ -100,3 +108,8 @@ export default {
   }
 }
 </script>
+<style>
+	.box-down{
+		cursor: pointer;
+	}
+</style>

+ 10 - 0
src/config/router.config.js

@@ -2353,6 +2353,16 @@ export const asyncRouterMap = [
           icon: 'bell'
         },
         hidden: true
+      },
+      {
+        path: '/dowloadFile',
+        name: 'dowloadFile',
+        component: () => import(/* webpackChunkName: "home" */ '@/views/dowloadFile/list'),
+        meta: {
+          title: '下载中心',
+          icon: 'bell'
+        },
+        hidden: true
       }
     ]
   },

+ 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>

+ 155 - 0
src/views/dowloadFile/list.vue

@@ -0,0 +1,155 @@
+<template>
+  <a-card size="small" :bordered="false" class="noticeManagementList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeDate" @change="dateChange" />
+              </a-form-item>
+            </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-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>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="noticeManagementList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="noticeManagementList-reset">重置</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 总计 -->
+      <a-alert type="info" style="margin-bottom:10px">
+        <div slot="message">注意:所有文件只保留7天,超过7天后,状态变为过期,不能下载</div>
+      </a-alert>
+      <!-- 列表 -->
+      <s-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ y: tableHeight }"
+        :defaultLoadData="true"
+        bordered>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text, record">
+          <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>
+  </a-card>
+</template>
+
+<script>
+import { STable, VSelect } from '@/components'
+import { taskList } from '@/api/dowloadFile'
+import rangeDate from '@/views/common/rangeDate.vue'
+export default {
+  components: { STable, VSelect, rangeDate },
+  data () {
+    return {
+      spinning: false,
+      tableHeight: 0,
+      queryParam: { //  查询条件
+        beginDate: '',
+        endDate: '',
+        fileName: '',
+        taskState: undefined
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      columns: [
+        { 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 => {
+        this.disabled = true
+        this.spinning = true
+        return taskList(Object.assign(parameter, this.queryParam)).then(res => {
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.total = data.count || 0
+            this.disabled = false
+          }
+          this.spinning = false
+          return data
+        })
+      },
+      total: 0, // 合计
+      openModal: false, //  编辑  弹框
+      openDetailModal: false, //  详情  弹框
+      itemId: '' //  当前产品id
+    }
+  },
+  methods: {
+    //  时间  change
+    dateChange (date) {
+      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
+      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.beginDate = null
+      this.queryParam.endDate = null
+      this.queryParam.fileName = ''
+      this.queryParam.type = undefined
+      this.queryParam.taskState = undefined
+      this.$refs.table.refresh(true)
+    },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 235
+    }
+  },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+      this.resetSearchForm()
+    }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
+  }
+}
+</script>

+ 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 () {

+ 16 - 30
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -121,26 +121,30 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 导出提示框 -->
+    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
 </template>
 
 <script>
-import moment from 'moment'
 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 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 { hdExportExcel } from '@/libs/exportExcel'
 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,
@@ -241,39 +245,21 @@ export default {
     //  导出
     handleExport () {
       const _this = this
-      const params = this.queryParam
-      this.exportLoading = true
-      _this.spinning = true
-      headRebateDetailReportExport(params).then(res => {
-        this.exportLoading = false
-        _this.spinning = false
-        if (res.type == 'application/json') {
-          var reader = new FileReader()
-          reader.addEventListener('loadend', function () {
-            const obj = JSON.parse(reader.result)
-            _this.$notification.error({
-              message: '提示',
-              description: obj.message
-            })
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const params = _this.queryParam
+          _this.showExport = true
+          _this.exportLoading = true
+          _this.spinning = true
+          hdExportExcel(headRebateDetailReportExport, params, '总部差价明细报表', function () {
+            _this.exportLoading = false
+            _this.spinning = false
           })
-          reader.readAsText(res)
         } else {
-          this.download(res)
+          return false
         }
       })
     },
-    download (data) {
-      if (!data) { return }
-      const url = window.URL.createObjectURL(new Blob([data]))
-      const link = document.createElement('a')
-      link.style.display = 'none'
-      link.href = url
-      const a = moment().format('YYYYMMDDHHmmss')
-      const fname = '总部差价明细报表' + a
-      link.setAttribute('download', fname + '.xlsx')
-      document.body.appendChild(link)
-      link.click()
-    },
     // 盘点库存日期
     handleStock () {
       this.$message.info('无盘点区间的起始/终止时间,请自行选择日期区间查询!')

+ 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 () {

+ 2 - 3
vue.config.js

@@ -108,10 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.155:8602/ocs-admin',
+        // target: 'http://192.168.16.155:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  Á·Ï°
-        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
-        // target: 'http://ocs-admin.360arrow.com/ocs-admin', //  Éú²ú
+        target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         ws: false,
         changeOrigin: true,
         pathRewrite: {