From 96fa208ed5f947f1d1d6e0c3559c8be605026f20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Tue, 15 Jul 2025 09:03:39 +0800
Subject: [PATCH] =?UTF-8?q?TPM=E7=BB=B4=E4=BF=AE=E5=AE=A1=E6=A0=B8?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=AE=A1=E6=A0=B8?=
=?UTF-8?q?=E9=80=80=E5=9B=9E=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5isReturn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/eam/eamWorkOrderForApprove.vue | 4 +--
.../modules/eam/eamWorkOrderForDefect.vue | 4 +--
.../modules/eam/eamWorkOrderForDefect2.vue | 4 +--
.../reportWorkOrder/reportDefectOrder.vue | 26 ++++++++++++++++---
.../reportWorkOrder/reportDefectOrder2.vue | 26 ++++++++++++++++---
5 files changed, 50 insertions(+), 14 deletions(-)
diff --git a/src/views/modules/eam/eamWorkOrderForApprove.vue b/src/views/modules/eam/eamWorkOrderForApprove.vue
index a007f1e..966d69e 100644
--- a/src/views/modules/eam/eamWorkOrderForApprove.vue
+++ b/src/views/modules/eam/eamWorkOrderForApprove.vue
@@ -279,7 +279,7 @@
- 取消审核
+ 审核退回
审核
@@ -1473,7 +1473,7 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- this.submitData.status = '待审核'
+ this.submitData.status = '已到达'
submitDefect(this.submitData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index ffa87e1..f2c1ce5 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@@ -318,7 +318,7 @@
维修记录移至知识库
- 取消审核
+ 审核退回
审核
@@ -2140,7 +2140,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- this.submitData.status = '待审核'
+ this.submitData.status = '已到达'
submitDefect(this.submitData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
diff --git a/src/views/modules/eam/eamWorkOrderForDefect2.vue b/src/views/modules/eam/eamWorkOrderForDefect2.vue
index 574aede..57dd33e 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect2.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect2.vue
@@ -319,7 +319,7 @@
维修记录移至知识库
- 取消审核
+ 审核退回
审核
@@ -2142,7 +2142,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- this.submitData.status = '待审核'
+ this.submitData.status = '已到达'
submitDefect(this.submitData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index e96d5d5..8dcf1f9 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -212,10 +212,13 @@
-
-
+
+
-
+
+
+
+
@@ -755,6 +758,7 @@
return {
coreComponentFlag: false,
uploadDialog: false,
+ planPeople:'',
uploadData: {
folder: '',
title: '',
@@ -2247,6 +2251,7 @@
this.operatorData.bu = row.site + '_' + row.buNo
this.reachData = row
this.chooseReachModelFlag = true
+ this.planPeople = row.planOperatorName
},
// 到达
@@ -2255,6 +2260,12 @@
this.$message.warning('请选择到达人员！')
return
}
+ if (!this.planPeople==''){
+ if (!this.saveData.operatorName.includes(this.planPeople)){
+ this.$message.warning('到达人员中不包含计划人员！')
+ return
+ }
+ }
let tempData = {
site: this.saveData.site,
buNo: this.saveData.buNo,
@@ -2321,7 +2332,8 @@
reachOperatorName: row.reachOperatorName,
urgency: row.urgency,
responseTime: row.responseTime,
- shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否'
+ shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否',
+ isReturn: row.isReturn
}
this.activeTable = 'inspection_form'
this.detailModelFlag = true
@@ -2352,6 +2364,12 @@
this.$message.warning('请填写处理方式，且大于十个字数！')
return
}
+ if (!this.saveData.planOperatorName==''){
+ if (!this.saveData.operatorName.includes(this.saveData.planOperatorName)){
+ this.$message.warning('实际执行人员中不包含计划人员，请检查！')
+ return
+ }
+ }
saveOrderReportForDefect(this.saveData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder2.vue b/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
index 382e697..7f88a30 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
@@ -204,10 +204,13 @@
-
-
+
+
-
+
+
+
+
@@ -745,6 +748,7 @@ export default {
return {
coreComponentFlag: false,
uploadDialog: false,
+ planPeople:'',
uploadData: {
folder: '',
title: '',
@@ -2235,6 +2239,7 @@ export default {
this.operatorData.bu = row.site + '_' + row.buNo
this.reachData = row
this.chooseReachModelFlag = true
+ this.planPeople = row.planOperatorName
},
// 到达
@@ -2243,6 +2248,12 @@ export default {
this.$message.warning('请选择到达人员！')
return
}
+ if (!this.planPeople==''){
+ if (!this.saveData.operatorName.includes(this.planPeople)){
+ this.$message.warning('到达人员中不包含计划人员！')
+ return
+ }
+ }
let tempData = {
site: this.saveData.site,
buNo: this.saveData.buNo,
@@ -2308,7 +2319,8 @@ export default {
reachOperatorName: row.reachOperatorName,
urgency: row.urgency,
responseTime: row.responseTime,
- shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否'
+ shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否',
+ isReturn: row.isReturn
}
this.activeTable = 'inspection_form'
this.detailModelFlag = true
@@ -2339,6 +2351,12 @@ export default {
this.$message.warning('请填写处理方式，且大于十个字数！')
return
}
+ if (!this.saveData.planOperatorName==''){
+ if (!this.saveData.operatorName.includes(this.saveData.planOperatorName)){
+ this.$message.warning('实际执行人员中不包含计划人员，请检查！')
+ return
+ }
+ }
saveOrderReportForDefect(this.saveData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()