diff --git a/common/style/layout.css b/common/style/layout.css index 2dc7de0..bbca117 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -24,8 +24,8 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { .content{ width: 100%; min-height: 100%; - background: center / 100% auto url(./static/images/page_bg.jpg) no-repeat; - background-color: #040d1e; + background: top center / 100% auto url(./static/images/page_bg.jpg) repeat-y; + /* background-color: #040d1e; */ } .footer{ width: 100%; @@ -36,8 +36,8 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { margin: 10px auto 0 auto; border-radius: 6px; padding: 10px; - background: linear-gradient(to right, rgba(8, 38, 68, 0.5) 1%, rgba(8, 38, 68, 0.98) 100%); - border: 1px solid #0490DD; + background-color: rgba(1, 114, 195, 40%); + border: 1px solid #00a3dd; box-shadow: rgba(4, 136, 203, 0.2) -3px 6px 6px 1px, rgba(4, 136, 203, 0.2) 3px -3px 6px 1px; } .search-label{ @@ -118,8 +118,11 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { width: calc(100% - 20px); min-height: calc(100vh - 145px); margin: 0 auto; - padding-top: 5px; - background: center / 100% 100% url(./static/images/bg-task-r2.png) no-repeat; + padding: 10px 0; + border: 1px solid #01c2f3; + border-radius: 4px; + background-color: rgba(1, 114, 195, 40%); + box-shadow: inset 5px 5px 6px rgb(1 194 243 / 70%), inset -5px -5px 6px rgb(1 194 243 / 70%); } .zdrow-wrap { width: 100%; @@ -131,7 +134,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { .table-wrap { width: 100%; margin: 0 auto; - padding: 5px 0 10px 0; + padding: 15px 0 10px 0; overflow-y: auto; } .grid-table { @@ -146,15 +149,16 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { z-index: 6; } .grid-table th{ - font-size: 13px; + font-size: 12px; line-height: 20px; height: 30px; - color: #AFBED8; - font-weight: bold; + color: #fff; + font-weight: 700; padding: 5px 10px; text-align: center; white-space: nowrap; - background-color: #673939; + background-color: #3F6ACA; + border-bottom: 1px solid #9fd3ff; } .grid-table td{ font-size: 12px; @@ -163,26 +167,32 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { color: #fff; padding: 5px 10px; text-align: center; - background-color: #382d4f; - border-bottom: 1px solid #C2563E; + background-color: rgba(63,106,202,0.3); + border-bottom: 1px solid #9fd3ff; white-space: nowrap; } .grid-table th:first-child, .grid-table td:first-child { position: sticky; left: 0; z-index: 5; + min-width: 46px; + max-width: 46px; + white-space: nowrap; +} +.grid-table td:first-child, .grid-table td:nth-child(2), .grid-table td:last-child { + background-color: #2951ac; } .grid-table th:last-child, .grid-table td:last-child { position: sticky; right: 0; z-index: 5; - box-shadow: -2px 0px 2px 0px rgba(19, 19, 19, 30%); + box-shadow: inset 2px 0px 2px 0px rgba(19, 19, 19, 30%); } .grid-table th:nth-child(2), .grid-table td:nth-child(2) { position: sticky; left: 46px; z-index: 5; - box-shadow: 2px 0px 2px 0px rgba(19, 19, 19, 30%); + box-shadow: inset -2px 0px 2px 0px rgba(19, 19, 19, 30%); } .td_input { font-size: 12px; @@ -233,12 +243,13 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { } .zd-th-wraper{ width: 100%; - background: #142954 center / 100% 100% url(./static/images/grid_bg.png) no-repeat; + /* background: #142954 center / 100% 100% url(./static/images/grid_bg.png) no-repeat; */ overflow: hidden; } .zd-sec-th-wraper { width: 100%; - background-color: #673939; + background-color: #3F6ACA; + border-bottom: 1px solid #9fd3ff; } .zd-td-wraper{ width: 100%; @@ -251,10 +262,10 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { font-size: 13px; line-height: 15px; height: 30px; - color: #AFBED8; - font-weight: bold; - /* padding: 0 5px; */ + color: #e1e9f4; + font-weight: 700; text-align: center; + background: left center / 1px 100% url(./static/images/th_bg.png) repeat-x; } .zd-sec-th { display: flex; @@ -265,7 +276,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { height: 30px; color: #fff; /* background-color: #0F1521; */ - font-weight: bold; + font-weight: 700; /* padding: 0 5px; */ text-align: center; white-space: nowrap; @@ -299,10 +310,10 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { line-height: 13px; height: 49px; color: #fff; - background-color: rgba(194, 86, 62, 0.2); + background-color: rgba(63,106,202,0.3); + border-bottom: 1px solid #9fd3ff; padding: 5px 2px; text-align: center; - border-bottom: 1px solid #C2563E; word-break: break-all; overflow: hidden; } @@ -326,7 +337,8 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { background: center / 100% 100% url(./static/images/icon-check2.png) no-repeat; } .fontcol1 { - color: #3CC1FF; + color: #58e9ff; + font-weight: 700; } .fontcol2 { color: #000; @@ -341,7 +353,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { .zd-sec-wraper { width: 100%; background-color: rgba(63,106,202,0.3); - padding: 5px 0px; + padding: 15px 0px 0px 0px; border-bottom: 1px solid #7A9FE0; transition: height 0.5s ease; } diff --git a/components/NavBar.vue b/components/NavBar.vue index 5866e3d..e91e22f 100644 --- a/components/NavBar.vue +++ b/components/NavBar.vue @@ -55,11 +55,9 @@ .header _fj() _wh(100%, 30px) - background-color #041427 - border-bottom 1px solid #13568B + background: center / 100% 100% url(../static/images/header_bg_s.png) no-repeat z-index 200 padding 0 10px - box-shadow: 0 1px 2px 0 RGBA(19, 86, 139, 0.5); .page_name _font(22px, 30px, #F6F9FE,700,center) font-family: YouSheBiaoTiHei diff --git a/pages/login/login.vue b/pages/login/login.vue index 66ea1bb..93f5ad8 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -181,7 +181,7 @@ _wh(90%, auto) margin 0 auto text-align center - _bis(,'../../static/images/login_bg.png', 100%, 100%,bottom) + _bis(,'../../static/images/login_header_bg.png', 100%, 100%,bottom) img _wh(30%, auto) .login_wrap diff --git a/pages/management/alloc-maintenance.vue b/pages/management/alloc-maintenance.vue index a6ca232..6838a10 100644 --- a/pages/management/alloc-maintenance.vue +++ b/pages/management/alloc-maintenance.vue @@ -54,10 +54,12 @@ 库存类型 库存状态 数量 - 调出库位 - 调出仓库 - 调入库位 调入仓库 + 调入仓库名称 + 调入库位 + 调出仓库 + 调出仓库名称 + 调出库位 计划调入日期 计划调出日期 更多 @@ -66,7 +68,11 @@ {{j+1}} - + + + + + {{el.wlbm}} {{el.wlmc}} {{el.ggxh}} @@ -74,9 +80,16 @@ {{el.kclx}} {{el.kczt}} + + + + {{el.drckbm}} + + + {{el.drckmc}} - + @@ -85,15 +98,10 @@ {{el.dcckbm}} + {{el.dcckmc}} - - - - - - - {{el.drckbm}} + @@ -121,10 +129,12 @@ {{el.kclx}} {{el.kczt}} {{el.sl}} - {{el.dckwbm}} - {{el.dcckbm}} - {{el.drkwbm}} {{el.drckbm}} + {{el.drckmc}} + {{el.drkwbm}} + {{el.dcckbm}} + {{el.drckmc}} + {{el.dckwbm}} {{el.jhdrrq}} {{el.jhdcrq}} diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue index 0fe0655..52dbab2 100644 --- a/pages/management/in-storage.vue +++ b/pages/management/in-storage.vue @@ -3,20 +3,20 @@ - - - + + + - + + - @@ -73,9 +73,9 @@ {{crType === 'IN'? '已入数量':'已出数量'}} 剩余数量 库存 - 操作人 - 操作日期 - 更多 + 操作人 + 操作日期 + 更多 {{j+1}} @@ -538,10 +538,14 @@ .mgr30 margin-right 30rpx .select_wraper + /deep/ .uni-select__input-box + height 30px /deep/ .uni-select__selector z-index 11 /deep/ .uni-select height: 30px; + min-height: 30px; + line-height: 30px; padding: 0 2px 0 12px; border: 1px solid #4980bd; background-color: rgba(45,88,184,0.1); diff --git a/pages/management/receive-confirm.vue b/pages/management/receive-confirm.vue index 248e7bb..c020ed9 100644 --- a/pages/management/receive-confirm.vue +++ b/pages/management/receive-confirm.vue @@ -68,7 +68,11 @@ {{j+1}} - + + + + + {{el.cgbh}} {{el.wlbm}} {{el.wlmc}} diff --git a/static/images/bg-task-r1.png b/static/images/bg-task-r1.png index 9b4c0ef..99b36ec 100644 Binary files a/static/images/bg-task-r1.png and b/static/images/bg-task-r1.png differ diff --git a/static/images/bg-task-r2.png b/static/images/bg-task-r2.png index cdc7a8b..4aba5de 100644 Binary files a/static/images/bg-task-r2.png and b/static/images/bg-task-r2.png differ diff --git a/static/images/button.png b/static/images/button.png old mode 100755 new mode 100644 index 5f7fa2e..33f19bf Binary files a/static/images/button.png and b/static/images/button.png differ diff --git a/static/images/header_bg.png b/static/images/header_bg.png index 948b266..a24d34a 100644 Binary files a/static/images/header_bg.png and b/static/images/header_bg.png differ diff --git a/static/images/header_bg_s.png b/static/images/header_bg_s.png new file mode 100644 index 0000000..5ceaf4e Binary files /dev/null and b/static/images/header_bg_s.png differ diff --git a/static/images/home_bg.jpg b/static/images/home_bg.jpg old mode 100755 new mode 100644 index 2a02dec..d14286d Binary files a/static/images/home_bg.jpg and b/static/images/home_bg.jpg differ diff --git a/static/images/login_bg.jpg b/static/images/login_bg.jpg index 546555c..a4cf6cd 100644 Binary files a/static/images/login_bg.jpg and b/static/images/login_bg.jpg differ diff --git a/static/images/login_bg.png b/static/images/login_bg.png deleted file mode 100755 index f450f48..0000000 Binary files a/static/images/login_bg.png and /dev/null differ diff --git a/static/images/login_header_bg.png b/static/images/login_header_bg.png new file mode 100644 index 0000000..db2e6c4 Binary files /dev/null and b/static/images/login_header_bg.png differ diff --git a/static/images/tab_bg.png b/static/images/tab_bg.png new file mode 100644 index 0000000..24c6579 Binary files /dev/null and b/static/images/tab_bg.png differ diff --git a/static/images/tab_bg_active.png b/static/images/tab_bg_active.png new file mode 100644 index 0000000..8b98775 Binary files /dev/null and b/static/images/tab_bg_active.png differ diff --git a/static/images/th_bg.png b/static/images/th_bg.png new file mode 100644 index 0000000..3019187 Binary files /dev/null and b/static/images/th_bg.png differ