From 6443c669da432b74292ff6cb8ce284b1fd690662 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 17 Oct 2025 13:29:18 +0800 Subject: [PATCH] =?UTF-8?q?2025-10-17=20=E8=BF=87=E7=AB=99=E9=87=87?= =?UTF-8?q?=E9=9B=86=E6=8A=A5=E5=B7=A5=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E5=B2=97=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/yieldReport/produce_order.js | 6 + .../modules/yieldReport/com_finish_roll.vue | 29 ++ .../yieldReport/com_produce_report_normal.vue | 5 +- .../yieldReport/com_split_order_report.vue | 3 +- .../yieldReport/com_switch_operator.vue | 287 +++++++++++++----- .../otherReport/change_packaging.vue | 3 +- .../otherReport/fqc_produce_report_normal.vue | 3 +- .../otherReport/fqc_split_roll_report.vue | 3 +- .../otherReport/rework_inspect_report.vue | 3 +- 9 files changed, 262 insertions(+), 80 deletions(-) diff --git a/src/api/yieldReport/produce_order.js b/src/api/yieldReport/produce_order.js index 0cb67be..aef21e9 100644 --- a/src/api/yieldReport/produce_order.js +++ b/src/api/yieldReport/produce_order.js @@ -50,3 +50,9 @@ export const removeOperatorOnDuty = data => createAPI('schedule/removeOperatorOn // 删除操作员数据 export const deleteOperatorData = data => createAPI('schedule/deleteOperatorData', 'POST', data) + +// 更新单行操作员时间 +export const updateOperatorTime = data => createAPI('schedule/updateOperatorTime', 'POST', data) + +// 批量更新操作员时间 +export const batchUpdateOperatorTime = data => createAPI('schedule/batchUpdateOperatorTime', 'POST', data) diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue index d97d060..9597dac 100644 --- a/src/views/modules/yieldReport/com_finish_roll.vue +++ b/src/views/modules/yieldReport/com_finish_roll.vue @@ -25,6 +25,10 @@ {{buttons.closeButton}} + + + 考勤修改 + @@ -232,6 +236,11 @@ + + + + @@ -241,6 +250,7 @@ /*添加组件*/ import comExceptionReason from "./com_exception_reason";//异常远远 import comSelectShift from "./com_select_shift";//班次选择的组件 + import comSwitchOperator from './com_switch_operator';//操作员切换(考勤修改) import { getCurrentRollReportedQty, countSfdcTimeQty, @@ -283,6 +293,7 @@ export default { showDefault: false, showExceptionFlag: false, showShiftFlag: false, + showOperatorFlag: false, showNumFlag:false, sfdcTimeList: [], preItemNo: 0, @@ -907,6 +918,7 @@ export default { comExceptionReason,/*异常原因的组件*/ comSelectShift,/*班次选择的组件*/ comRollLabel, + comSwitchOperator,/*操作员切换(考勤修改)*/ }, methods: { sORoutingPreviousOperationItemNo(){ @@ -1315,6 +1327,23 @@ export default { this.pageData.remark = username+"更改了班次." }, + /*打开考勤修改对话框*/ + openAttendanceModal() { + //打开操作员切换功能(考勤修改模式) + this.showOperatorFlag = true; + this.$nextTick(() => { + // 构造派工单信息 + const scheduleRow = { + site: this.scheduleData.site || this.$store.state.user.site, + orderNo: this.scheduleData.orderNo, + itemNo: this.scheduleData.itemNo, + seqNo: this.scheduleData.seqNo + }; + // 第三个参数为 true，表示考勤修改模式，不显示添加操作员功能 + this.$refs.comSwitchOperator.init(0, scheduleRow, true); + }); + }, + /*打印流转标签*/ printSfdcFlowLabel(sfdcRow){ //先查询打印的卷信息 diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index cb08c60..76b8935 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -4249,7 +4249,7 @@ export default { + this.scheduleData.resourceDesc + ' （' + this.operatorData.operatorName + '）'; } - //打开操作员切换功能，用于管理上下岗人员，机台操作人保持为当前登录人 + //打开操作员切换功能，用于管理上下岗人员 this.showOperatorFlag = true; this.$nextTick(() => { // 构造与 produce_order.vue 中 currentRow 相同格式的数据 @@ -4259,7 +4259,8 @@ export default { itemNo: this.scheduleData.itemNo, seqNo: this.scheduleData.seqNo }; - this.$refs.comSwitchOperator.init(0, scheduleRow); + // 第三个参数为 false，显示添加操作员功能 + this.$refs.comSwitchOperator.init(0, scheduleRow, false); }); }, diff --git a/src/views/modules/yieldReport/com_split_order_report.vue b/src/views/modules/yieldReport/com_split_order_report.vue index 4195ea0..24e9def 100644 --- a/src/views/modules/yieldReport/com_split_order_report.vue +++ b/src/views/modules/yieldReport/com_split_order_report.vue @@ -3742,7 +3742,8 @@ export default { itemNo: this.scheduleData.itemNo, seqNo: this.scheduleData.seqNo }; - this.$refs.comSwitchOperator.init(0, scheduleRow); + // 第三个参数为 false，显示添加操作员功能 + this.$refs.comSwitchOperator.init(0, scheduleRow, false); }); }, diff --git a/src/views/modules/yieldReport/com_switch_operator.vue b/src/views/modules/yieldReport/com_switch_operator.vue index 9d1bf9a..f1b4421 100644 --- a/src/views/modules/yieldReport/com_switch_operator.vue +++ b/src/views/modules/yieldReport/com_switch_operator.vue @@ -1,9 +1,9 @@