From d4c191bb82a47216e707498d87edc285422ef601 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 13 May 2024 11:10:09 +0800 Subject: [PATCH] =?UTF-8?q?2024-5-13=20=E8=AE=BE=E5=A4=87=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=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 | 30 ++-- src/views/device/faultReport/index.vue | 20 ++- src/views/device/operation/index.vue | 156 +++++++++++++++++- src/views/device/repairOrder/index.vue | 6 + .../device/repairOrder/selectSpareParts.vue | 1 + .../sparePartsApplicationRecord/index.vue | 3 +- src/views/device/sparePartsLedger/index.vue | 1 - src/views/device/spotInspectionWork/index.vue | 8 +- src/views/wms/equipment/index.vue | 8 +- 9 files changed, 199 insertions(+), 34 deletions(-) diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index a02ec13..2448bba 100644 --- a/src/views/device/deviceOrder/index.vue +++ b/src/views/device/deviceOrder/index.vue @@ -46,10 +46,10 @@ @keyup.enter.native="handleQuery" /> - + - + @@ -673,7 +673,7 @@ {{ this.form.orderCode }} - {{ + {{ this.form.planWorkshop }} {{ @@ -771,7 +771,7 @@ - + {{ workVO.order.planCode }} @@ -784,9 +784,9 @@ {{ workVO.order.orderCode }} - {{ + {{ workVO.order.planLoopStart }} @@ -808,16 +808,13 @@ - + {{ workVO.equ.equipmentCode }} {{ workVO.equ.equipmentName }} - {{ - workVO.equ.equipmentLocation - }} {{ workVO.equ.equipmentTypeCode }} @@ -830,6 +827,9 @@ {{ workVO.equ.workshopName }} + {{ + workVO.equ.equipmentLocation + }} @@ -903,6 +903,12 @@ export default { dicts: ["device_order_status", "device_loop_type", "device_reach_standard"], data() { return { + WCS: { + "text-align": "left", + }, + WLS: { + width: "225px", + }, standardListVo: [], // 初始化VO workVO: { diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue index ad5f60e..9acbc8b 100644 --- a/src/views/device/faultReport/index.vue +++ b/src/views/device/faultReport/index.vue @@ -200,6 +200,10 @@ label="处理状态" align="center" prop="orderStatus" /> + {{ parseTime(scope.row.orderBreakdownTime) }} -
确 定 - 返 回 + 返 回
@@ -882,7 +882,7 @@
- 返 回 + 返 回
@@ -1413,15 +1413,17 @@ export default { this.openView = false; }, // 审核返回按钮 - cancelCheckForm() { + cancelViewCheckForm() { this.viewCheck = false; }, + cancelOpenCheckForm() { + this.openCheck = false; + }, // 表单重置 reset() { this.form = { //报修图片 fileList: null, - // orderId: null, orderCode: null, equipmentCode: null, diff --git a/src/views/device/operation/index.vue b/src/views/device/operation/index.vue index d9dc7b4..494d5f1 100644 --- a/src/views/device/operation/index.vue +++ b/src/views/device/operation/index.vue @@ -101,6 +101,7 @@ /> + - + + + + + 取 消 + + + + + + + + + + + + + + + + + + + + + + + + + @@ -530,6 +638,10 @@ import { addOperation, updateOperation, } from "@/api/device/operation"; + +import { + listRepairSparePartsRecord, +} from "@/api/device/sparePartsApplicationRecord"; import { parseTime } from "../../../utils/ruoyi"; export default { @@ -580,12 +692,16 @@ export default { showSearch: true, // 总条数 total: 0, + //备件总条数 + sparePartsTotal: 0, // 设备运行记录表格数据 operationList: [], // 弹出层标题 title: "", // 是否显示弹出层 open: false, + //是否显示查看更换备件 + openSpareParts: false, // 查询参数 queryParams: { pageNum: 1, @@ -594,6 +710,7 @@ export default { groupLine: null, equipmentName: null, equipmentCode: null, + spareUseEquipment: null, faultTime: null, actualOperationTime: null, operationTime: null, @@ -610,6 +727,12 @@ export default { attr3: null, createTimeArray: [], }, + //查询更换备件参数 + querySparePartsParams: { + pageNum: 1, + pageSize: 10, + equipmentCode: null, + }, // 表单参数 form: {}, // 表单校验 @@ -625,11 +748,16 @@ export default { }, methods: { parseTime, + // 生成表头序号 + indexMethod(index) { + return index + 1; + }, /** 查询设备运行记录列表 */ getList() { this.loading = true; listOperation(this.queryParams).then((response) => { this.operationList = response.rows; + // this.operationList.failureDescription.replace(/;/g, '
') this.total = response.total; this.loading = false; }); @@ -703,6 +831,22 @@ export default { this.title = "修改设备运行记录"; }); }, + /** 查看更换备件 */ + handleViewSpareParts(row) { + this.querySparePartsParams.equipmentCode = row.equipmentCode; + this.querySparePartsParams.createTime = row.createTime; + listRepairSparePartsRecord(this.querySparePartsParams).then((response) => { + this.sparePartsApplicationRecordList = response.rows; + this.sparePartsTotal = response.total; + this.openSpareParts = true; + this.title = "查看更换备件"; + }); + }, + /** 查看更换备件取消按钮 */ + cancelSpareParts() { + this.openSpareParts = false; + this.reset(); + }, /** 提交按钮 */ submitForm() { this.$refs["form"].validate((valid) => { diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index ddca115..ab19ecf 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -1881,6 +1881,11 @@ export default { _data.minutes / 60 + _data.seconds / 3600 ).toFixed(1) + "小时"; + + //如果不停机 + if(this.form.workDownMachine == '0'){ + this.form.faultDownTime = "0.0小时"; + } } //增加故障停机时间 @@ -2310,6 +2315,7 @@ export default { item.picturePath = this.listToString(item.picturePath); } }); + writeRepairOrder(this.form).then((response) => { this.openWrite = false; this.$modal.msgSuccess("填写维修记录成功！"); diff --git a/src/views/device/repairOrder/selectSpareParts.vue b/src/views/device/repairOrder/selectSpareParts.vue index 9aaf27e..2b7148b 100644 --- a/src/views/device/repairOrder/selectSpareParts.vue +++ b/src/views/device/repairOrder/selectSpareParts.vue @@ -62,6 +62,7 @@ diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue index a49d059..0bee4ab 100644 --- a/src/views/device/spotInspectionWork/index.vue +++ b/src/views/device/spotInspectionWork/index.vue @@ -33,8 +33,8 @@ @keyup.enter.native="handleQuery" /> - - + + - - + + diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index d854ee3..e172f3c 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -957,9 +957,15 @@ :value="form.equipmentCategory" /> - {{ + {{ form.factoryWorkshop }} + + + 设备使用状况