Commit 35e953b7 authored by renjintao's avatar renjintao

process

parent ce54ed22
......@@ -76,27 +76,6 @@ export default {
title: this.l("userName"),
align: "left",
easy: true,
high: true,
render: (h, params) => {
return h(
"div", {
class: "action",
},
[
h(
"op", {
attrs: {
oprate: "detail",
},
on: {
click: () => this.detail(params.row.id),
},
},
params.row.userName
),
]
);
},
},
{
key: "cardNo",
......@@ -187,12 +166,6 @@ export default {
hide: true,
align: "left",
},
// {
// key: 'userType',
// title: this.l('userType'),
// hide: true,
// align: 'left'
// },
{
key: "phone",
title: this.l("phone"),
......@@ -320,35 +293,12 @@ export default {
key: "userName",
title: this.l("userName"),
align: "left",
easy: true,
high: true,
render: (h, params) => {
return h(
"div", {
class: "action",
},
[
h(
"op", {
attrs: {
oprate: "detail",
},
on: {
click: () => this.detail(params.row.id),
},
},
params.row.userName
),
]
);
},
},
{
key: "status",
title: this.l("status"),
align: "center",
high: true,
code: "User.base.status",
},
],
......@@ -371,7 +321,6 @@ export default {
rows: 10,
placeholder: "请从Excel复制一段表格数据,粘贴在这里",
},
value: "",
};
},
props: {
......@@ -394,7 +343,12 @@ export default {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight;
this.tdHeightExcel = window.innerHeight - 240;
if (showTablePaste) {
this.tdHeightExcel = window.screenHeight - 240 - 220;
} else {
this.tdHeightExcel = window.screenHeight - 240;
}
})();
};
},
......@@ -638,11 +592,13 @@ export default {
this.ghostStatus = true;
this.showTablePaste = true;
this.btnTxt = "关闭粘贴Excel";
this.tdHeightExcel = window.innerHeight - 180 - 220;
} else {
this.btnType = "default";
this.ghostStatus = false;
this.showTablePaste = false;
this.btnTxt = "打开粘贴Excel";
this.tdHeightExcel = window.innerHeight - 180;
}
},
//粘贴excel成功
......@@ -686,6 +642,7 @@ export default {
this.btnType = "default";
this.ghostStatus = false;
this.load(this.eid);
this.tdHeightExcel = window.innerHeight - 180;
},
openInfoModal() {
if (this.pageType != undefined) {
......@@ -771,13 +728,5 @@ export default {
float: left;
}
}
.demo-split {
border: 1px solid #dcdee2;
}
.demo-split-pane {
padding: 10px;
}
}
</style>
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