From c72b3eb885f5abdabb9fa3cb10da393cb75cdeb0 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, 28 Oct 2024 15:57:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=88=86?= =?UTF-8?q?=E7=BB=84=E5=92=8C=E5=B7=A5=E5=8D=95=E9=83=A8=E5=88=86=E5=A4=9A?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=BC=E8=88=AA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/orders.js | 9 +- src/assets/icons/index.js | 1 + src/assets/icons/menu/Service.vue | 13 +++ src/components/scSearchSelect/index.vue | 2 +- src/config/route.js | 20 ++-- src/style/fix.scss | 1 + src/views/docsManager/index.vue | 2 +- src/views/home/search/index.vue | 2 +- src/views/order/dataConfirm/index.vue | 1 + src/views/order/orderList/index.vue | 3 +- src/views/order/orderPlan/confirmOrder.vue | 2 +- src/views/order/orderPlan/index.vue | 29 ++++-- .../order/{repairList => }/repair-info.vue | 2 +- src/views/order/repairList/index.vue | 23 +---- src/views/setting/deptMag/save.vue | 6 +- src/views/setting/user/index.vue | 91 ++++++++++++++++--- src/views/setting/user/save.vue | 55 +++++------ 17 files changed, 174 insertions(+), 88 deletions(-) create mode 100644 src/assets/icons/menu/Service.vue rename src/views/order/{repairList => }/repair-info.vue (99%) diff --git a/src/api/model/orders.js b/src/api/model/orders.js index 4aa0998..67b374f 100644 --- a/src/api/model/orders.js +++ b/src/api/model/orders.js @@ -97,8 +97,15 @@ export default { return await http.post(this.url, params); }, }, + status:{ + url: `${config.API_URL}/repair.status.list`, + name: "维修业务状态", + post: async function (params) { + return await http.post(this.url,params); + } + }, field:{ - url: `${config.API_URL}/`, + url: `${config.API_URL}/repair.order.field.list`, name: "维修工单检索", post: async function (params) { return await http.post(this.url,params); diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index b7c0645..44c6141 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -114,6 +114,7 @@ export { default as FinanceMag } from './menu/Finance.vue' export { default as Reports } from './menu/ReportForms.vue' export { default as ShipmentMag } from './menu/Shipment.vue' export { default as Inventory } from './menu/Stock.vue' +export { default as Service } from './menu/Service.vue' // 二层菜单 export { default as Controller } from './childMenu/Console.vue' export { default as CostFeeRecords } from './childMenu/CostControl.vue' diff --git a/src/assets/icons/menu/Service.vue b/src/assets/icons/menu/Service.vue new file mode 100644 index 0000000..efb9e45 --- /dev/null +++ b/src/assets/icons/menu/Service.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/components/scSearchSelect/index.vue b/src/components/scSearchSelect/index.vue index bcd3c90..6299ff6 100644 --- a/src/components/scSearchSelect/index.vue +++ b/src/components/scSearchSelect/index.vue @@ -108,7 +108,7 @@ export default { box-shadow: 0 6px 4px rgba(180, 207, 235, 0.25); //border: 1px solid var(--el-border-color-light); .item{ - padding: 0 10px;text-align: center; + padding: 0 10px;text-align: left; } .item:hover{ background-color: var(--el-color-primary-light-9); diff --git a/src/config/route.js b/src/config/route.js index 34c6230..9191ba4 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -15,16 +15,16 @@ const routes = [ title: "系统搜索", }, }, - { - name: "repair-info", - path:"/repair-info", - component:"order/repairList/repair-info", - meta: { - code:"", - icon: "sc-icon-Home", - title: "维修明细", - }, - }, + // { + // name: "repair-info", + // path:"/repair-info", + // component:"order/repairList/repair-info", + // meta: { + // code:"", + // icon: "sc-icon-Home", + // title: "维修明细", + // }, + // }, { diff --git a/src/style/fix.scss b/src/style/fix.scss index 67b4415..4159620 100644 --- a/src/style/fix.scss +++ b/src/style/fix.scss @@ -37,6 +37,7 @@ --el-order-color-3:#0DA525; --el-order-color-4:#FFB103; --el-order-color-5:#E81B1B; + --el-order-color-100:#57C23A; } .el-table{ diff --git a/src/views/docsManager/index.vue b/src/views/docsManager/index.vue index 182ae49..479050e 100644 --- a/src/views/docsManager/index.vue +++ b/src/views/docsManager/index.vue @@ -17,7 +17,7 @@ import document from './document' import share from './share' export default { - name: 'index', + name: 'manager', components: { document, share diff --git a/src/views/home/search/index.vue b/src/views/home/search/index.vue index f96facf..b9c04d3 100644 --- a/src/views/home/search/index.vue +++ b/src/views/home/search/index.vue @@ -182,7 +182,7 @@ import scSelect from '/src/components/scSearchSelect'; import {eventBus} from "@/utils/eventBus"; export default { - name: "", + name: "view-search", components:{ scSelect }, diff --git a/src/views/order/dataConfirm/index.vue b/src/views/order/dataConfirm/index.vue index 2e808c2..c45db1e 100644 --- a/src/views/order/dataConfirm/index.vue +++ b/src/views/order/dataConfirm/index.vue @@ -176,6 +176,7 @@ import config from "@/config/table"; import {eventBus} from "@/utils/eventBus" export default { + name:"dataConfirm", components: { columnSetting, emailSync diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue index 02603d7..302cfa4 100644 --- a/src/views/order/orderList/index.vue +++ b/src/views/order/orderList/index.vue @@ -39,7 +39,7 @@ @@ -92,6 +92,7 @@ import {eventBus} from "@/utils/eventBus"; import flow from "./components/flow" export default { + name:"orderList", components: { flow }, diff --git a/src/views/order/orderPlan/confirmOrder.vue b/src/views/order/orderPlan/confirmOrder.vue index 762dc4a..5817b6a 100644 --- a/src/views/order/orderPlan/confirmOrder.vue +++ b/src/views/order/orderPlan/confirmOrder.vue @@ -1,6 +1,6 @@