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 @@
-
+
-
+