From e174feeb7de3047386f8306e5f2533838a463c06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Tue, 15 Oct 2024 20:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95=E5=88=9B?= =?UTF-8?q?=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scTable/index.vue | 3 +- src/style/app.scss | 6 +- src/views/order/components/infoSave.vue | 87 ++++++++++++ src/views/order/create-order.vue | 170 +++++++++-------------- src/views/order/orderList/detailView.vue | 40 ++---- src/views/order/submit-order.vue | 104 ++++++++------ 6 files changed, 230 insertions(+), 180 deletions(-) create mode 100644 src/views/order/components/infoSave.vue diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue index 916acfa..7be0354 100644 --- a/src/components/scTable/index.vue +++ b/src/components/scTable/index.vue @@ -24,7 +24,7 @@ @@ -96,6 +96,7 @@ showPagination: { type: Boolean, default: true }, hideDo: { type: Boolean, default: false }, hideTotal: { type: Boolean, default: true }, + hideEmpty: { type: Boolean, default: false }, hideRefresh: { type: Boolean, default: false }, hideSetting: { type: Boolean, default: false }, paginationLayout: { type: String, default: config.paginationLayout }, diff --git a/src/style/app.scss b/src/style/app.scss index adcfe53..4dcd169 100644 --- a/src/style/app.scss +++ b/src/style/app.scss @@ -68,10 +68,10 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo .adminui-side-bottom i {font-size: 16px;} .adminui-side-bottom:hover {color: var(--el-color-primary);} .aminui-side.isCollapse {width: 65px;} -.el-menu .menu-tag {position: absolute;height: 18px;line-height: 18px;background: var(--el-color-danger);font-size: 12px;color: #fff;right: 20px;border-radius:18px;padding:0 6px;} -.el-menu .el-sub-menu__title .menu-tag {right: 35px;top: 5px;} +.el-menu .menu-tag {position: absolute;height: 15px;line-height: 15px;background: var(--el-color-danger);font-size: 10px;color: #fff;right: 20px;border-radius:14px;padding:0 4px;} +.el-menu .el-sub-menu__title .menu-tag {right: 40px;top: 10px;} .el-menu--horizontal > li .menu-tag {display: none;} -.aminui-side.isCollapse .el-menu > li .menu-tag{display: inline-block;width: auto;height: 18px;line-height: 18px;padding: 0 6px;visibility: initial;right: 15px;top: 2px;} +.aminui-side.isCollapse .el-menu > li .menu-tag{display: inline-block;width: auto;height: 15px;line-height: 15px;padding: 0 4px;visibility: initial;right: 18px;top: 4px;} /* 右侧内容 */ .aminui-body {flex: 1;display: flex;flex-flow: column;} diff --git a/src/views/order/components/infoSave.vue b/src/views/order/components/infoSave.vue new file mode 100644 index 0000000..c98c0ee --- /dev/null +++ b/src/views/order/components/infoSave.vue @@ -0,0 +1,87 @@ + + + + + diff --git a/src/views/order/create-order.vue b/src/views/order/create-order.vue index 3b6a1cd..0e0a274 100644 --- a/src/views/order/create-order.vue +++ b/src/views/order/create-order.vue @@ -1,15 +1,15 @@