diff --git a/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/generate/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/generate/index.vue index 3a4fa3e..77edb4c 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/generate/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/generate/index.vue @@ -249,14 +249,16 @@ + + - + .generate-order-container { - min-height: 100vh; + height: calc(100vh - 60px); background: #f5f7fa; display: flex; flex-direction: column; + overflow: hidden; + margin: 0; + padding: 0; } .page-header { @@ -730,8 +735,7 @@ export default { .main-content { flex: 1; padding: 16px; - padding-bottom: 70px; - overflow-y: auto; + overflow: hidden; } .main-section { @@ -779,21 +783,15 @@ export default { } .page-footer { - position: fixed; - bottom: 0; - left: 0; - right: 0; - background: #fff; - padding: 10px 16px; + padding: 16px 0 0; + border-top: 1px solid #e4e7ed; display: flex; justify-content: flex-end; - gap: 12px; - box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.06); - z-index: 100; + gap: 16px; } .page-footer el-button { - padding: 6px 20px; + padding: 8px 24px; } /* 产线选择弹窗样式 */ @@ -824,3 +822,12 @@ export default { gap: 16px; } + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/index.vue index a5d2378..d7f6b78 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/index.vue @@ -83,7 +83,7 @@ - + @@ -181,7 +181,6 @@ export default { created() { this.initDictData(); this.initSearchData(); - this.initData(); }, watch: { '$route.query.refresh': function(newVal) {