From fdb0ee0ed59c22e4dfe47814bd6f1bc909053320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?= <8702040+cai-ling@user.noreply.gitee.com> Date: Tue, 3 Dec 2024 13:37:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E6=94=B6=E8=B4=A7=E7=A1=AE=E8=AE=A4=E5=85=A8?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.css | 17 +++++++---------- common/style/reset.css | 2 +- pages/management/alloc-maintenance_new.vue | 3 +-- pages/management/check.vue | 3 +-- pages/management/in-storage_new.vue | 5 ++--- pages/management/move-inventory.vue | 3 +-- pages/management/receive-confirm_new.vue | 4 ++-- 7 files changed, 15 insertions(+), 22 deletions(-) diff --git a/common/style/layout.css b/common/style/layout.css index ce61430..b8ed233 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -1,12 +1,10 @@ /** 平板尺寸960*600 **/ page { background-color: #0a2b57 !important; - min-height: 100% !important; height: 100% !important; } uni-page-body { background-color: #0a2b57 !important; - min-height: 100% !important; height: 100% !important; } uni-button:after { @@ -29,8 +27,8 @@ uni-toast .uni-toast { .content{ width: 100%; - min-height: 100%; - background: top center / 100% auto url(./static/images/page_bg.jpg) repeat-y; + height: 100%; + background: top center / 100% 100% url(./static/images/page_bg.jpg) repeat-y; /* background-color: #040d1e; */ } .footer{ @@ -39,7 +37,7 @@ uni-toast .uni-toast { } .search-confirm-wrap { width: calc(100% - 20px); - margin: 10px auto 0 auto; + margin: 10px auto; border-radius: 6px; padding: 10px; background-color: rgba(1, 114, 195, 40%); @@ -126,9 +124,9 @@ uni-toast .uni-toast { } .grid-wrap{ width: calc(100% - 20px); - min-height: calc(100vh - 145px); + height: calc(100% - 112px); margin: 0 auto; - padding: 10px 0; + padding: 4px 0; border: 1px solid #01c2f3; border-radius: 4px; background-color: rgba(1, 114, 195, 40%); @@ -137,9 +135,8 @@ uni-toast .uni-toast { .zdrow-wrap { width: 100%; padding: 0 10px; - /* height: calc(100% - 53px); */ - /* overflow-y: scroll; */ - /* margin-bottom: 9px; */ + height: calc(100% - 40px); + overflow-y: auto; } .table-wrap { width: 100%; diff --git a/common/style/reset.css b/common/style/reset.css index 8b4a624..fc8a03f 100644 --- a/common/style/reset.css +++ b/common/style/reset.css @@ -172,7 +172,7 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re padding: 0 !important; } .pd20 { - padding: 20px !important; + padding: 10px 0 0 0 !important; } .popshow { transform: translateY(-50%); diff --git a/pages/management/alloc-maintenance_new.vue b/pages/management/alloc-maintenance_new.vue index 9dfdb2a..995fd13 100644 --- a/pages/management/alloc-maintenance_new.vue +++ b/pages/management/alloc-maintenance_new.vue @@ -18,7 +18,6 @@ - 调拨单 @@ -273,7 +272,7 @@ let res = await allocationBillDetail(e.djid) if (res.code === 1) { res.result.map(el => { - this.$set(el, 'subChecked', false) + this.$set(el, 'checked', false) }) this.dataList.map(el => { if (el.djid === e.djid) { diff --git a/pages/management/check.vue b/pages/management/check.vue index 3c42256..9ccbbb8 100644 --- a/pages/management/check.vue +++ b/pages/management/check.vue @@ -12,7 +12,6 @@ - 盘点 @@ -214,7 +213,7 @@ async _checkDtlByCheckCode (e) { let res = await checkDtlByCheckCode(e.id) res.map(el => { - this.$set(el, 'subChecked', false) + this.$set(el, 'checked', false) }) this.dataList.map(el => { if (el.djid === e.djid) { diff --git a/pages/management/in-storage_new.vue b/pages/management/in-storage_new.vue index 36655c4..a1f9aae 100644 --- a/pages/management/in-storage_new.vue +++ b/pages/management/in-storage_new.vue @@ -1,6 +1,6 @@