Commit 2f149ca3 authored by youjie's avatar youjie

no message

parent 5a123c67
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
.productQuerybottomLayer { .productQuerybottomLayer {
overflow: auto; overflow: auto;
position: fixed; position: fixed;
max-height: 300px; /* max-height: 300px; */
z-index: 50; z-index: 50;
bottom: 0; bottom: 0;
left: 50px; left: 50px;
...@@ -1258,7 +1258,9 @@ ...@@ -1258,7 +1258,9 @@
</el-form> </el-form>
</div> </div>
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayer"> <div class="productQuerybottomLayer ownScrollbarStyle"
:style="{'height':ScreenHeight}"
v-show="isShowLayer">
<p> <p>
{{ $t("pub.updateMsg") }} {{ $t("pub.updateMsg") }}
<span class="fr" style="margin-right: 60px"> <span class="fr" style="margin-right: 60px">
...@@ -1742,7 +1744,9 @@ ...@@ -1742,7 +1744,9 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayerRemarks" <div class="productQuerybottomLayer ownScrollbarStyle"
:style="{'height':ScreenHeight}"
v-show="isShowLayerRemarks"
style="height: 150px; min-height: 150px"> style="height: 150px; min-height: 150px">
<p> <p>
{{ $t("salesModule.UpRemarks") }} {{ $t("salesModule.UpRemarks") }}
...@@ -3899,6 +3903,9 @@ ...@@ -3899,6 +3903,9 @@
export default { export default {
data() { data() {
return { return {
timer:false,
fullHeight: document.documentElement.clientHeight,
ScreenHeight:0,
S_UpdateOrderMoney: false, S_UpdateOrderMoney: false,
isShowTip: false, isShowTip: false,
TipObj: {}, TipObj: {},
...@@ -6779,6 +6786,18 @@ ...@@ -6779,6 +6786,18 @@
}, },
}, },
mounted() { mounted() {
const that = this
window.onresize = () => {
return (() => {
window.fullHeight = document.documentElement.clientHeight
that.fullHeight = window.fullHeight
})()
}
if(this.fullHeight>700){
this.ScreenHeight= '600px'
}else{
this.ScreenHeight= '300px'
}
this.GetSupperOrderEditAuth(); this.GetSupperOrderEditAuth();
this.GetAuth(); this.GetAuth();
this.GetEditOrderCreateByAuth(); this.GetEditOrderCreateByAuth();
...@@ -6820,6 +6839,23 @@ ...@@ -6820,6 +6839,23 @@
this.getDownList(); this.getDownList();
this.getDownListGN(); this.getDownListGN();
}, },
watch: {
fullHeight (val) {
if(!this.timer) {
this.fullHeight = val
this.timer = true
let that = this
setTimeout(function (){
that.timer = false
},400)
}
if(this.fullHeight>700){
this.ScreenHeight= '600px'
}else{
this.ScreenHeight= '300px'
}
},
},
}; };
</script> </script>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
bottom: 0; bottom: 0;
z-index: 2; z-index: 2;
overflow: auto; overflow: auto;
max-height: 300px; /* max-height: 300px; */
border-top: 3px solid #38425d; border-top: 3px solid #38425d;
background-color: #ffffff; background-color: #ffffff;
padding: 10px 10px 0; padding: 10px 10px 0;
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
} }
</style> </style>
<template> <template>
<div class="commonOrderForm"> <div class="commonOrderForm" :style="{'height':ScreenHeight}">
<p class="title"> <p class="title">
{{ $t("salesModule.SignImdi") }} {{ $t("salesModule.SignImdi") }}
<span v-if="crmOrderObj"> <span v-if="crmOrderObj">
...@@ -505,6 +505,9 @@ ...@@ -505,6 +505,9 @@
], ],
data() { data() {
return { return {
timer:false,
fullHeight: document.documentElement.clientHeight,
ScreenHeight:0,
pickerOptions0: { pickerOptions0: {
disabledDate: (time) => { disabledDate: (time) => {
let starTime = new Date(this.starTime); let starTime = new Date(this.starTime);
...@@ -1786,6 +1789,18 @@ ...@@ -1786,6 +1789,18 @@
} }
}, },
mounted() { mounted() {
const that = this
window.onresize = () => {
return (() => {
window.fullHeight = document.documentElement.clientHeight
that.fullHeight = window.fullHeight
})()
}
if(this.fullHeight>700){
this.ScreenHeight= '600px'
}else{
this.ScreenHeight= '300px'
}
this.CurrentUserInfo = this.getLocalStorage(); this.CurrentUserInfo = this.getLocalStorage();
//获取客户类型 //获取客户类型
this.getCustomerType(); this.getCustomerType();
...@@ -1806,6 +1821,21 @@ ...@@ -1806,6 +1821,21 @@
this.getTradeWay(); this.getTradeWay();
}, },
watch: { watch: {
fullHeight (val) {
if(!this.timer) {
this.fullHeight = val
this.timer = true
let that = this
setTimeout(function (){
that.timer = false
},400)
}
if(this.fullHeight>700){
this.ScreenHeight= '600px'
}else{
this.ScreenHeight= '300px'
}
},
productObj:{ productObj:{
handler(oldValue, newVal){ handler(oldValue, newVal){
this.clearMsg(); this.clearMsg();
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
bottom: 0; bottom: 0;
z-index: 2; z-index: 2;
overflow: auto; overflow: auto;
max-height: 300px; /* max-height: 300px; */
border-top: 3px solid #38425d; border-top: 3px solid #38425d;
background-color: #ffffff; background-color: #ffffff;
padding: 10px 10px 0; padding: 10px 10px 0;
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</style> </style>
<template> <template>
<div class="commonOrderForm"> <div class="commonOrderForm" :style="{'height':ScreenHeight}">
<p class="title"> <p class="title">
{{ $t("salesModule.SignImdi") }} {{ $t("salesModule.SignImdi") }}
<span v-if="crmOrderObj"> <span v-if="crmOrderObj">
...@@ -673,6 +673,9 @@ ...@@ -673,6 +673,9 @@
], ],
data() { data() {
return { return {
timer:false,
fullHeight: document.documentElement.clientHeight,
ScreenHeight:0,
pickerOptions0: { pickerOptions0: {
disabledDate: (time) => { disabledDate: (time) => {
let starTime = new Date(this.starTime); let starTime = new Date(this.starTime);
...@@ -2114,6 +2117,18 @@ ...@@ -2114,6 +2117,18 @@
} }
}, },
mounted() { mounted() {
const that = this
window.onresize = () => {
return (() => {
window.fullHeight = document.documentElement.clientHeight
that.fullHeight = window.fullHeight
})()
}
if(this.fullHeight>700){
this.ScreenHeight= '600px'
}else{
this.ScreenHeight= '300px'
}
this.CurrentUserInfo = this.getLocalStorage(); this.CurrentUserInfo = this.getLocalStorage();
this.getCustomerType();//获取客户类型 this.getCustomerType();//获取客户类型
this.getMinPrice(this.productObj.LineID)// 当前线路报价 this.getMinPrice(this.productObj.LineID)// 当前线路报价
...@@ -2128,6 +2143,21 @@ ...@@ -2128,6 +2143,21 @@
this.getCountry()//获取国家 this.getCountry()//获取国家
}, },
watch: { watch: {
fullHeight (val) {
if(!this.timer) {
this.fullHeight = val
this.timer = true
let that = this
setTimeout(function (){
that.timer = false
},400)
}
if(this.fullHeight>700){
this.ScreenHeight= '600px'
}else{
this.ScreenHeight= '300px'
}
},
productObj: { productObj: {
handler(oldValue, newVal) { handler(oldValue, newVal) {
this.clearMsg(); this.clearMsg();
......
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