From 700f60f0bd56fd49f8598c24910ad1b4ec5f7016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Fri, 1 Sep 2023 08:47:20 +0800 Subject: [PATCH] =?UTF-8?q?2023-08-31=20=E8=AE=BE=E5=A4=87=E5=92=8C?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/eam.js | 1 + .../modules/eam/eamWorkOrderForCheck.vue | 2 +- .../modules/eam/eamWorkOrderForDefect.vue | 22 +- .../eam/eamWorkOrderForMaintenance.vue | 21 +- .../modules/eam/eamWorkPlanForMaintenance.vue | 2 +- .../reportWorkOrder/reportCheckOrder.vue | 102 ++++---- .../reportWorkOrder/reportDefectOrder.vue | 235 ++++++++++-------- .../reportMaintenanceOrder.vue | 195 +++++++++------ 8 files changed, 346 insertions(+), 234 deletions(-) diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js index 4033653..3bdd9c5 100644 --- a/src/api/eam/eam.js +++ b/src/api/eam/eam.js @@ -183,3 +183,4 @@ export const getItemLists= data => createAPI(`/pms/eam/getItemLists`,'post',data export const deleteObjectFile= data => createAPI(`/pms/eam/deleteObjectFile`,'post',data) export const checkSparPartImage= data => createAPI(`/pms/eam/checkSparPartImage`,'post',data) export const refreshItem= data => createAPI(`/pms/eam/refreshItem`,'post',data) +export const reach= data => createAPI(`/pms/eam/reach`,'post',data) diff --git a/src/views/modules/eam/eamWorkOrderForCheck.vue b/src/views/modules/eam/eamWorkOrderForCheck.vue index 49eea0f..fbc6910 100644 --- a/src/views/modules/eam/eamWorkOrderForCheck.vue +++ b/src/views/modules/eam/eamWorkOrderForCheck.vue @@ -578,7 +578,7 @@ columnProp: 'workTime', headerAlign: "center", align: "center", - columnLabel: '工作时间', + columnLabel: '工作时长(m)', columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue index 2f70380..c49bd3b 100644 --- a/src/views/modules/eam/eamWorkOrderForDefect.vue +++ b/src/views/modules/eam/eamWorkOrderForDefect.vue @@ -610,6 +610,23 @@ status: true, fixed: '', }, + { + userId: this.$store.state.user.name, + functionId: 101018, + serialNumber: '101018TableActualPlanDate', + tableId: "101018Table", + tableName: "common", + columnProp: 'reachDate', + headerAlign: "center", + align: "center", + columnLabel: '到达时间', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, { userId: this.$store.state.user.name, functionId: 101018, @@ -636,7 +653,7 @@ columnProp: 'workTime', headerAlign: "center", align: "center", - columnLabel: '工作时间', + columnLabel: '工作时长(m)', columnHidden: false, columnImage: false, columnSortable: false, @@ -1014,7 +1031,8 @@ result: row.result, defectID: row.defectID, defectDesc: row.defectDesc, - actualOperatorName: row.actualOperatorName + actualOperatorName: row.actualOperatorName, + disposalMeasures: row.disposalMeasures } this.detailModelFlag = true; }, diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue index 912fad3..63a5c30 100644 --- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue +++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue @@ -656,6 +656,23 @@ status: true, fixed: '', }, + { + userId: this.$store.state.user.name, + functionId: 101018, + serialNumber: '101018TableActualPlanDate', + tableId: "101018Table", + tableName: "common", + columnProp: 'reachDate', + headerAlign: "center", + align: "center", + columnLabel: '到达时间', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, { userId: this.$store.state.user.name, functionId: 101018, @@ -665,7 +682,7 @@ columnProp: 'actualDate', headerAlign: "center", align: "center", - columnLabel: '实际执行日期', + columnLabel: '实际执行时间', columnHidden: false, columnImage: false, columnSortable: false, @@ -682,7 +699,7 @@ columnProp: 'workTime', headerAlign: "center", align: "center", - columnLabel: '工作时间', + columnLabel: '工作时长(m)', columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue index e438eeb..64aea1e 100644 --- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue +++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue @@ -991,7 +991,7 @@ tableName: "维保计划表", columnProp: 'planCycle', headerAlign: "center", - align: "right", + align: "center", columnLabel: '维保周期', columnHidden: false, columnImage: false, diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue index df6621c..9df3293 100644 --- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue +++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue @@ -509,23 +509,23 @@ status: true, fixed: '', }, - { - userId: this.$store.state.user.name, - functionId: 101019, - serialNumber: '101019TableActualOperatorName', - tableId: "101019Table", - tableName: "common", - columnProp: 'actualOperatorName', - headerAlign: "center", - align: "center", - columnLabel: '实际机修人员', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, + // { + // userId: this.$store.state.user.name, + // functionId: 101019, + // serialNumber: '101019TableActualOperatorName', + // tableId: "101019Table", + // tableName: "common", + // columnProp: 'actualOperatorName', + // headerAlign: "center", + // align: "center", + // columnLabel: '实际机修人员', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, { userId: this.$store.state.user.name, functionId: 101019, @@ -543,40 +543,40 @@ status: true, fixed: '', }, - { - userId: this.$store.state.user.name, - functionId: 101019, - serialNumber: '101019TableActualActualDate', - tableId: "101019Table", - tableName: "common", - columnProp: 'actualDate', - headerAlign: "center", - align: "center", - columnLabel: '实际执行时间', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, - { - userId: this.$store.state.user.name, - functionId: 101019, - serialNumber: '101019TableWorkTime', - tableId: "101019Table", - tableName: "common", - columnProp: 'workTime', - headerAlign: "center", - align: "center", - columnLabel: '工作时间', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, + // { + // userId: this.$store.state.user.name, + // functionId: 101019, + // serialNumber: '101019TableActualActualDate', + // tableId: "101019Table", + // tableName: "common", + // columnProp: 'actualDate', + // headerAlign: "center", + // align: "center", + // columnLabel: '实际执行时间', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 101019, + // serialNumber: '101019TableWorkTime', + // tableId: "101019Table", + // tableName: "common", + // columnProp: 'workTime', + // headerAlign: "center", + // align: "center", + // columnLabel: '工作时间', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, { userId: this.$store.state.user.name, functionId: 101019, diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index 88b549a..2066c81 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -78,7 +78,8 @@ fixed="right" label="操作"> @@ -133,38 +134,40 @@ 选择机修人员 - + - - - - + + + + + + + + + + + + + + + - - - + + + @@ -309,6 +312,7 @@ getOperatorList, // 获取机修人员列表 queryHistoryRecord, searchFileUrl, // 查询文件路径 + reach // 到达 } from "@/api/eam/eam.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' @@ -554,23 +558,23 @@ status: true, fixed: '', }, - { - userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020TableActualOperatorName', - tableId: "101020Table", - tableName: "common", - columnProp: 'actualOperatorName', - headerAlign: "center", - align: "center", - columnLabel: '实际机修人员', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, + // { + // userId: this.$store.state.user.name, + // functionId: 101020, + // serialNumber: '101020TableActualOperatorName', + // tableId: "101020Table", + // tableName: "common", + // columnProp: 'actualOperatorName', + // headerAlign: "center", + // align: "center", + // columnLabel: '实际机修人员', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, { userId: this.$store.state.user.name, functionId: 101020, @@ -588,40 +592,40 @@ status: true, fixed: '', }, - { - userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020TableActualActualDate', - tableId: "101020Table", - tableName: "common", - columnProp: 'actualDate', - headerAlign: "center", - align: "center", - columnLabel: '实际执行时间', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, - { - userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020TableWorkTime', - tableId: "101020Table", - tableName: "common", - columnProp: 'workTime', - headerAlign: "center", - align: "center", - columnLabel: '工作时间', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, + // { + // userId: this.$store.state.user.name, + // functionId: 101020, + // serialNumber: '101020TableActualActualDate', + // tableId: "101020Table", + // tableName: "common", + // columnProp: 'actualDate', + // headerAlign: "center", + // align: "center", + // columnLabel: '实际执行时间', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 101020, + // serialNumber: '101020TableWorkTime', + // tableId: "101020Table", + // tableName: "common", + // columnProp: 'workTime', + // headerAlign: "center", + // align: "center", + // columnLabel: '工作时间', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, { userId: this.$store.state.user.name, functionId: 101020, @@ -663,7 +667,9 @@ objectID: '', objectDesc: '', checkWorkPlanId: '', - checkItemNo: '' + checkItemNo: '', + reachDate: '', + finishDate: '' }, operatorData: { site: this.$store.state.user.site, @@ -1116,6 +1122,38 @@ selectionChangeHandle (val) { this.dataListSelections = val }, + // 到达 + reach (row){ + let tempData = { + site: row.site, + functionType: 'C', + orderNo: row.orderNo, + status: '已到达' + } + this.$confirm(`是否确认到达?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + reach(tempData).then(({data}) => { + if (data && data.code === 0) { + this.getDataList(); + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => { + } + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }).catch(() => { + }) + }, reportModal(row){ this.saveData = { site: row.site, @@ -1133,7 +1171,8 @@ objectID: row.objectID, objectDesc: row.objectDesc, checkWorkPlanId: row.checkWorkPlanId, - checkItemNo: row.checkItemNo + checkItemNo: row.checkItemNo, + reachDate: row.reachDate } this.queryHistoryRecord(); this.detailModelFlag = true; @@ -1145,30 +1184,30 @@ }) return false } - if(this.saveData.startDate === '' || this.saveData.startDate == null){ - this.$alert('请输入开始时间！', '错误', { - confirmButtonText: '确定' - }) - return false - } - if(this.saveData.endDate === '' || this.saveData.endDate == null){ - this.$alert('请输入结束时间！', '错误', { - confirmButtonText: '确定' - }) - return false - } - if(this.saveData.workTime === 0){ - this.$alert('工作时长不能为0！', '错误', { - confirmButtonText: '确定' - }) - return false - } - if(this.saveData.workTime < 0){ - this.$alert('工作时长不能小于0', '错误', { - confirmButtonText: '确定' - }) - return false - } + // if(this.saveData.startDate === '' || this.saveData.startDate == null){ + // this.$alert('请输入开始时间！', '错误', { + // confirmButtonText: '确定' + // }) + // return false + // } + // if(this.saveData.endDate === '' || this.saveData.endDate == null){ + // this.$alert('请输入结束时间！', '错误', { + // confirmButtonText: '确定' + // }) + // return false + // } + // if(this.saveData.workTime === 0){ + // this.$alert('工作时长不能为0！', '错误', { + // confirmButtonText: '确定' + // }) + // return false + // } + // if(this.saveData.workTime < 0){ + // this.$alert('工作时长不能小于0', '错误', { + // confirmButtonText: '确定' + // }) + // return false + // } if(this.saveData.result === '' || this.saveData.result == null){ this.$alert('请选择维修结果！', '错误', { confirmButtonText: '确定' diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue index f59159c..1a1f1fd 100644 --- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue +++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue @@ -86,7 +86,8 @@ fixed="right" label="操作"> @@ -115,20 +116,20 @@ 协同人员 - - - - - - + + + + + + - - - + + + @@ -363,7 +364,8 @@ queryHistoryRecord, // 查询设备的点检历史记录 eamWorkOrderReportSearch, //历史记录详情 getOperatorList, - refreshItem + refreshItem, + reach } from "@/api/eam/eam.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' @@ -575,23 +577,23 @@ status: true, fixed: '', }, - { - userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020TableActualOperatorName', - tableId: "101020Table", - tableName: "common", - columnProp: 'actualOperatorName', - headerAlign: "center", - align: "center", - columnLabel: '实际机修人员', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, + // { + // userId: this.$store.state.user.name, + // functionId: 101020, + // serialNumber: '101020TableActualOperatorName', + // tableId: "101020Table", + // tableName: "common", + // columnProp: 'actualOperatorName', + // headerAlign: "center", + // align: "center", + // columnLabel: '实际机修人员', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, { userId: this.$store.state.user.name, functionId: 101020, @@ -609,40 +611,40 @@ status: true, fixed: '', }, - { - userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020TableActualActualDate', - tableId: "101020Table", - tableName: "common", - columnProp: 'actualDate', - headerAlign: "center", - align: "center", - columnLabel: '实际执行日期', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, - { - userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020TableWorkTime', - tableId: "101020Table", - tableName: "common", - columnProp: 'workTime', - headerAlign: "center", - align: "center", - columnLabel: '工作时间', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, + // { + // userId: this.$store.state.user.name, + // functionId: 101020, + // serialNumber: '101020TableActualActualDate', + // tableId: "101020Table", + // tableName: "common", + // columnProp: 'actualDate', + // headerAlign: "center", + // align: "center", + // columnLabel: '实际执行日期', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 101020, + // serialNumber: '101020TableWorkTime', + // tableId: "101020Table", + // tableName: "common", + // columnProp: 'workTime', + // headerAlign: "center", + // align: "center", + // columnLabel: '工作时间', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, { userId: this.$store.state.user.name, functionId: 101020, @@ -683,6 +685,7 @@ disposalMeasures: '', functionType: 'B', createBy: this.$store.state.user.name, + reachDate: '' }, columnDetailList: [ { @@ -1392,6 +1395,39 @@ selectionChangeHandle (val) { this.dataListSelections = val }, + + // 到达 + reach (row){ + let tempData = { + site: row.site, + functionType: 'B', + orderNo: row.orderNo, + status: '已到达' + } + this.$confirm(`是否确认到达?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + reach(tempData).then(({data}) => { + if (data && data.code === 0) { + this.getDataList(); + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => { + } + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }).catch(() => { + }) + }, reportModal(row){ this.saveData = { site: row.site, @@ -1409,6 +1445,7 @@ functionType: 'B', planDesc: row.planDesc, propertiesCode: row.propertiesCode, + reachDate: row.reachDate } this.getInspectionFormData() this.queryHistoryRecord() @@ -1416,22 +1453,22 @@ }, saveCheckReport(){ - if(this.saveData.startDate === ''||this.saveData.startDate == null){ - this.$message.warning('请输入开始时间！') - return - } - if(this.saveData.endDate === ''||this.saveData.endDate == null){ - this.$message.warning('请输入结束时间！') - return - } - if(this.saveData.workTime === 0){ - this.$message.warning('工作时长不能为0！') - return - } - if(this.saveData.workTime < 0){ - this.$message.warning('工作时长不能小于0！') - return - } + // if(this.saveData.startDate === ''||this.saveData.startDate == null){ + // this.$message.warning('请输入开始时间！') + // return + // } + // if(this.saveData.endDate === ''||this.saveData.endDate == null){ + // this.$message.warning('请输入结束时间！') + // return + // } + // if(this.saveData.workTime === 0){ + // this.$message.warning('工作时长不能为0！') + // return + // } + // if(this.saveData.workTime < 0){ + // this.$message.warning('工作时长不能小于0！') + // return + // } if(this.saveData.checkResult === ''||this.saveData.checkResult == null){ this.$message.warning('请选择维保结论！') return