From 0fab9871f6b89b93e8d23a07ea8c78e3bfe39c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E7=82=BC?= <992116259@qq.com> Date: Fri, 22 Nov 2024 10:35:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93?= =?UTF-8?q?=EF=BC=8C=E5=85=A5=E5=BA=93=E6=89=A7=E8=A1=8C=EF=BC=8C=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=8B=86=E6=89=B9=EF=BC=8C=E5=BA=93=E5=AD=98=E5=90=88?= =?UTF-8?q?=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/views/index.js | 24 + src/styles/semi.scss | 79 +- .../mobile/wms/inventory-merge/index.vue | 200 +++++ .../mobile/wms/inventory-split/index.vue | 203 ++++++ .../wms/production-warehousing/index.vue | 687 ++++++++++++++++++ 5 files changed, 1150 insertions(+), 43 deletions(-) create mode 100644 src/views/mobile/wms/inventory-merge/index.vue create mode 100644 src/views/mobile/wms/inventory-split/index.vue create mode 100644 src/views/mobile/wms/production-warehousing/index.vue diff --git a/src/router/views/index.js b/src/router/views/index.js index 35b2892..0e7de02 100755 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -166,5 +166,29 @@ export default [ meta: { keepAlive: false } + },{ + path: '/mobile/wms/production-warehousing', + component: () => + import(/* webpackChunkName: "page" */ '@/views/mobile/wms/production-warehousing/index'), + name: '生产入库', + meta: { + keepAlive: false + } + },{ + path: '/mobile/wms/inventory-split', + component: () => + import(/* webpackChunkName: "page" */ '@/views/mobile/wms/inventory-split'), + name: '拆批', + meta: { + keepAlive: false + } + },{ + path: '/mobile/wms/inventory-merge', + component: () => + import(/* webpackChunkName: "page" */ '@/views/mobile/wms/inventory-merge/index'), + name: '合批', + meta: { + keepAlive: false + } } ] diff --git a/src/styles/semi.scss b/src/styles/semi.scss index 0681639..d1fa70a 100755 --- a/src/styles/semi.scss +++ b/src/styles/semi.scss @@ -188,9 +188,7 @@ p { color: $font-gy1 !important; - } - } //共用droplist template @@ -198,8 +196,8 @@ border-radius: $baseRadius1; padding: $baseGap1; position: absolute; - top: 32px!important; - margin-right: 8px!important; + top: 32px !important; + margin-right: 8px !important; li { border-radius: $baseRadius1; @@ -224,33 +222,28 @@ display: block; border-radius: $baseRadius1; - font-weight: 400!important; - letter-spacing: 0px!important; - line-height: 22px!important; - text-align: left!important; + font-weight: 400 !important; + letter-spacing: 0px !important; + line-height: 22px !important; + text-align: left !important; } - } li:hover { background-color: $brand8-normal !important; color: $white1 !important; } - - } - .semi-router-icon { display: inline !important; padding: 0px !important; font-size: 20px !important; top: 5px; position: relative; - margin-right: 8px + margin-right: 8px; } - .login-float-icon-area { position: fixed; top: 40px; @@ -269,7 +262,7 @@ // height: 100%; display: block; position: relative; - width: calc(100% - (100%/36) - (100%/36) - 480px); + width: calc(100% - (100% / 36) - (100% / 36) - 480px); height: auto; padding-top: 52.63%; /* 1000 / 1900 * 100 = 52.6315% */ @@ -300,12 +293,11 @@ /* IE (non-standard property) */ } - .iep_login_icon_area { display: table; font-weight: 100; font-size: 36px; - margin: 95px auto 0 ; + margin: 95px auto 0; padding: 0px 35px; .iep_login_menu_icon { @@ -317,7 +309,6 @@ background-repeat: no-repeat; background-size: contain; background-position: 50% 50%; - } .iep_login_menu_title { @@ -328,11 +319,9 @@ vertical-align: middle; font-size: $baseFont1; font-weight: 400; - } } - .el-select-dropdown__item { font-size: $baseFont4; } @@ -343,7 +332,6 @@ height: 40px; } - .el-message-box { min-width: 100px; max-width: 1366px; @@ -362,7 +350,7 @@ padding-left: 0px !important; padding-right: 0px !important; - button[aria-label='close'] { + button[aria-label="close"] { i { color: $font-gy1; } @@ -398,30 +386,28 @@ color: white !important; } .el-button--primary.is-disabled, -.el-button--primary.is-disabled:hover{ - background-color: $brand3-disabled!important; - border-color: $brand3-disabled!important; +.el-button--primary.is-disabled:hover { + background-color: $brand3-disabled !important; + border-color: $brand3-disabled !important; } - -.el-select-dropdown__item.selected{ - span{ +.el-select-dropdown__item.selected { + span { display: block; line-height: 34px; padding-top: 5px; } - span::after{ - content: url('https://api.iconify.design/carbon:checkmark.svg?color=%230966c2'); + span::after { + content: url("https://api.iconify.design/carbon:checkmark.svg?color=%230966c2"); font-family: "Carbon" !important; float: right; margin-right: 8px; line-height: 34px; } - .el-tree.tree-option{ - span::after{ + .el-tree.tree-option { + span::after { content: ""; - } } } @@ -432,10 +418,10 @@ border-radius: 12px; -webkit-box-sizing: border-box; box-sizing: border-box; - height: 100% + height: 100%; } -.flex-content{ +.flex-content { height: 100%; width: 100%; padding: 10px; @@ -444,14 +430,14 @@ -webkit-flex-direction: row; flex-direction: column; } -.flex-auto{ +.flex-auto { -webkit-flex: 1 1 auto; flex: 1 1 auto; - min-height: 0 + min-height: 0; } -.flex-none{ - flex:none +.flex-none { + flex: none; } @media (max-width: 1024px) { @@ -464,10 +450,9 @@ } } - .mobile-home { height: calc(100% - 10px); - + position: relative; .content { display: flex; flex-flow: column; @@ -492,7 +477,15 @@ flex: 1; } } - + .footer { + width: 100%; + margin: 10px 0; + display: flex; + justify-content: center; + position: absolute; + background-color: #ffffff; + bottom: 0; + } .flex-auto { -webkit-flex: 1 1 auto; flex: 1 1 auto; @@ -542,7 +535,7 @@ font-size: 15px; color: green; width: 70%; - text-align: right + text-align: right; } } } diff --git a/src/views/mobile/wms/inventory-merge/index.vue b/src/views/mobile/wms/inventory-merge/index.vue new file mode 100644 index 0000000..e231ecd --- /dev/null +++ b/src/views/mobile/wms/inventory-merge/index.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/mobile/wms/inventory-split/index.vue b/src/views/mobile/wms/inventory-split/index.vue new file mode 100644 index 0000000..601def7 --- /dev/null +++ b/src/views/mobile/wms/inventory-split/index.vue @@ -0,0 +1,203 @@ + + + + diff --git a/src/views/mobile/wms/production-warehousing/index.vue b/src/views/mobile/wms/production-warehousing/index.vue new file mode 100644 index 0000000..dcf925f --- /dev/null +++ b/src/views/mobile/wms/production-warehousing/index.vue @@ -0,0 +1,687 @@ + + + +