8a99327b by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 5a669229 c70eb0e5
......@@ -53,11 +53,9 @@
},
watch: {
isShow (newValue) {
this.editItem = this.loadViewFn(this.editItem)
document.body.appendChild(this.$el);
this.$nextTick(() => {
// this.editItem = this.loadViewFn(this.editItem)
// document.body.appendChild(this.$el);
this.editItem = this.loadViewFn(this.editItem)
document.body.appendChild(this.$el);
this.myShow = newValue
})
}
......
......@@ -8,6 +8,7 @@
margin: 0 auto;
display: flex;
flex-wrap: wrap;
height: 100%;
.title {
width: 100%;
......@@ -259,7 +260,8 @@
.rollTable {
margin-top: -2px;
display: block;
height: calc(100vh - 185px);
height: 100%;
// height: calc(100vh - 185px);
overflow-y: scroll;
margin-left: 2px;
}
......
......@@ -8,6 +8,7 @@
margin: 0 auto;
display: flex;
flex-wrap: wrap;
height: 100%;
.title {
width: 100%;
......@@ -258,7 +259,8 @@
.rollTable {
margin-top: -2px;
display: block;
height: calc(100vh - 185px);
height: calc(100% - 60px);
// height: calc(100vh - 185px);
overflow-y: scroll;
margin-left: 2px;
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-13 10:37:29
* @LastEditTime: 2023-10-13 13:38:21
-->
<template>
<div>
......@@ -196,7 +196,7 @@
qlxxCol: datas.qlxxCol(),
};
},
mounted () {
created () {
sendThis(this)
this.init()
},
......