From 0aba260ab554e72b31d5d4961397ae856974ecbd Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Wed, 29 Mar 2023 11:26:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=BA=BF=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.css | 33 +++-- pages.json | 6 + pages/management/agvinerror.vue | 2 +- pages/management/hcxcheck.vue | 215 +++++++++++++++++++++++++----- pages/management/inscanerror.vue | 15 +-- pages/management/outscanerror.vue | 18 +-- pages/management/searchMater.vue | 86 ++++++++++++ utils/getData2.js | 37 +++++ vuex/modules/data.js | 23 ++++ vuex/store.js | 4 +- vuex/types.js | 3 +- 11 files changed, 376 insertions(+), 66 deletions(-) create mode 100644 pages/management/searchMater.vue create mode 100644 vuex/modules/data.js diff --git a/common/style/layout.css b/common/style/layout.css index 6991250..78c03fd 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -37,6 +37,9 @@ uni-button:after { width: 48%; margin-top: 15px; } +.search-item-btns { + justify-content: flex-end; +} .search-label{ width: 70px; height: 35px; @@ -77,8 +80,13 @@ uni-button:after { border: 1px solid #d1d1d1; border-radius: 4px; text-indent: 10px; +} +.search-input-l .uni-input-input { padding-right: 10px; } +.search-input-l .uni-input-input:disabled { + background-color: #e1e1e1; +} .confirm-button-wrap{ display: flex; justify-content: flex-end; @@ -95,6 +103,9 @@ uni-button:after { color: #fff; line-height: 35px; } +.confirm-button_disabled { + background-color: #c9c9c9; +} .grid-wrap{ width: 100%; height: calc(100% - 187px); /** 42+ 15*5+ 35*2 */ @@ -136,13 +147,11 @@ uni-button:after { padding: 0 5px; } .status-wrap { - width: 48%; + width: 100%; height: 35px; - padding: 0 15px; display: flex; - justify-content: flex-end; align-items: center; - margin-top: 15px; + margin-bottom: 15px; } .status-item { display: flex; @@ -173,18 +182,22 @@ uni-button:after { background-color: #ff6a00; } .material-wrap { + width: calc(100% - 30px); + height: calc(100% - 152px);/** 42+15*5+35 */ + margin: 15px auto; + padding: 15px 15px 0 15px; + background-color: #fff; + border-radius: 12px; +} +.material-item-wrap { + width: 100%; + height: calc(100% - 50px); display: flex; flex-wrap: wrap; justify-content: flex-start; align-content: flex-start; align-items: flex-start; - width: calc(100% - 30px); - height: calc(100% - 152px);/** 42+15*5+35 */ - margin: 15px auto; - padding: 15px 15px 0 15px; overflow-y: auto; - background-color: #fff; - border-radius: 12px; } .material-item { width: 8.2%; diff --git a/pages.json b/pages.json index 04d6c66..eabc633 100644 --- a/pages.json +++ b/pages.json @@ -65,6 +65,12 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "pages/management/searchMater", + "style": { + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/management/agvinerror.vue b/pages/management/agvinerror.vue index 8d6d32d..9cba8a3 100644 --- a/pages/management/agvinerror.vue +++ b/pages/management/agvinerror.vue @@ -119,5 +119,5 @@ \ No newline at end of file diff --git a/pages/management/hcxcheck.vue b/pages/management/hcxcheck.vue index a700977..8655d31 100644 --- a/pages/management/hcxcheck.vue +++ b/pages/management/hcxcheck.vue @@ -1,18 +1,26 @@