From ac7a61b37515abd067fbb5189dad9f65ac888b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Wed, 9 Oct 2024 16:19:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/system.js | 8 +- src/utils/tool.js | 1 + src/views/order/create-order.vue | 136 ++++++++++++++------- src/views/order/orderList/detailView.vue | 12 +- src/views/order/orderList/index.vue | 30 ++--- src/views/order/preview-order.vue | 2 +- src/views/setting/role/index.vue | 14 ++- src/views/setting/role/userTree.vue | 129 +++++++++++++++++++ src/views/setting/user/view-permission.vue | 2 +- 9 files changed, 268 insertions(+), 66 deletions(-) create mode 100644 src/views/setting/role/userTree.vue diff --git a/src/api/model/system.js b/src/api/model/system.js index 491859e..6744e51 100644 --- a/src/api/model/system.js +++ b/src/api/model/system.js @@ -105,7 +105,13 @@ export default { return await http.post(this.url, params); }, }, - + roleUserTree:{ + url: `${config.API_URL}/roles.user.select.list`, + name: "角色用户列表", + post: async function (params) { + return await http.post(this.url, params); + } + }, roleAuth: { url: `${config.API_URL}/auth.role.auth`, name: "角色授权", diff --git a/src/utils/tool.js b/src/utils/tool.js index a10cebb..72a7403 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -324,6 +324,7 @@ tool.isBinaryFile = function (file) { tool.authPermissions = function (list){ let arr = []; if(list && list.length>0){ + console.log(list,233) list.forEach(item=>{ for(let i in item){ if(item[i] && item[i].length>0){ diff --git a/src/views/order/create-order.vue b/src/views/order/create-order.vue index bb262c8..a9f3f9c 100644 --- a/src/views/order/create-order.vue +++ b/src/views/order/create-order.vue @@ -2,16 +2,28 @@ - +
工作时间
- - - - - + + + + + + + + + + + + + + + + + @@ -53,7 +65,7 @@ - + @@ -117,13 +129,13 @@ - - + + - - + + @@ -133,39 +145,56 @@
维保工单信息
- - - - - - - - - - - - - - + + + + 是 + 否 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - +
+ + +
@@ -190,9 +219,11 @@ export default { fault_type:[], }, form:{ + customer:"", // 客户 + standard_model:"", // 标准机型 repair_order_no:"", maintenance_grade:"", // 维修等级 - maintenance_level: "", // 维修等级 + maintenance_level: "", // 维修分类 fault_type: "", // 故障类型 fault_description: "", // 故障描述 requires_shutdown: "", // 是否需要关机 @@ -211,8 +242,27 @@ export default { bd_backup_count: "", // 剩余BD数 pe_confirmation_time: "", // PE确认时间 warranty_end_date: "", // 保修期结束 - maintenance_plan: '' // 维保等级：1-铜牌；常量维护项 - } + maintenance_plan: '', // 维保等级：1-铜牌；常量维护项 + is_verify_erp_inventory:true, + component_info:[ + { + component_serial_no:"", + component_manufacturer:"", + component_model:"", + component_pn:"" + } + ] + }, + rules:{ + fault_description:[{required:true,trigger:"blur",message:"故障描述不能为空"}], + fault_type:[{required:true,trigger:"change",message:"故障类型不能为空"}], + city:[{required:true,trigger:"blur",message:"机房城市不能为空"}], + device_sn:[{required:true,trigger:"blur",message:"整机SN/Se不能为空"}], + device_manufacturer:[{required:true,trigger:"blur",message:"整机厂商不能为空"}], + device_model:[{required:true,trigger:"blur",message:"整机型号不能为空"}], + sla_expiration:[{required:true,trigger:"change",message:"SLA截止时间不能为空"}], + bd_backup_count:[{required:true,trigger:"blur",message:"剩余BD数不能为空"}], + }, } }, mounted() { diff --git a/src/views/order/orderList/detailView.vue b/src/views/order/orderList/detailView.vue index 9ac4fe5..6d5e790 100644 --- a/src/views/order/orderList/detailView.vue +++ b/src/views/order/orderList/detailView.vue @@ -14,10 +14,20 @@
+ + 报修客户： + {{info.customer}} + + + 标准机型： + {{info.standard_model}} + 创建时间： {{info.created_at}} + + PE确认时间： {{info.pe_confirmation_time}} @@ -54,7 +64,7 @@
- 维修等级： + 维修单等级： {{info.maintenance_plan}} diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue index 1b86a7a..353286a 100644 --- a/src/views/order/orderList/index.vue +++ b/src/views/order/orderList/index.vue @@ -11,9 +11,9 @@
下载导入模版
- 提交维保 + 提交维保 批量审核 - 下发维保 +
@@ -53,6 +53,9 @@
编辑工单
+
+ 提交维保 +
删除工单
@@ -62,12 +65,9 @@
工单详情
-
- 提交维保 -
-
- 下发维保 -
+ + +
工单日志
@@ -274,12 +274,14 @@ export default { }) }, async save_maintenance() { - const params = {order_ids: this.selection.map(em => em.id)}; - const res = await this.$API.orders.order.maintenance.submit.post(params); - if (res.code == 200) { - this.$refs.table.refresh(); - this.$message.success("操作成功") - } + eventBus.$emit('tagClose','/order/submit-order',{id:this.selection.map(em => em.id)[0]}); + + // const params = {order_ids: this.selection.map(em => em.id)}; + // const res = await this.$API.orders.order.maintenance.submit.post(params); + // if (res.code == 200) { + // this.$refs.table.refresh(); + // this.$message.success("操作成功") + // } }, async issued_maintenance() { const params = {order_ids: this.selection.map(em => em.id)}; diff --git a/src/views/order/preview-order.vue b/src/views/order/preview-order.vue index 5f48a22..8f94956 100644 --- a/src/views/order/preview-order.vue +++ b/src/views/order/preview-order.vue @@ -21,7 +21,7 @@ + + diff --git a/src/views/setting/user/view-permission.vue b/src/views/setting/user/view-permission.vue index a63ba6c..9065588 100644 --- a/src/views/setting/user/view-permission.vue +++ b/src/views/setting/user/view-permission.vue @@ -52,7 +52,7 @@