Commit 7a99d9fb by 西瓜

Merge branch 'gab_bz' of http://47.92.108.28/changchao/founder_vue into gab_bz

parents 9abe2196 b1079e34
......@@ -384,7 +384,7 @@ export default {
talbehgCount: "", // 合格
tableData: [], //表格数据
propdefaultFormThead: this.cxDefaultFormThead, //表格表头
excelHeader: this.header,
excelHeader: '案件标注',
cz: this.pageFlag,
};
},
......@@ -434,11 +434,12 @@ export default {
filterVal.push(val.prop);
});
esAsjQuery(json).then((res) => {
if (res.data.success === true) {
if (res.status === 200) {
require.ensure([], () => {
const { export_json_to_excel } = require("../utils/Export2Excel");
const list = res.data.data.rows;
const list = res.data;
const data = self.formatJson(filterVal, list);
debugger
export_json_to_excel(tHeader, data, self.excelHeader);
});
loading.close();
......@@ -570,7 +571,7 @@ export default {
debugger;
self.tableData = response.data;
self.tableDataLength = response.count;
self.tPage = Math.ceil(response.data.data.total / self.page_size);
self.tPage = Math.ceil(response.count / self.page_size);
self.closeLoading();
} else {
/*self.$message({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment