From 0eb1a7b223ffbba679081df85fb0154476e3d113 Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Fri, 30 Sep 2022 17:58:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/qd/src/assets/styles/eladmin.scss | 102 ++++++++++++++++-- wms/qd/src/assets/styles/element-ui.scss | 49 ++++++++- wms/qd/src/components/Crud/CRUD.operation.vue | 18 ++-- wms/qd/src/components/Crud/RR.operation.vue | 10 +- wms/qd/src/components/Crud/UD.operation.vue | 5 +- wms/qd/src/components/Crud/crud.js | 2 +- wms/qd/src/main.js | 5 +- wms/qd/src/views/generator/config.vue | 6 +- wms/qd/src/views/generator/index.vue | 2 +- wms/qd/src/views/mnt/app/index.vue | 2 +- wms/qd/src/views/mnt/database/execute.vue | 2 +- wms/qd/src/views/mnt/database/index.vue | 2 +- wms/qd/src/views/mnt/deploy/deploy.vue | 2 +- wms/qd/src/views/mnt/deploy/index.vue | 2 +- wms/qd/src/views/mnt/deploy/sysRestore.vue | 2 +- wms/qd/src/views/mnt/server/index.vue | 2 +- wms/qd/src/views/monitor/log/search.vue | 2 +- wms/qd/src/views/monitor/online/index.vue | 2 +- wms/qd/src/views/system/auto/index.vue | 2 +- wms/qd/src/views/system/auto/log.vue | 4 +- wms/qd/src/views/system/dept/index.vue | 6 +- wms/qd/src/views/system/dict/dictDetail.vue | 4 +- wms/qd/src/views/system/dict/index.vue | 4 +- wms/qd/src/views/system/job/module/form.vue | 2 +- wms/qd/src/views/system/job/module/header.vue | 4 +- wms/qd/src/views/system/menu/index.vue | 4 +- wms/qd/src/views/system/param/index.vue | 4 +- wms/qd/src/views/system/role/index.vue | 4 +- wms/qd/src/views/system/timing/index.vue | 4 +- wms/qd/src/views/system/timing/log.vue | 4 +- wms/qd/src/views/system/user/center.vue | 2 +- .../views/system/user/center/updateEmail.vue | 4 +- .../views/system/user/center/updatePass.vue | 2 +- wms/qd/src/views/system/user/index.vue | 8 +- wms/qd/src/views/tools/aliPay/config.vue | 2 +- wms/qd/src/views/tools/aliPay/toPay.vue | 2 +- wms/qd/src/views/tools/codeGen/codeDetail.vue | 4 +- wms/qd/src/views/tools/codeGen/index.vue | 4 +- wms/qd/src/views/tools/email/config.vue | 2 +- wms/qd/src/views/tools/email/send.vue | 2 +- .../src/views/tools/storage/local/index.vue | 4 +- wms/qd/src/views/tools/storage/qiniu/form.vue | 2 +- .../src/views/tools/storage/qiniu/index.vue | 4 +- wms/qd/src/views/wms/check/AddDialog.vue | 10 +- wms/qd/src/views/wms/check/index.vue | 2 +- wms/qd/src/views/wms/dump/index.vue | 8 +- wms/qd/src/views/wms/index.vue | 4 +- wms/qd/src/views/wms/md/customer/index.vue | 8 +- wms/qd/src/views/wms/md/material/index.vue | 12 +-- .../src/views/wms/md/materiallabel/index.vue | 4 +- wms/qd/src/views/wms/md/supp/index.vue | 8 +- wms/qd/src/views/wms/md/unit/index.vue | 4 +- wms/qd/src/views/wms/md/unit/unitDtl.vue | 4 +- wms/qd/src/views/wms/sch/point/index.vue | 27 +++-- wms/qd/src/views/wms/sch/task/index.vue | 4 +- .../views/wms/st/core/emptyVehicle/index.vue | 14 +-- .../views/wms/st/core/inbill/DisDialog.vue | 61 ++++++----- wms/qd/src/views/wms/st/core/inbill/index.vue | 8 +- .../views/wms/st/core/outbill/DisDialog.vue | 8 +- .../src/views/wms/st/core/outbill/index.vue | 6 +- wms/qd/src/views/wms/st/disbill/index.vue | 6 +- .../src/views/wms/st/outstbyvehicle/index.vue | 18 ++-- .../views/wms/st/qualitytestorder/index.vue | 10 +- wms/qd/src/views/wms/st/sect/index.vue | 10 +- wms/qd/src/views/wms/st/store/index.vue | 4 +- wms/qd/src/views/wms/st/struct/index.vue | 8 +- wms/qd/src/views/wms/st/structIvt/index.vue | 2 +- .../src/views/wms/st/structsumIvt/index.vue | 4 +- wms/qd/src/views/wms/st/sttask/index.vue | 6 +- wms/qd/src/views/wms/st/vehicle/index.vue | 4 +- 70 files changed, 355 insertions(+), 214 deletions(-) diff --git a/wms/qd/src/assets/styles/eladmin.scss b/wms/qd/src/assets/styles/eladmin.scss index e1e0195..265fd58 100644 --- a/wms/qd/src/assets/styles/eladmin.scss +++ b/wms/qd/src/assets/styles/eladmin.scss @@ -1,14 +1,17 @@ .head-container { padding-bottom: 10px; + .filter-item { display: inline-block; vertical-align: middle; margin: 0 3px 10px 0; + input { height: 30.5px; line-height: 30.5px; } } + .el-form-item-label { margin: 0 3px 9px 0; display: inline-block; @@ -19,12 +22,15 @@ line-height: 30.5px; padding: 0 7px 0 7px; } - .el-button+.el-button { + + .el-button + .el-button { margin-left: 0 !important; } - .el-select__caret.el-input__icon.el-icon-arrow-up{ + + .el-select__caret.el-input__icon.el-icon-arrow-up { line-height: 30.5px; } + .date-item { display: inline-block; vertical-align: middle; @@ -33,6 +39,7 @@ width: 230px !important; } } + .el-avatar { display: inline-block; text-align: center; @@ -48,10 +55,11 @@ border-radius: 16px; } -.logo-con{ +.logo-con { height: 60px; padding: 13px 0 0; - img{ + + img { height: 32px; width: 135px; display: block; @@ -87,6 +95,7 @@ z-index: 99; width: 100%; } + .eladmin-upload { border: 1px dashed #c0ccda; border-radius: 5px; @@ -94,7 +103,8 @@ line-height: 45px; width: 368px; } -.my-blockquote{ + +.my-blockquote { margin: 0 0 10px; padding: 15px; line-height: 22px; @@ -102,7 +112,8 @@ border-radius: 0 2px 2px 0; background-color: #f2f2f2; } -.my-code{ + +.my-code { position: relative; padding: 15px; line-height: 20px; @@ -112,6 +123,83 @@ font-size: 12px } -.el-tabs{ +.el-tabs { margin-bottom: 25px; } + + +//修改侧边栏菜单颜色和高度 +.el-menu-item, .el-submenu__title { + height: 40px !important; + //background-color: #776020 !important; +} + +#app .sidebar-container .el-submenu .el-menu-item { +} + +#app .sidebar-container .nest-menu .el-submenu > .el-submenu__title, #app .sidebar-container .el-submenu .el-menu-item { +} + +#app .sidebar-container { + //background-color: #544b32 !important; +} + +.el-form-item--small.el-form-item { + margin-bottom: 12px !important; +} + +.el-form-item--mini.el-form-item { + margin-bottom: 10px !important; +} + +//去除编辑文本框为数字时的上下箭头start +.el-form--inline .el-form-item__content { + width: auto !important; +} + +input[type="number"] { + -moz-appearance: textfield; +} + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + -webkit-appearance: none; +} + +//去除编辑文本框为数字时的上下箭头end +//设置计数器文字居左 +.el-input-number--mini .el-input__inner { + text-align: left; +} + +.el-table:not(.el-table–scrollable-x) .el-table__fixed-right { + height: 100% !important; +} + +// 修改弹出框距离 +.el-dialog__body { + padding-top: 0px !important; +} + +//表格标题样式 +.el-table { + .el-table__header-wrapper, + .el-table__fixed-header-wrapper { + th { + word-break: break-word; + background-color: #f8f8f9; + color: #515a6e; + height: 35px; + font-size: 13px; + } + td{ + color: #f8f8f9; + } + } + .el-table__body-wrapper { + .el-button [class*="el-icon-"] + span { + margin-left: 1px; + } + } +} + diff --git a/wms/qd/src/assets/styles/element-ui.scss b/wms/qd/src/assets/styles/element-ui.scss index 8f7881c..5c72fb9 100644 --- a/wms/qd/src/assets/styles/element-ui.scss +++ b/wms/qd/src/assets/styles/element-ui.scss @@ -17,7 +17,7 @@ .cell { .el-tag { - margin-right: 0; + margin-right: 0px; } } @@ -41,7 +41,7 @@ text-align: center; .el-tag { - margin-right: 0; + margin-right: 0px; } } } @@ -69,7 +69,7 @@ // dropdown .el-dropdown-menu { a { - display: block + display: block; } } @@ -77,3 +77,46 @@ .el-range-editor.el-input__inner { display: inline-flex !important; } + +// to fix el-date-picker css style +.el-range-separator { + box-sizing: content-box; +} + +.el-menu--collapse +> div +> .el-submenu +> .el-submenu__title +.el-submenu__icon-arrow { + display: none; +} + +.el-form-search { + float: right; + .el-form-search-item { + margin-bottom: 0px; + .el-input__inner { + width: 140px; + } + } +} + +el-table .el-table__cell { + padding: 8px 0; +} + +.el-table--medium .el-table__cell { + padding: 6px 0; +} + +.el-table--small .el-table__cell { + padding: 3px 0; +} + +.el-table--mini .el-table__cell { + padding: 1px 0; +} + +.el-dialog__body { + padding: 20px 20px; +} diff --git a/wms/qd/src/components/Crud/CRUD.operation.vue b/wms/qd/src/components/Crud/CRUD.operation.vue index 20fd0db..4c5cc02 100644 --- a/wms/qd/src/components/Crud/CRUD.operation.vue +++ b/wms/qd/src/components/Crud/CRUD.operation.vue @@ -253,13 +253,13 @@ export default { diff --git a/wms/qd/src/components/Crud/RR.operation.vue b/wms/qd/src/components/Crud/RR.operation.vue index df2c138..6bcfcbb 100644 --- a/wms/qd/src/components/Crud/RR.operation.vue +++ b/wms/qd/src/components/Crud/RR.operation.vue @@ -1,8 +1,16 @@