From 53c57a482686ecdbef6bc24cea61503087bf570d Mon Sep 17 00:00:00 2001 From: chengzhaofeng Date: Mon, 17 Mar 2025 15:09:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE):?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=89=8B=E5=8A=A8=E5=A1=AB=E6=8A=A5=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E5=B7=A5=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pms/repair/repair-order-execution.js | 1 + .../repair/repair-failure-reporting/index.vue | 68 ++++++------------- .../order-info/execute.vue | 54 +++++++++------ 3 files changed, 56 insertions(+), 67 deletions(-) diff --git a/src/const/crud/mes/pms/repair/repair-order-execution.js b/src/const/crud/mes/pms/repair/repair-order-execution.js index 33cfa1a..863f7e2 100644 --- a/src/const/crud/mes/pms/repair/repair-order-execution.js +++ b/src/const/crud/mes/pms/repair/repair-order-execution.js @@ -146,6 +146,7 @@ export const tableOption = { prop: "completedTime", span: 12, row: true, + hide: true, }, { type: "input", diff --git a/src/views/mes/pms/repair/repair-failure-reporting/index.vue b/src/views/mes/pms/repair/repair-failure-reporting/index.vue index 56b72ac..50c02dc 100644 --- a/src/views/mes/pms/repair/repair-failure-reporting/index.vue +++ b/src/views/mes/pms/repair/repair-failure-reporting/index.vue @@ -21,32 +21,15 @@ label-width="150px"> - - - - - - - - - - - - - - - -
{{ formObj.zPmsResrceExtBo }}
- + + v-if="!onlyView"> @@ -56,7 +39,7 @@
{{ formObj.location }}
- + @@ -67,7 +50,7 @@
{{ formObj.reportUser }}
- + @@ -75,8 +58,7 @@
{{ formObj.reportTime }}
- + @@ -86,8 +68,7 @@
{{ formObj.reportSection }}
- + @@ -95,9 +76,9 @@
{{ formObj.faultDescription }}
- + + v-if="!onlyView"> @@ -118,7 +99,9 @@ :file-list="uploadList" :data="uploadData" :disabled="onlyView"> - 点击上传 + + 点击上传 + @@ -131,7 +114,7 @@
{{ formObj.waitReson }}
- + @@ -237,10 +220,10 @@ export default { reportUser: '', reportSection: '', reportTime: '', - isEquipmentCode: 'O', repairPerson: '', contentRemarks: '', waitReson: '', + isEquipmentCode: 'O' }, openList: getCategory, getDevicePage: getDevices, @@ -319,19 +302,10 @@ export default { } } }, - watch: { - // 'formObj.isEquipmentCode'(newValue, oldValue) { - // let me = this; - // if (newValue === 'O') { - // me.rule.isEquipmentCode = [{required: true, message: '请选择设备识别方式', trigger: 'change'}]; - // } else if (newValue === 'N') { - // me.formObj.zPmsResrceExtBo = '' - // } - // } - }, + watch: {}, created() { this.formObj = Object.assign({}, this.initData) - this.formObj.isEquipmentCode = 'O' + this.formObj.isEquipmentCode = 'O' this.username = this.userInfo['name']; this.part_add = this.permissions['part_add'] this.part_del = this.permissions['part_del'] @@ -407,7 +381,7 @@ export default { if (response.data.code !== 0) { me.$message.error('删除文件失败:' + response.data.msg); } - }).catch( error => { + }).catch(error => { hideLoading() me.$message.error("删除失败:" + error) }) @@ -428,7 +402,7 @@ export default { beforeUpload(handle) { if (handle) { this.uploadData.handle = handle - }else { + } else { this.uploadData.handle = '' } }, @@ -482,6 +456,7 @@ export default { // 新增(開窗) handleAdd() { let me = this + me.tabActiveName = 'main' me.titleText = '报修工单-提报' me.onlyView = false me.isAdd = true @@ -521,6 +496,7 @@ export default { // 查看(開窗) handleView(row, index) { let me = this + me.tabActiveName = 'main' this.titleText = '故障工单-查看' this.onlyView = true this.isUpdate = false @@ -560,7 +536,7 @@ export default { submitForm() { let me = this if (!me.isUpdate) { - if (me.formObj.isEquipmentCode === 'O' && !me.formObj.zPmsResrceExtBo) { + if (!me.formObj.zPmsResrceExtBo) { return me.$message.error('请输入设备编号!') } if (!me.formObj.location) { @@ -586,13 +562,13 @@ export default { let me = this; showLoading() addObj({ - isEquipmentCode: row.isEquipmentCode, zPmsResrceExtBo: row.resrce, location: row.location, reportUser: row.reportUser, reportTime: row.reportTime, reportSection: row.reportSection, faultDescription: row.faultDescription, + isEquipmentCode: 'O', site: me.site, uploadFileHandleList: me.uploadFileHandleList // 上传文件编码 }).then(response => { @@ -607,7 +583,7 @@ export default { me.getList(this.page) }).catch((e) => { hideLoading() - me.$message.error('添加失败:' + e) + console.log(e) }) }, // 編輯(API) diff --git a/src/views/mes/pms/repair/repair-order-execution/order-info/execute.vue b/src/views/mes/pms/repair/repair-order-execution/order-info/execute.vue index 2845834..eb4d6cf 100644 --- a/src/views/mes/pms/repair/repair-order-execution/order-info/execute.vue +++ b/src/views/mes/pms/repair/repair-order-execution/order-info/execute.vue @@ -161,14 +161,17 @@ - - - -  时 - - -  分 + + + + + + + + + + @@ -375,13 +378,7 @@ import { getReportOrderFile } from "@/api/mes/pms/repair-failure-reporting"; import {hideLoading, showLoading} from "@/const/loading"; -import { - addObj as addConsum, - delObj as delConsum, - getPartPage, - putObj as putConsum -} from "@/api/mes/pms/report-order-consum"; -import {addObj as addItem} from "@/api/mes/pms/report-order-item"; +import {getPartPage,} from "@/api/mes/pms/report-order-consum"; import { addObj, checkFail, @@ -436,6 +433,7 @@ export default { isView: false, repairCategories: [], formObj: { + playTime: '', repairOrderNumber: '', resrce: '', location: '', @@ -1049,6 +1047,7 @@ export default { }, doUpdate(type) { let me = this; + const now = me.getDateTime() // 中止维修 if (type === 'stop') { if (this.reasonDiscontinuation) { @@ -1085,13 +1084,25 @@ export default { if (!me.formObj.repairCategory) { return me.$message.warning('请选择维修类别') } - if (me.formObj.hour || me.formObj.minute) { - me.formObj.consumeTime = (me.formObj.hour || '0') + ',' + (me.formObj.minute || '0') - } else { - return me.$message.warning('请完整输入维修耗时') - } + // if (me.formObj.hour || me.formObj.minute) { + // me.formObj.consumeTime = (me.formObj.hour || '0') + ',' + (me.formObj.minute || '0') + // } else { + // return me.$message.warning('请完整输入维修耗时') + // } + // 用playTime-当前时间 再格式化为hh,mm的格式 + + + // 创建两个 Date 对象 + const date1 = new Date(me.formObj.playTime); + const date2 = new Date(now); + // 计算时间差（毫秒） + const timeDifference = date2 - date1; + // 将时间差转换为秒、分钟、小时 + const minutes = Math.floor(timeDifference / 60000); + const hours = Math.floor(minutes / 60); + me.formObj.consumeTime = hours + ',' + minutes me.formObj.orderStatus = 'TB_CHECK' - me.formObj.completedTime = me.getDateTime() + me.formObj.completedTime = now // 维修耗材参数加工 if (me.consumableRecord.length > 0) { // 组装保存参数 @@ -1130,7 +1141,8 @@ export default { me.formObj.pmsReportOrderConsums = me.consumableRecord } if (type === 'start') { - this.formObj.startRepair = 'Y' + me.formObj.startRepair = 'Y' + me.formObj.playTime = now } // 此处是因为在搜索界面检索出来时，会返回一个zPmsResrceExtBo，但不为BO，需要加上前缀，否则会报错 if (me.formObj.zPmsResrceExtBo && me.formObj.zPmsResrceExtBo.indexOf('ResourceBO:') === -1) {