From a8822645ee4887c9ae3a7469346263297b488ab3 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Fri, 17 Nov 2023 17:17:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/deviceOrder/index.vue | 168 +++++++++++++++--- src/views/device/inspectionWork/index.vue | 10 +- .../device/spotInspectionOrder/index.vue | 127 ++++++++++++- src/views/device/upkeepOrder/index.vue | 151 +++++++++++++++- 4 files changed, 419 insertions(+), 37 deletions(-) diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index db66f57..0723c8e 100644 --- a/src/views/device/deviceOrder/index.vue +++ b/src/views/device/deviceOrder/index.vue @@ -103,22 +103,6 @@ placeholder="请选择实际结束时间"> - - - - - - - - - + + + + + + 搜索 重置 @@ -337,7 +329,15 @@ - + + + @@ -522,6 +522,87 @@ 取 消 + + + + + + + {{ workVO.order.planCode }} + {{ workVO.order.planName }} + {{ workVO.order.planLoop }}{{ workVO.order.planLoopType }} + + {{ workVO.order.orderCode }} + {{ workVO.order.planWorkshop }} + {{ workVO.order.planLoopStart }} + {{ workVO.order.planLoopEnd }} + {{ workVO.order.orderStart }} + {{ workVO.order.orderEnd }} + {{ workVO.order.planPerson }} + {{ workVO.order.repairCode }} + + + + + {{ workVO.equ.equipmentCode }} + {{ workVO.equ.equipmentName }} + {{ workVO.equ.equipmentLocation }} + {{ workVO.equ.equipmentTypeCode }} + {{ workVO.equ.equipmentTypeName }} + {{ workVO.equ.workshopCode }} + {{ workVO.equ.workshopName }} + + + +
+ {{ detail.itemName }} + + + + + + + + + + + + + + + + +
+ + + + 取 消 + 确 定 + + @@ -534,12 +615,39 @@ import { updateDeviceOrder } from "@/api/device/deviceOrder"; import {getWorkCenter} from "@/api/device/plan"; +import {getInspectionWork} from "@/api/device/inspectionWork"; export default { name: "DeviceOrder", dicts: ['device_order_status', 'device_loop_type','device_reach_standard'], data() { return { + // 初始化VO + workVO: { + order: { + planCode: null, + planName: null, + planLoop: null, + planLoopType: null, + orderCode: null, + planWorkShop: null, + planLoopStart: null, + planLoopEnd: null, + orderStart: null, + orderEnd: null, + planPerson: null, + }, equ: { + equipmentCode: null, + equipmentName: null, + equipmentLocation: null, + equipmentTypeCode: null, + equipmentTypeName: null, + workshopCode: null, + workshopName: null, + }, detailList: [] + }, + // 工单详情弹窗 + workDetail: false, // 日期范围选择快捷 pickerOptions: { shortcuts: [{ @@ -639,6 +747,16 @@ export default { this.getList(); }, methods: { + // 展示 + showWork(row) { + this.reset(); + const orderId = row.orderId || this.ids + getInspectionWork(orderId).then(response => { + this.workVO = response.data; + this.workDetail = true; + }); + + }, // 获取工作中心 setWorkCenter() { getWorkCenter().then(response => { diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue index c4b862f..4bdd019 100644 --- a/src/views/device/inspectionWork/index.vue +++ b/src/views/device/inspectionWork/index.vue @@ -101,14 +101,6 @@ @keyup.enter.native="handleQuery" /> - - - - + @@ -512,6 +601,7 @@ import { listSpotInspectionOrder, getSpotInspectionOrder, delSpotInspectionOrder, addSpotInspectionOrder, updateSpotInspectionOrder } from "@/api/device/spotInspectionOrder"; import {getDeviceOrder, listDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder"; import {getWorkCenter} from "@/api/device/plan"; +import {getInspectionWork} from "@/api/device/inspectionWork"; export default { name: "SpotInspectionOrder", @@ -520,6 +610,31 @@ export default { return { dialogImageUrl: '', dialogVisible: false, + workDetail:false, + // 初始化VO + workVO: { + order: { + planCode:null, + planName:null, + planLoop:null, + planLoopType:null, + orderCode:null, + planWorkShop:null, + planLoopStart:null, + planLoopEnd:null, + orderStart:null, + orderEnd:null, + planPerson:null, + },equ: { + equipmentCode:null, + equipmentName: null, + equipmentLocation:null, + equipmentTypeCode:null, + equipmentTypeName:null, + workshopCode:null, + workshopName:null, + },detailList:[] + }, // 日期范围选择快捷 pickerOptions: { shortcuts: [{ @@ -631,6 +746,16 @@ export default { this.dialogImageUrl = file.url; this.dialogVisible = true; }, + // 展示 + showWork(row) { + this.reset(); + const orderId = row.orderId || this.ids + getInspectionWork(orderId).then(response => { + this.workVO = response.data; + this.workDetail = true; + }); + + }, handleDownload(file) { console.log(file); }, diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index eba1137..82cf593 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -356,7 +356,15 @@ - + + + @@ -982,6 +990,108 @@ 取 消 + + + + + + + {{ workVO.order.planCode }} + {{ workVO.order.planName }} + {{ workVO.order.planLoop }}{{ workVO.order.planLoopType }} + + {{ workVO.order.orderCode }} + {{ workVO.order.planWorkshop }} + {{ workVO.order.planLoopStart }} + {{ workVO.order.planLoopEnd }} + {{ workVO.order.orderStart }} + {{ workVO.order.orderEnd }} + {{ workVO.order.planPerson }} + {{ workVO.order.repairCode }} + + + + + {{ workVO.equ.equipmentCode }} + {{ workVO.equ.equipmentName }} + {{ workVO.equ.equipmentLocation }} + {{ workVO.equ.equipmentTypeCode }} + {{ workVO.equ.equipmentTypeName }} + {{ workVO.equ.workshopCode }} + {{ workVO.equ.workshopName }} + + + + + + + + + + + + + +
+ {{ detail.itemName }} + + + + + + + + + + + + + + + + +
+ + + + 取 消 + 确 定 + + @@ -996,13 +1106,40 @@ import { import {formatEquItem, querySpareList} from "@/api/device/upkeepPlan"; import {getEquList, getPersonList, getWorkCenter} from "@/api/device/plan"; import {getDeviceOrder, listDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder"; -import {updateInspectionWork} from "@/api/device/inspectionWork"; +import {getInspectionWork, updateInspectionWork} from "@/api/device/inspectionWork"; export default { name: "UpkeepOrder", dicts: ['device_order_status', 'device_loop_type','device_reach_standard','device_upkeep_type','device_inspect_status'], data() { return { + workDetail:false, + // 初始化VO + workVO: { + order: { + planCode:null, + planName:null, + planLoop:null, + planLoopType:null, + orderCode:null, + planWorkShop:null, + planLoopStart:null, + planLoopEnd:null, + orderStart:null, + orderEnd:null, + planPerson:null, + },equ: { + equipmentCode:null, + equipmentName: null, + equipmentLocation:null, + equipmentTypeCode:null, + equipmentTypeName:null, + workshopCode:null, + workshopName:null, + }, + detailList:[], + spareList:[], + }, // 日期范围选择快捷 pickerOptions: { shortcuts: [{ @@ -1171,6 +1308,16 @@ export default { this.getList(); }, methods: { + // 展示 + showWork(row) { + this.reset(); + const orderId = row.orderId || this.ids + getInspectionWork(orderId).then(response => { + this.workVO = response.data; + this.workDetail = true; + }); + + }, // 点击结果检验按钮 clickInspect() { if (this.ids.length == 0 || this.ids == null) {