From f5c41b2f63227b7188cfc38394e9f71331633dc6 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 26 Feb 2024 17:44:15 +0800 Subject: [PATCH] =?UTF-8?q?2024-02-26=20=E8=AE=BE=E5=A4=87=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/eam.js | 4 + src/views/modules/eam/eamCheckRecord.vue | 934 ++++++++++++++ src/views/modules/eam/eamDefectRecord.vue | 1079 +++++++++++++++++ .../modules/eam/eamMaintenanceRecord.vue | 952 +++++++++++++++ .../reportWorkOrder/reportCheckOrder.vue | 32 +- .../reportWorkOrder/reportDefectOrder.vue | 38 +- .../reportMaintenanceOrder.vue | 50 +- 7 files changed, 3084 insertions(+), 5 deletions(-) create mode 100644 src/views/modules/eam/eamCheckRecord.vue create mode 100644 src/views/modules/eam/eamDefectRecord.vue create mode 100644 src/views/modules/eam/eamMaintenanceRecord.vue diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js index 2dfb212..ac0a5b1 100644 --- a/src/api/eam/eam.js +++ b/src/api/eam/eam.js @@ -186,3 +186,7 @@ export const AddTreeselect= data => createAPI(`/pms/eam/AddTreeselect`,'post',da export const EditTreeselect= data => createAPI(`/pms/eam/EditTreeselect`,'post',data) export const getSiteAndBuByUserName= data => createAPI(`/pms/eam/getSiteAndBuByUserName`,'post',data) +export const eamCheckRecordSearch= data => createAPI(`/pms/eam/eamCheckRecordSearch`,'post',data) +export const eamDefectRecordSearch= data => createAPI(`/pms/eam/eamDefectRecordSearch`,'post',data) + + diff --git a/src/views/modules/eam/eamCheckRecord.vue b/src/views/modules/eam/eamCheckRecord.vue new file mode 100644 index 0000000..2cb347b --- /dev/null +++ b/src/views/modules/eam/eamCheckRecord.vue @@ -0,0 +1,934 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ➞ + + + + + + + + + + + ➞ + + + + + + + 查询 + + {{ "导出" }} + + + + + + + + + {{ scope.row.checkResult }} + + + + + + {{ scope.row[item.columnProp] }} + + + + + + + + + + + + + + 关闭 + + + + + + + + + + + diff --git a/src/views/modules/eam/eamDefectRecord.vue b/src/views/modules/eam/eamDefectRecord.vue new file mode 100644 index 0000000..d04bd64 --- /dev/null +++ b/src/views/modules/eam/eamDefectRecord.vue @@ -0,0 +1,1079 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ➞ + + + + + + + + + + + ➞ + + + + + + + 查询 + + {{ "导出" }} + + + + + + + + + + + {{ scope.row.result }} + + + + + + {{ scope.row[item.columnProp] }} + + + + + + + + + + + + + + 关闭 + + + + + + + + + + + diff --git a/src/views/modules/eam/eamMaintenanceRecord.vue b/src/views/modules/eam/eamMaintenanceRecord.vue new file mode 100644 index 0000000..b787930 --- /dev/null +++ b/src/views/modules/eam/eamMaintenanceRecord.vue @@ -0,0 +1,952 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ➞ + + + + + + + + + + + ➞ + + + + + + + 查询 + + {{ "导出" }} + + + + + + + + + {{ scope.row.checkResult }} + + + + + + {{ scope.row[item.columnProp] }} + + + + + + + + + + + + + + 关闭 + + + + + + + + + + + diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue index 5feb1ed..f2daf81 100644 --- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue +++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue @@ -28,7 +28,7 @@ - + @@ -366,7 +366,7 @@ queryHistoryRecord, // 查询设备的点检历史记录 eamWorkOrderReportSearch, // 历史记录详情 refreshItem, // 刷新项目 - getSiteAndBuByUserName + getSiteAndBuByUserName, } from "@/api/eam/eam.js" import { getTableDefaultListLanguage, @@ -1058,6 +1058,7 @@ this.$nextTick(() => { this.height = window.innerHeight - 210 }) + this.$refs.objectID.focus() }, created () { @@ -1070,7 +1071,34 @@ this.getTableUserColumn(this.$route.meta.menuId+'table3',3) }, + methods: { + // 取消小键盘 + cancelKeyboard (e) { + // this.$refs.objectID + e.target.setAttribute('readonly', true); + setTimeout(() => { + e.target.removeAttribute('readonly'); + }, 100); + }, + + // 设备编码回车事件 + objectIdEnter () { + this.searchData.limit = this.pageSize + this.searchData.page = this.pageIndex + eamWorkOrderSearch(this.searchData).then(({data}) => { + if (data.code === 0) { + this.dataList = data.page.list + this.pageIndex = data.page.currPage + this.pageSize = data.page.pageSize + this.totalPage = data.page.totalCount + if (this.searchData.objectID != null && this.searchData.objectID !== '' && this.dataList.length > 0) { + this.reportModal(this.dataList[0]) + } + } + }) + }, + // 获取用户的bu getSiteAndBuByUserName () { let tempData = { diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index 6b2e390..e68ba86 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -25,7 +25,7 @@ - + @@ -983,6 +983,7 @@ this.$nextTick(() => { this.height = window.innerHeight - 210 }) + this.$refs.objectID.focus() }, created() { @@ -995,6 +996,41 @@ }, methods: { + // 取消小键盘 + cancelKeyboard (e) { + // this.$refs.objectID + e.target.setAttribute('readonly', true); + setTimeout(() => { + e.target.removeAttribute('readonly'); + }, 100); + }, + + // 设备编码回车事件 + objectIdEnter () { + this.searchData.limit = this.pageSize + this.searchData.page = this.pageIndex + eamWorkOrderSearch(this.searchData).then(({data}) => { + if (data.code === 0) { + this.dataList = data.page.list + this.pageIndex = data.page.currPage + this.pageSize = data.page.pageSize + this.totalPage = data.page.totalCount + if (this.searchData.objectID != null && this.searchData.objectID !== '' && this.dataList.length > 0) { + if (this.dataList[0].status == '未开工') { + this.saveData.site = this.dataList[0].site + this.saveData.buNo = this.dataList[0].buNo + this.saveData.operator = '' + this.saveData.operatorName = '' + this.operatorData.bu = this.dataList[0].site + '_' + this.dataList[0].buNo + this.reachData = this.dataList[0] + this.chooseReachModelFlag = true + } else if (this.dataList[0].status == '已到达') { + this.reportModal(this.dataList[0]) + } + } + } + }) + }, // 获取用户的bu getSiteAndBuByUserName () { diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue index 340d38e..4abf33f 100644 --- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue +++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue @@ -28,7 +28,7 @@ - + @@ -1204,10 +1204,10 @@ }, mounted () { - this.$nextTick(() => { this.height = window.innerHeight - 210 }) + this.$refs.objectID.focus() }, created () { @@ -1221,6 +1221,52 @@ }, methods: { + // 取消小键盘 + cancelKeyboard (e) { + // this.$refs.objectID + e.target.setAttribute('readonly', true); + setTimeout(() => { + e.target.removeAttribute('readonly'); + }, 100); + }, + + // 设备编码回车事件 + objectIdEnter () { + this.searchData.limit = this.pageSize + this.searchData.page = this.pageIndex + eamWorkOrderSearch(this.searchData).then(({data}) => { + if (data.code === 0) { + this.dataList = data.page.list + this.pageIndex = data.page.currPage + this.pageSize = data.page.pageSize + this.totalPage = data.page.totalCount + if (this.searchData.objectID != null && this.searchData.objectID !== '' && this.dataList.length > 0) { + if (this.dataList[0].status == '未开工') { + let tempData = { + site: this.dataList[0].site, + buNo: this.dataList[0].buNo, + functionType: 'B', + orderNo: this.dataList[0].orderNo, + status: '已到达' + } + this.$confirm(`是否确认到达?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + reach(tempData).then(({data}) => { + if (data && data.code === 0) { + this.reportModal(this.dataList[0]) + } + }) + }) + } else if (this.dataList[0].status == '已到达') { + this.reportModal(this.dataList[0]) + } + } + } + }) + }, // 获取用户的bu getSiteAndBuByUserName () {