Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp

This commit is contained in:
franky-hw
2022-05-31 23:54:54 +08:00
8 changed files with 20 additions and 124 deletions

View File

@ -29,12 +29,6 @@
v-hasPermi="['market:banner:create']">新增
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"-->
<!-- :loading="exportLoading"-->
<!-- v-hasPermi="['market:banner:export']">导出-->
<!-- </el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -258,23 +252,6 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
// 处理查询参数
let params = {...this.queryParams};
params.pageNo = undefined;
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有Banner数据项?').then(() => {
this.exportLoading = true;
return exportBannerExcel(params);
}).then(response => {
this.$download.excel(response, "Banner.xls");
this.exportLoading = false;
}).catch(() => {
});
}
}
};