Commit 48522474 authored by honghy's avatar honghy Committed by wux

bug157【(生产)订单-列表】点击<显示搜索>按钮,输入筛选条件,再点击<隐藏搜索>时,列表可展示数据变少

parent c8faecdc
......@@ -910,6 +910,12 @@ export default {
}
},
computed: {
isMobile() {
const userAgent = navigator.userAgent || navigator.vendor || window.opera;
// 匹配常见的移动设备标识
const mobileIdentifiers = ['Android', 'webOS', 'iPhone', 'iPad', 'iPod', 'BlackBerry', 'Windows Phone'];
return mobileIdentifiers.some(identifier => userAgent.includes(identifier));
},
path() {
return this.$route.path
},
......@@ -1538,17 +1544,19 @@ export default {
},
//表格高度自适应
getHeight() {
this.$refs.multipleTable.doLayout()
let getHeightFromBottom = (element, variableHeight) => {
const elementRect = element.getBoundingClientRect().top;
const windowHeight = document.documentElement.clientHeight;
const elementHeightFromBottom = windowHeight - elementRect;
const result = elementHeightFromBottom - variableHeight;
return result;
if(!this.isMobile) {
this.$refs.multipleTable.doLayout()
let getHeightFromBottom = (element, variableHeight) => {
const elementRect = element.getBoundingClientRect().top;
const windowHeight = document.documentElement.clientHeight;
const elementHeightFromBottom = windowHeight - elementRect;
const result = elementHeightFromBottom - variableHeight;
return result;
}
const element = document.getElementById('dataTable');
const variableHeight = 70; // 给定的变量高度 一般留于分页器高度
this.autoHeight =getHeightFromBottom(element, variableHeight);
}
const element = document.getElementById('dataTable');
const variableHeight = 70; // 给定的变量高度 一般留于分页器高度
this.autoHeight =getHeightFromBottom(element, variableHeight) ;
},
}
}
......
......@@ -444,6 +444,12 @@ export default {
CustomerSetting
},
computed: {
isMobile() {
const userAgent = navigator.userAgent || navigator.vendor || window.opera;
// 匹配常见的移动设备标识
const mobileIdentifiers = ['Android', 'webOS', 'iPhone', 'iPad', 'iPod', 'BlackBerry', 'Windows Phone'];
return mobileIdentifiers.some(identifier => userAgent.includes(identifier));
},
isChinese() {
return this.$i18n.locale === "zh_CN"
},
......@@ -975,17 +981,19 @@ export default {
},
//表格高度自适应
getHeight() {
this.$refs.multipleTable.doLayout()
let getHeightFromBottom = (element, variableHeight) => {
const elementRect = element.getBoundingClientRect().top;
const windowHeight = document.documentElement.clientHeight;
const elementHeightFromBottom = windowHeight - elementRect;
const result = elementHeightFromBottom - variableHeight;
return result;
if(!this.isMobile) {
this.$refs.multipleTable.doLayout()
let getHeightFromBottom = (element, variableHeight) => {
const elementRect = element.getBoundingClientRect().top;
const windowHeight = document.documentElement.clientHeight;
const elementHeightFromBottom = windowHeight - elementRect;
const result = elementHeightFromBottom - variableHeight;
return result;
}
const element = document.getElementById('dataTable');
const variableHeight = 70; // 给定的变量高度 一般留于分页器高度
this.autoHeight =getHeightFromBottom(element, variableHeight);
}
const element = document.getElementById('dataTable');
const variableHeight = 70; // 给定的变量高度 一般留于分页器高度
this.autoHeight =getHeightFromBottom(element, variableHeight) ;
},
},
watch: {
......
......@@ -703,6 +703,12 @@ export default {
}
},
computed: {
isMobile() {
const userAgent = navigator.userAgent || navigator.vendor || window.opera;
// 匹配常见的移动设备标识
const mobileIdentifiers = ['Android', 'webOS', 'iPhone', 'iPad', 'iPod', 'BlackBerry', 'Windows Phone'];
return mobileIdentifiers.some(identifier => userAgent.includes(identifier));
},
isChinese() {
return this.$i18n.locale === "zh_CN";
},
......@@ -1078,17 +1084,19 @@ export default {
},
//表格高度自适应
getHeight() {
this.$refs.multipleTable.doLayout()
let getHeightFromBottom = (element, variableHeight) => {
const elementRect = element.getBoundingClientRect().top;
const windowHeight = document.documentElement.clientHeight;
const elementHeightFromBottom = windowHeight - elementRect;
const result = elementHeightFromBottom - variableHeight;
return result;
if(!this.isMobile) {
this.$refs.multipleTable.doLayout()
let getHeightFromBottom = (element, variableHeight) => {
const elementRect = element.getBoundingClientRect().top;
const windowHeight = document.documentElement.clientHeight;
const elementHeightFromBottom = windowHeight - elementRect;
const result = elementHeightFromBottom - variableHeight;
return result;
}
const element = document.getElementById('dataTable');
const variableHeight = 70; // 给定的变量高度 一般留于分页器高度
this.autoHeight =getHeightFromBottom(element, variableHeight);
}
const element = document.getElementById('dataTable');
const variableHeight = 70; // 给定的变量高度 一般留于分页器高度
this.autoHeight =getHeightFromBottom(element, variableHeight) ;
},
},
};
......
......@@ -199,7 +199,7 @@ export default {
nextTime: ["", ""],
customerCreateTime: ["", ""]
},
autoHeight: 500
autoHeight: null
}
},
created() {
......@@ -219,6 +219,12 @@ export default {
// return t.join(":")
// }
// },
isMobile() {
const userAgent = navigator.userAgent || navigator.vendor || window.opera;
// 匹配常见的移动设备标识
const mobileIdentifiers = ['Android', 'webOS', 'iPhone', 'iPad', 'iPod', 'BlackBerry', 'Windows Phone'];
return mobileIdentifiers.some(identifier => userAgent.includes(identifier));
},
isChinese() {
return this.$i18n.locale === "zh_CN"
},
......@@ -338,17 +344,19 @@ export default {
},
//表格高度自适应
getHeight() {
this.$refs.multipleTable.doLayout()
let getHeightFromBottom = (element, variableHeight) => {
const elementRect = element.getBoundingClientRect().top;
const windowHeight = document.documentElement.clientHeight;
const elementHeightFromBottom = windowHeight - elementRect;
const result = elementHeightFromBottom - variableHeight;
return result;
if(!this.isMobile) {
this.$refs.multipleTable.doLayout()
let getHeightFromBottom = (element, variableHeight) => {
const elementRect = element.getBoundingClientRect().top;
const windowHeight = document.documentElement.clientHeight;
const elementHeightFromBottom = windowHeight - elementRect;
const result = elementHeightFromBottom - variableHeight;
return result;
}
const element = document.getElementById('dataTable');
const variableHeight = 70; // 给定的变量高度 一般留于分页器高度
this.autoHeight =getHeightFromBottom(element, variableHeight);
}
const element = document.getElementById('dataTable');
const variableHeight = 70; // 给定的变量高度 一般留于分页器高度
this.autoHeight =getHeightFromBottom(element, variableHeight) ;
},
}
}
......
......@@ -844,7 +844,7 @@ export default {
key: "eqPickRatio",
value: ""
},
autoHeight: 500
autoHeight: null
}
},
watch: {
......@@ -1000,6 +1000,12 @@ export default {
}
},
computed: {
isMobile() {
const userAgent = navigator.userAgent || navigator.vendor || window.opera;
// 匹配常见的移动设备标识
const mobileIdentifiers = ['Android', 'webOS', 'iPhone', 'iPad', 'iPod', 'BlackBerry', 'Windows Phone'];
return mobileIdentifiers.some(identifier => userAgent.includes(identifier));
},
// 导出的权限字符串
exportPermiString() {
let arr = ["ecw:order:export"]
......@@ -1508,17 +1514,19 @@ export default {
},
//表格高度自适应
getHeight() {
this.$refs.dataTable.doLayout()
let getHeightFromBottom = (element, variableHeight) => {
const elementRect = element.getBoundingClientRect().top;
const windowHeight = document.documentElement.clientHeight;
const elementHeightFromBottom = windowHeight - elementRect;
const result = elementHeightFromBottom - variableHeight;
return result;
if(!this.isMobile) {
this.$refs.dataTable.doLayout()
let getHeightFromBottom = (element, variableHeight) => {
const elementRect = element.getBoundingClientRect().top;
const windowHeight = document.documentElement.clientHeight;
const elementHeightFromBottom = windowHeight - elementRect;
const result = elementHeightFromBottom - variableHeight;
return result;
}
const element = document.getElementById('dataTable');
const variableHeight = 70; // 给定的变量高度 一般留于分页器高度
this.autoHeight =getHeightFromBottom(element, variableHeight) ;
}
const element = document.getElementById('dataTable');
const variableHeight = 70; // 给定的变量高度 一般留于分页器高度
this.autoHeight =getHeightFromBottom(element, variableHeight) ;
},
}
}
......
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