Commit 0af2f345 authored by “yiyousong”'s avatar “yiyousong”

fix: 修复取件记录报表操作人身份显示错误的问题

parent e0a69496
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
:loading="loading" :loading="loading"
:scroll="{ :scroll="{
x: 1500, x: 1500,
y: 460, y: 490,
}" }"
:row-selection="{ :row-selection="{
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,
...@@ -40,7 +40,7 @@ const tHeader = [ ...@@ -40,7 +40,7 @@ const tHeader = [
"箱号", "箱号",
"联系电话", "联系电话",
"取件时间", "取件时间",
"邮递员", "操作人身份",
"存件时间", "存件时间",
]; // 导出的表头名信息 ]; // 导出的表头名信息
const filterVal = [ const filterVal = [
...@@ -51,9 +51,14 @@ const filterVal = [ ...@@ -51,9 +51,14 @@ const filterVal = [
"boxNo", "boxNo",
"phone", "phone",
"update_time", "update_time",
"courier", "userType",
"create_time", "create_time",
]; // 导出的表头字段名,需要导出表格字段名 ]; // 导出的表头字段名,需要导出表格字段名
let userType = {
1: "用户",
2: "管理员",
3: "邮递员",
};
export default { export default {
components: {}, components: {},
data() { data() {
...@@ -122,9 +127,11 @@ export default { ...@@ -122,9 +127,11 @@ export default {
}, },
{ {
title: "操作人身份", title: "操作人身份",
dataIndex: "courier", dataIndex: "userType",
width: 150, width: 150,
customRender: (text) => text || "--", customRender: (text) => {
return this.userType[text];
},
}, },
{ {
title: "存件时间", title: "存件时间",
...@@ -136,6 +143,7 @@ export default { ...@@ -136,6 +143,7 @@ export default {
return { return {
baseurl: process.env.VUE_APP_API_PHP_URL, baseurl: process.env.VUE_APP_API_PHP_URL,
siteId: storage.get(2, "siteId"), siteId: storage.get(2, "siteId"),
userType,
columns, columns,
tHeader, tHeader,
filterVal, filterVal,
...@@ -242,11 +250,8 @@ export default { ...@@ -242,11 +250,8 @@ export default {
// 深度克隆避免影响页面表格展示 // 深度克隆避免影响页面表格展示
let data = this.$_.cloneDeep(this.excelData); let data = this.$_.cloneDeep(this.excelData);
for (let item of data) { for (let item of data) {
Object.keys(obj).forEach((key) => { item.type = obj[item.type];
if (item.type == key) { item.userType = this.userType[item.userType];
item.type = obj[key];
}
});
} }
export2Excel( export2Excel(
this.tHeader, this.tHeader,
...@@ -261,11 +266,8 @@ export default { ...@@ -261,11 +266,8 @@ export default {
return; return;
} }
for (let item of data) { for (let item of data) {
Object.keys(obj).forEach((key) => { item.type = obj[item.type];
if (item.type == key) { item.userType = this.userType[item.userType];
item.type = obj[key];
}
});
} }
export2Excel( export2Excel(
this.tHeader, this.tHeader,
......
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