Prechádzať zdrojové kódy

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

chenrui 2 mesiacov pred
rodič
commit
0d2bff9018

+ 2 - 7
src/views/reportData/regionTypeBusinessReport/list.vue

@@ -76,8 +76,6 @@
         </s-table>
       </a-spin>
     </a-card>
-    <!-- 导出提示框 -->
-    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </div>
 </template>
 
@@ -88,7 +86,6 @@ import moment from 'moment'
 // 组件
 import { STable, VSelect } from '@/components'
 import Area from '@/views/common/area.js'
-import reportModal from '@/views/common/reportModal.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import getDate from '@/libs/getDate'
 // 接口
@@ -96,7 +93,7 @@ import { manageAnalysisReportQuery, manageAnalysisReportExport } from '@/api/rep
 export default {
   name: 'RegionTypeBusinessReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, Area, dealerSubareaScopeList, reportModal },
+  components: { STable, VSelect, Area, dealerSubareaScopeList },
   data () {
     return {
       spinning: false,
@@ -104,7 +101,6 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       exportLoading: false, // 导出按钮加载状态
-      showExport: false, // 导出弹窗
       monthVal: moment().format('YYYY-MM'), // 初始化月份值
       //  查询条件
       queryParam: {
@@ -239,8 +235,7 @@ export default {
       const params = JSON.parse(JSON.stringify(_this.queryParam))
       _this.exportLoading = true
       _this.spinning = true
-      _this.showExport = true
-      hdExportExcel(manageAnalysisReportExport, params, '各品类经营分析表-' + this.monthVal, function () {
+      hdExportExcel(manageAnalysisReportExport, params, '各品类经营分析表-' + this.monthVal + '-', function () {
         _this.exportLoading = false
         _this.spinning = false
       })