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 @@ - - - + + + - 工作时间 + 工单时间 - + @@ -143,8 +143,11 @@ - - 维保工单信息 + + + 维保部件信息 + 添加部件信息 + @@ -156,100 +159,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + 删除 + + + 确认保存 - - + + + +