From c9482940fc189b6f698a6521d20b465012a9922c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Wed, 16 Jul 2025 17:19:07 +0800
Subject: [PATCH] =?UTF-8?q?1.TPM=E7=BA=A2=E7=89=8C=E4=B8=8B=E8=BE=BE?=
=?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=83=BD=E5=A4=9F=E9=87=8D=E6=96=B0=E9=80=89?=
=?UTF-8?q?=E6=8B=A9=E8=AE=A1=E5=88=92=E6=89=A7=E8=A1=8C=E4=BA=BA=E5=91=98?=
=?UTF-8?q?=202.=E5=AD=98=E5=9C=A8=E4=BA=8B=E9=A1=B9=E8=B7=9F=E8=B8=AA?=
=?UTF-8?q?=E7=9A=84TPM=E7=BA=A2=E7=89=8C=E4=B9=9F=E5=85=81=E8=AE=B8?=
=?UTF-8?q?=E4=B8=8B=E8=BE=BE=E3=80=81=E5=8F=96=E6=B6=88=E8=AF=A5=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=202.=E6=8D=A2=E7=BA=BF=E4=B8=93=E5=AE=B6=E7=BB=84?=
=?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=89=A7=E8=A1=8C=E5=8A=9F=E8=83=BD=EF=BC=9A?=
=?UTF-8?q?=E8=BD=AC=E5=8D=95=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=8F=91=E9=80=81?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/eam/eam.js | 1 +
src/views/modules/eam/eamFeedBack.vue | 127 +++++++++++++-----
.../reportWorkOrder/reportDefectOrder.vue | 2 +-
.../reportWorkOrder/reportDefectOrder2.vue | 4 +-
4 files changed, 99 insertions(+), 35 deletions(-)
diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js
index ec0e889..cce9e30 100644
--- a/src/api/eam/eam.js
+++ b/src/api/eam/eam.js
@@ -170,6 +170,7 @@ export const getDeptList= data => createAPI(`/pms/eam/getDeptList`,'post',data)
export const updateReportResult= data => createAPI(`/pms/eam/updateReportResult`,'post',data)
export const saveEamGzBbData= data => createAPI(`/pms/eam/saveEamGzBbData`,'post',data)
export const getFeedBackId= data => createAPI(`/pms/eam/getFeedBackId`,'post',data)
+export const updateEamDefectFeedBackPlanOperator= data => createAPI(`/pms/eam/updateEamDefectFeedBackPlanOperator`,'post',data)
//---------------文档类型定义-------------------
export const eamDocumentTypeSearch= data => createAPI(`/pms/eam/eamDocumentTypeSearch`,'post',data)
diff --git a/src/views/modules/eam/eamFeedBack.vue b/src/views/modules/eam/eamFeedBack.vue
index e037522..307e075 100644
--- a/src/views/modules/eam/eamFeedBack.vue
+++ b/src/views/modules/eam/eamFeedBack.vue
@@ -48,11 +48,11 @@
+
-
@@ -146,8 +146,8 @@
width="130"
label="操作">
- 取消反馈
- 下达
+ 取消反馈
+ 下达
事项
@@ -163,6 +163,20 @@
layout="total, sizes, prev, pager, next, jumper">
+
+
+
+
+ 选择计划执行人员
+
+
+
+
+ 保存
+ 关闭
+
+
+
@@ -461,6 +475,7 @@
deleteFeedMatter, // 删除维修事项
getUserRoleList, // 获取用户角色列表
getOperatorListByOrder, // 获取用户列表
+ updateEamDefectFeedBackPlanOperator, // 更新计划执行人员
} from "@/api/eam/eam.js"
import {
getTableDefaultListLanguage,
@@ -489,6 +504,10 @@
return {
uploadDialog: false,
repairReportingTypeFlag:true,
+ chooseReachModelFlag: false,
+ xdrowData:{},
+ xdplanOperator:'',
+ xdplanOperatorName:'',
uploadData: {
folder: '',
title: '',
@@ -1218,9 +1237,26 @@
this.saveModalData.repairType = '设备维修组'
}
},
+ reach () {
+ console.log('1')
+ if (this.xdplanOperatorName === '' || this.xdplanOperatorName == null) {
+ this.$message.warning('请选择计划执行人员！')
+ return
+ }
+ console.log('2')
+ let tempData = {
+ ...this.xdrowData,
+ planOperator: this.xdplanOperator,
+ planOperatorName: this.xdplanOperatorName
+ }
+ updateEamDefectFeedBackPlanOperator(tempData).then()
+ this.chooseReachModelFlag = false
+ this.createDefectOrderModel(this.xdrowData)
+ },
// 新增模态框
saveModal () {
+ this.saveModalData.bu = ''
// 获取反馈单号
getFeedBackId().then(({data}) => {
if (data.code === 0) {
@@ -1394,29 +1430,50 @@
}).catch(() => {
})
},
-
+ createDefectOrderModel1(row){
+ this.xdplanOperator = row.planOperator
+ this.xdplanOperatorName = row.planOperatorName
+ this.chooseReachModelFlag=true
+ this.xdrowData = row
+ this.saveModalData.bu = row.site+'_'+row.buNo
+ },
// 下达
createDefectOrderModel (row) {
- this.$confirm(`是否下达反馈单?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(() => {
- saveDefectOrder(row).then(({data}) => {
- if (data && data.code === 0) {
- this.getDataList()
- this.$message({
- message: '操作成功',
- type: 'success',
- duration: 1500,
- onClose: () => {}
- })
- } else {
- this.$alert(data.msg, '错误', {
- confirmButtonText: '确定'
- })
- }
- })
+ // this.$confirm(`是否下达反馈单?`, '提示', {
+ // confirmButtonText: '确定',
+ // cancelButtonText: '取消',
+ // type: 'warning'
+ // }).then(() => {
+ // saveDefectOrder(row).then(({data}) => {
+ // if (data && data.code === 0) {
+ // this.getDataList()
+ // this.$message({
+ // message: '操作成功',
+ // type: 'success',
+ // duration: 1500,
+ // onClose: () => {}
+ // })
+ // } else {
+ // this.$alert(data.msg, '错误', {
+ // confirmButtonText: '确定'
+ // })
+ // }
+ // })
+ // })
+ saveDefectOrder(row).then(({data}) => {
+ if (data && data.code === 0) {
+ this.getDataList()
+ this.$message({
+ message: '操作成功',
+ type: 'success',
+ duration: 1500,
+ onClose: () => {}
+ })
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
})
},
@@ -1779,16 +1836,22 @@
// 选中人员
operatorClick (row) {
- // 找到operatorList中actualOrderCount最小值
- const minActualOrderCount = Math.min(...this.operatorList.map(item => item.actualOrderCount));
- if (row.actualOrderCount === minActualOrderCount) {
- // 只有actualOrderCount最小的行允许选择
- this.saveModalData.planOperator = row.adminID;
- this.saveModalData.planOperatorName = row.adminName;
+ if (this.chooseReachModelFlag){
+ this.xdplanOperator = row.adminID;
+ this.xdplanOperatorName = row.adminName;
this.operatorModelFlag = false;
} else {
- // 不是最小，给提示或不做处理
- this.$message.warning('只能选择实际维修工单数最小的人员！');
+ // 找到operatorList中actualOrderCount最小值
+ const minActualOrderCount = Math.min(...this.operatorList.map(item => item.actualOrderCount));
+ if (row.actualOrderCount === minActualOrderCount) {
+ // 只有actualOrderCount最小的行允许选择
+ this.saveModalData.planOperator = row.adminID;
+ this.saveModalData.planOperatorName = row.adminName;
+ this.operatorModelFlag = false;
+ } else {
+ // 不是最小，给提示或不做处理
+ this.$message.warning('只能选择实际维修工单数最小的人员！');
+ }
}
},
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index 8dcf1f9..628e05e 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -212,7 +212,7 @@
-
+
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder2.vue b/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
index 7f88a30..0162127 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
@@ -204,10 +204,10 @@
-
+
-
+