From f0b0c07f03045857f259fede7fd29d9e6706c302 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 20 Oct 2025 17:22:02 +0800 Subject: [PATCH] =?UTF-8?q?2025-10-20=20=E8=AE=A2=E5=8D=95=E6=8E=92?= =?UTF-8?q?=E4=BA=A7=EF=BC=88=E6=97=A0=E9=99=90=E4=BA=A7=E8=83=BD=EF=BC=89?= =?UTF-8?q?-=E3=80=8B=E6=8E=92=E4=BA=A7=E6=98=8E=E7=BB=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=9B=BA=E5=AE=9A=E8=BD=BD=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/yieldReport/com_separate_roll.js | 3 + .../schedule/com_schedule_order_expand.vue | 122 +++++++++++++++++- .../modules/yieldReport/com_separate_roll.vue | 97 +++++++++++++- 3 files changed, 219 insertions(+), 3 deletions(-) diff --git a/src/api/yieldReport/com_separate_roll.js b/src/api/yieldReport/com_separate_roll.js index edda3ba..960d2a7 100644 --- a/src/api/yieldReport/com_separate_roll.js +++ b/src/api/yieldReport/com_separate_roll.js @@ -17,3 +17,6 @@ export const otherCreateSplitSfdcRoll = data => createAPI('schedule/otherCreateS // 换包装分卷 export const workbenchCreateslittingrollRepackAction = data => createAPI('schedule/workbench_createslittingroll_Repack_action', 'POST', data) +// 获取固定载具列表 +export const getFixedCarrierList = data => createAPI('schedule/getFixedCarrierList', 'POST', data) + diff --git a/src/views/modules/schedule/com_schedule_order_expand.vue b/src/views/modules/schedule/com_schedule_order_expand.vue index 66ce357..74c5a1f 100644 --- a/src/views/modules/schedule/com_schedule_order_expand.vue +++ b/src/views/modules/schedule/com_schedule_order_expand.vue @@ -142,6 +142,21 @@ + + + 关闭 + + + +
+ + + + + + + + + + + + 查询 + + + + + + + + + + + + +
+ + 关闭 + + @@ -243,6 +316,8 @@ import { cancelSoSchedule,/*取消排产*/ } from '@/api/schedule/com_schedule_order_expand.js' +import { getFixedCarrierList } from '@/api/yieldReport/com_separate_roll.js' + import { searchSysLanguagePackList, searchSysLanguageParam, @@ -462,6 +537,15 @@ export default { orderScheduleList: [], scheduleDetailList: [], dataListLoading: false, + // 固定载具相关 + carrierDialogVisible: false, // 固定载具对话框 + carrierList: [], // 固定载具列表 + carrierSearchData: { // 固定载具查询条件 + carrierNo: '', + carrierTypeName: '', + specification: '' + }, + currentEditIndex: -1, // 当前编辑的行索引 columnTimeArray: [ { userId: this.$store.state.user.name, @@ -1362,11 +1446,46 @@ export default { itemNo: this.pageData.itemNo, resourceId: defaultResourceId, qtyRequired: 0, + carrierNo: '', // 固定载具 rowCount: 0, rollCount: 0 }); }, + /*打开固定载具选择对话框*/ + openCarrierDialog(index) { + this.currentEditIndex = index; + this.queryCarrierList(); + }, + + /*查询固定载具列表*/ + queryCarrierList() { + const params = { + site: this.$store.state.user.site, + carrierNo: this.carrierSearchData.carrierNo, + carrierTypeName: this.carrierSearchData.carrierTypeName, + specification: this.carrierSearchData.specification + } + getFixedCarrierList(params).then(({data}) => { + if (data && data.code === 0) { + this.carrierList = data.data + this.carrierDialogVisible = true + } else { + this.$message.error(data.msg || '获取固定载具列表失败') + } + }).catch(error => { + this.$message.error('获取固定载具列表失败: ' + error.message) + }) + }, + + /*选中固定载具*/ + selectCarrier(row) { + if (this.currentEditIndex >= 0 && this.currentEditIndex < this.scheduleDetailList.length) { + this.scheduleDetailList[this.currentEditIndex].carrierNo = row.carrierNo + this.carrierDialogVisible = false + } + }, + /*删除排产明细行*/ deleteScheduleDetail(index){ this.scheduleDetailList.splice(index, 1); @@ -1463,7 +1582,8 @@ export default { calendarId: this.pageData.calendarId, checkFlag: true, rowCount: item.rowCount, - rollCount: item.rollCount + rollCount: item.rollCount, + carrierNo: item.carrierNo // 固定载具 }; // 调用排产接口 diff --git a/src/views/modules/yieldReport/com_separate_roll.vue b/src/views/modules/yieldReport/com_separate_roll.vue index e256187..1d33729 100644 --- a/src/views/modules/yieldReport/com_separate_roll.vue +++ b/src/views/modules/yieldReport/com_separate_roll.vue @@ -23,8 +23,9 @@ - - + + 固定载具 + @@ -87,6 +88,64 @@ {{ buttons.closeButton }} + + + +
+ + + + + + + + + + + + 查询 + + + + + + + + + + + + +
+ + 关闭 + + @@ -94,6 +153,7 @@ import { checkCreateSplitSfdcRoll,/*校验是否可以创建分卷*/ createSplitSfdcRoll,/*执行创建分卷的操作*/ + getFixedCarrierList,/*获取固定载具列表*/ } from '@/api/yieldReport/com_separate_roll.js'; /*打印标签专用的js*/ @@ -175,6 +235,13 @@ export default { seqNo: '', showFlag: false }, + carrierModelFlag: false, // 固定载具对话框标记 + carrierList: [], // 固定载具列表 + carrierSearchData: { // 固定载具查询条件 + carrierNo: '', + carrierTypeName: '', + specification: '' + }, buttons: { confirmButton: '确定', closeButton: '关闭', @@ -388,6 +455,32 @@ export default { // ===================== 分卷优化方法结束 ===================== + // 查询固定载具列表 + queryFixedCarrierList() { + const params = { + site: this.scheduleData.site, + carrierNo: this.carrierSearchData.carrierNo, + carrierTypeName: this.carrierSearchData.carrierTypeName, + specification: this.carrierSearchData.specification + } + getFixedCarrierList(params).then(({data}) => { + if (data && data.code === 0) { + this.carrierList = data.data + this.carrierModelFlag = true + } else { + this.$message.error(data.msg || '获取固定载具列表失败') + } + }).catch(error => { + this.$message.error('获取固定载具列表失败: ' + error.message) + }) + }, + + // 选中固定载具 + selectCarrier(row) { + this.pageData.fixture = row.carrierNo + this.carrierModelFlag = false + }, + /*关闭modal*/ closeDialog(){ //刷新报工的页面