diff --git a/ruoyi-ui/src/directive/dialog/dragDialog.js b/ruoyi-ui/src/directive/dialog/dragDialog.js
index 8f136a3..37d24ae 100644
--- a/ruoyi-ui/src/directive/dialog/dragDialog.js
+++ b/ruoyi-ui/src/directive/dialog/dragDialog.js
@@ -3,9 +3,9 @@ export default {
let resizeEvent = new CustomEvent('drag-resize',{detail:'尺寸变化',bubbles:false});
//初始化不最大化
el.fullscreen = false;
- // 弹框可拉伸最小宽高
- const minWidth = 1100
- const minHeight = 570
+ //弹框可拉伸最小宽高
+ let minWidth = 400;
+ let minHeight = 300;
//当前宽高
let nowWidth = minWidth;
let nowHight = minHeight;
@@ -16,10 +16,7 @@ export default {
let hasSetBodyHight = false;
//弹窗
const dragDom = el.querySelector('.el-dialog');
- el.style.overflow='initial'
dragDom.className += ' el-drag-dialog';
- // 给弹窗加上overflow auto；不然缩小时框内的标签可能超出dialog；
- dragDom.style.overflow = 'auto'
//清除选择头部文字效果
dialogHeaderEl.onselectstart = new Function("return false");
//头部加上可拖动cursor
@@ -82,13 +79,14 @@ export default {
i.classList.add('el-icon-full-screen');
maxMin.innerHTML = '';
maxMin.title = '最大化';
- dragDom.style.height = nowHight + 'px';
+ dragDom.style.height = "auto";
dragDom.style.width = nowWidth + 'px';
- dragDom.style.marginTop = window.innerHeight*0.07+'px';
+ dragDom.style.marginTop = nowMarginTop;
el.fullscreen = false;
dialogHeaderEl.style.cursor = 'move';
dialogHeaderEl.onmousedown = moveDown;
- //dragDom.querySelector('.el-dialog__body').style.height = bodyHeight;
+ dragDom.querySelector('.el-dialog__body').style.height = bodyHeight;
+ dragDom.querySelector('.el-dialog__body').style.maxHeight = dragDom.style.height
hasSetBodyHight = false;
} else {
let i = maxMin.querySelector('.el-icon-full-screen');
@@ -101,17 +99,17 @@ export default {
nowMarginTop = dragDom.style.marginTop;
dragDom.style.left = 0;
dragDom.style.top = 0;
- dragDom.style.height = window.innerHeight + 'px'
+ dragDom.style.height = "94VH";
dragDom.style.width = "100VW";
dragDom.style.marginTop = 0;
el.fullscreen = true;
dialogHeaderEl.style.cursor = 'initial';
dialogHeaderEl.onmousedown = null;
if (!hasSetBodyHight) {
- const footerHeight = dragDom.querySelector('.el-dialog__footer') && dragDom.querySelector('.el-dialog__footer').offsetHeight
- dragDom.querySelector('.el-dialog__body').style.height =
- 'calc(100vh - 180px)'
- hasSetBodyHight = true
+ let footerHeight = dragDom.querySelector('.el-dialog__footer') && dragDom.querySelector('.el-dialog__footer').offsetHeight;
+ dragDom.querySelector('.el-dialog__body').style.height = 'calc(100% - ' + (dialogHeaderEl.offsetHeight + footerHeight) + 'px)';
+ dragDom.querySelector('.el-dialog__body').style.maxHeight = dragDom.style.height
+ hasSetBodyHight = true;
}
}
el.dispatchEvent(resizeEvent);
diff --git a/ruoyi-ui/src/views/customer/customer/index.vue b/ruoyi-ui/src/views/customer/customer/index.vue
index a349ec3..5d9d03f 100644
--- a/ruoyi-ui/src/views/customer/customer/index.vue
+++ b/ruoyi-ui/src/views/customer/customer/index.vue
@@ -149,9 +149,150 @@
/>
-
+
-
+ 客户信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ –>
@@ -448,8 +589,163 @@
-
+ -->
+
+ 银行信息
+
+
+
+ 添加
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 销售数据
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+