From 43f9a8d49c99fecefbc7f5d3ee6fa4130f58d624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Mon, 1 Jul 2024 21:58:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/orders.js | 56 ++++++++ src/components/scTable/index.vue | 2 +- src/config/route.js | 2 +- src/layout/index.vue | 6 +- src/style/app.scss | 4 +- src/style/fix.scss | 27 +++- src/style/home.scss | 2 +- src/views/document/document.vue | 6 +- src/views/early/list.vue | 57 +++++--- src/views/order/workOrder.vue | 212 +++++++++++++++++++++++++++++ src/views/userCenter/user/bind.vue | 2 +- 11 files changed, 342 insertions(+), 34 deletions(-) create mode 100644 src/api/model/orders.js create mode 100644 src/views/order/workOrder.vue diff --git a/src/api/model/orders.js b/src/api/model/orders.js new file mode 100644 index 0000000..338bbfc --- /dev/null +++ b/src/api/model/orders.js @@ -0,0 +1,56 @@ +import config from "@/config"; +import http from "@/utils/request"; + +export default { + order:{ + list: { + url: `${config.API_URL}/order.list`, + name: "获取加工单列表", + get: async function (params) { + return await http.post(this.url, params); + }, + }, + add: { + url: `${config.API_URL}/order.add`, + name: "获取加工单添加", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + delete: { + url: `${config.API_URL}/order.delete`, + name: "获取加工单删除", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + cancel:{ + url: `${config.API_URL}/order.cancel`, + name: "加工单撤回", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + info:{ + url: `${config.API_URL}/order.info`, + name: "加工单详情", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + review: { + url: `${config.API_URL}/order.review`, + name: "加工单审核", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + active: { + url: `${config.API_URL}/order.active.list`, + name: "已排期工单", + get: async function (params) { + return await http.post(this.url, params); + }, + } + } +}; diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue index a492b96..c761820 100644 --- a/src/components/scTable/index.vue +++ b/src/components/scTable/index.vue @@ -113,7 +113,7 @@ return Number(this.height)?Number(this.height)+'px':this.height }, _table_height() { - return this.hidePagination && this.hideDo ? "100%" : "calc(100% - 50px)" + return this.hidePagination && this.hideDo ? "100%" : "calc(100% - 51px)" } }, data() { diff --git a/src/config/route.js b/src/config/route.js index 64ebd8e..f7ff7de 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -64,7 +64,7 @@ const routes = [ children: [{ name: "order", path: "/order", - component: "home", + component: "order/workOrder", meta: { icon: "sc-icon-Console", title: "维保工单", diff --git a/src/layout/index.vue b/src/layout/index.vue index ecc4048..4ff8523 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -83,9 +83,9 @@
- - - + + +
diff --git a/src/style/app.scss b/src/style/app.scss index b82cf64..06c802c 100644 --- a/src/style/app.scss +++ b/src/style/app.scss @@ -82,7 +82,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo .adminui-tags {height:35px;background: #fff;border-bottom: 1px solid #e8e8e8;} .adminui-tags ul {display: flex;overflow: hidden;} .adminui-tags li {cursor: pointer;display: inline-block;float: left;height:34px;line-height: 34px;position: relative;flex-shrink: 0;} -.adminui-tags li::after {content: " ";width:1px;height:100%;position: absolute;right:0px;background-image: linear-gradient(#fff, #e6e6e6);} +.adminui-tags li::after {content: " ";width:1px;height:100%;position: absolute;right:0;background-image: linear-gradient(#fff, #e6e6e6);} .adminui-tags li a {display: inline-block;padding:0 10px;width:100%;height:100%;color: #999;text-decoration:none;display: flex;align-items: center;} .adminui-tags li i {margin-left:10px;border-radius: 50%;width:15px;height:15px;display: flex;align-items: center;justify-content: center;} .adminui-tags li i:hover {background: var(--el-color-danger);color: #fff;} @@ -90,7 +90,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo .adminui-tags li.active a {color: #409EFF;} .adminui-tags li.sortable-ghost {opacity: 0;} -.adminui-main {overflow: auto;background-color: #f6f8f9;flex: 1;padding: 10px;box-sizing: border-box;} +.adminui-main {background-color: #f6f8f9;height: 100%; flex: 1;padding: 10px;box-sizing: border-box;} .adminui-main .mainBox{height: calc(100%);overflow: auto;background-color: #FFFFFF;padding: 0 10px;border-radius: 6px;} /*页面最大化*/ diff --git a/src/style/fix.scss b/src/style/fix.scss index 7fdb5b8..c8592e7 100644 --- a/src/style/fix.scss +++ b/src/style/fix.scss @@ -25,6 +25,15 @@ --el-color-primary-dark-9: #010a13; --el-menu-item-height:50px; + --el-component-size-small:28px; +} + +.el-button--small{ + height: 28px; +} +.el-pagination{ + --el-pagination-button-width-small:28px; + --el-pagination-button-height-small:28px; } .el-menu {border: none!important;} @@ -33,14 +42,26 @@ .el-container {height: 100%;} .el-aside {border-right: 1px solid var(--el-border-color-light);} .el-container + .el-aside {border-right: 0;border-left: 1px solid var(--el-border-color-light);} -.el-header {background: #fff;border-bottom: 1px solid var(--el-border-color-light);padding:13px 0;display: flex;justify-content: space-between;align-items: center;} -.mainBox .el-header{margin-bottom: 10px;} +.el-header {background: #fff;border-bottom: 1px solid #F6F6F6;padding:13px 15px;display: flex;justify-content: space-between;align-items: center;} +//.mainBox .el-header{margin-bottom: 10px;} +.mainBoxHeaderNoBorder .el-header{border-bottom: 0;padding: 0;} +.mainHeaderNoPadding .el-header{padding-left: 0;padding-right: 0;} .el-header .left-panel {display: flex;align-items: center;} .el-header .right-panel {display: flex;align-items: center;} .el-header .right-panel > * + * {margin-left:10px;} .el-footer {background: #fff;border-top: 1px solid var(--el-border-color-light);padding:13px 15px;} .el-main {padding:10px;width: 100%;height: 100%;box-sizing: border-box;background: var(--el-color-white);border-radius: 4px;} -.el-main.nopadding {padding:0;background: #fff;} +.el-main.nopadding {padding:0;background: #fff;display: flex;flex-direction: column;} +.el-main.nopadding .scTable{flex: 1;overflow: hidden;} + +/** 列表上面的检索 */ +.el-main.nopadding .searchMain{display: flex;flex-wrap: wrap;align-items: self-end;padding-bottom: 10px;margin: 20px 0 0 0; border-bottom: 1px solid var(--el-border-color-light);} +.el-main.nopadding .searchMainNoTop{margin-top: 0;} +.el-main.nopadding .searchMain .searchItem{display: flex;flex-direction: column;align-items: flex-start;margin-right: 20px;margin-bottom: 10px;} +.el-main.nopadding .searchMain .searchItem .name{white-space: nowrap;overflow: hidden;text-overflow: ellipsis;color: #303133;padding-bottom: 5px;text-align: right;} +.el-main.nopadding .searchMain .searchItem .input{width: 230px;} +.el-main.nopadding .searchMain .searchItem.searchBtn{display: flex;flex-direction: row;} + .el-drawer__body {overflow: auto;padding:0;} .el-popconfirm__main {margin: 14px 0;} .el-card__header {border-bottom: 0;font-size: 17px;font-weight: bold;padding:15px 20px 0px 20px;} diff --git a/src/style/home.scss b/src/style/home.scss index ef11706..cc3595f 100644 --- a/src/style/home.scss +++ b/src/style/home.scss @@ -132,7 +132,7 @@ .comMain{ .num{ color: var(--el-color-dark); - font-size: 30px; + font-size: 28px; font-weight: 500; .unit{ font-weight: normal; diff --git a/src/views/document/document.vue b/src/views/document/document.vue index d2108e0..4db8cca 100644 --- a/src/views/document/document.vue +++ b/src/views/document/document.vue @@ -1,5 +1,5 @@