From 393edfd5ad23fb192ee9a756991e6318227b4454 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Thu, 9 Oct 2025 11:44:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/orderIssure/inboundNotification.js | 3 +- .../orderIssure/inboundNotification.vue | 168 ++++++++++++++++-- .../productionInboundRequest.vue | 4 +- 3 files changed, 160 insertions(+), 15 deletions(-) diff --git a/src/api/orderIssure/inboundNotification.js b/src/api/orderIssure/inboundNotification.js index c94cdb7..6a8c0ea 100644 --- a/src/api/orderIssure/inboundNotification.js +++ b/src/api/orderIssure/inboundNotification.js @@ -4,4 +4,5 @@ export const getSiteAndBuByUserName = data => createAPI(`/orderIssure/issureNoti export const searchNotifyHeader= data => createAPI(`/orderUnissue/unissueNotify/searchUnissueNotifyHeader`,'post',data) export const createNotify = data => createAPI(`/orderIssure/issureNotify/createNotify`,'post',data) export const getSOScheduledRoutingListForIssure= data => createAPI(`/orderIssure/issureNotify/getSOScheduledRoutingListForIssure`,'post',data) -export const getNotifyNoDetail= data => createAPI(`/orderUnissue/unissueNotify/getNotifyNoDetail`,'post',data) \ No newline at end of file +export const getNotifyNoDetail= data => createAPI(`/orderUnissue/unissueNotify/getNotifyNoDetail`,'post',data) +export const searchNotifyMaterialList= data => createAPI(`/orderUnissue/unissueNotify/searchNotifyMaterialList`,'post',data) \ No newline at end of file diff --git a/src/views/modules/orderIssure/inboundNotification.vue b/src/views/modules/orderIssure/inboundNotification.vue index 5c55645..c526cc1 100644 --- a/src/views/modules/orderIssure/inboundNotification.vue +++ b/src/views/modules/orderIssure/inboundNotification.vue @@ -127,9 +127,9 @@ - + @@ -173,7 +173,7 @@ --> @@ -466,6 +466,48 @@ 关闭 + + +
+ + + + + +
+ + 关闭 + + @@ -478,6 +520,7 @@ import { searchNotifyHeader, createNotify, getNotifyNoDetail, + searchNotifyMaterialList, } from '@/api/orderIssure/inboundNotification.js' import Chooselist from '@/views/modules/common/Chooselist_eam' import { getChooselist } from '@/api/chooselist/chooselist.js' @@ -990,6 +1033,80 @@ export default { columnWidth: 100, }, ], + columnList3: [ + { + userId: this.$store.state.user.name, + functionId: 701001, + serialNumber: '701001Table3ComponentPartNo', + tableId: '701001Table3', + tableName: '领料申请BOM子表', + columnProp: 'componentPartNo', + headerAlign: 'center', + align: 'left', + columnLabel: '物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, + { + userId: this.$store.state.user.name, + functionId: 701001, + serialNumber: '701001Table3PartDesc', + tableId: '701001Table3', + tableName: '领料申请BOM子表', + columnProp: 'componentPartDesc', + headerAlign: 'center', + align: 'left', + columnLabel: '物料描述', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120, + }, + { + userId: this.$store.state.user.name, + functionId: 701001, + serialNumber: '701001Table3QtyToIssue', + tableId: '701001Table3', + tableName: '领料申请BOM子表', + columnProp: 'qtyToUnissue', + headerAlign: 'center', + align: 'right', + columnLabel: '本次退货数量', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 60, + }, + { + userId: this.$store.state.user.name, + functionId: 701001, + serialNumber: '701001Table3Remark', + tableId: '701001Table3', + tableName: '领料申请BOM子表', + columnProp: 'remark', + headerAlign: 'center', + align: 'left', + columnLabel: '备注', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150, + }, + ], columnDetailList: [ { userId: this.$store.state.user.name, @@ -1027,7 +1144,7 @@ export default { fixed: '', columnWidth: 80, }, - { + /* { userId: this.$store.state.user.name, functionId: 701001, serialNumber: '701001Table2PartNo', @@ -1045,8 +1162,8 @@ export default { fixed: '', columnWidth: 120, showOverflowTooltip: true, - }, - { + }, */ + /* { userId: this.$store.state.user.name, functionId: 701001, serialNumber: '701001Table2Qtyrequired', @@ -1063,7 +1180,7 @@ export default { status: true, fixed: '', columnWidth: 80, - }, + }, */ { userId: this.$store.state.user.name, functionId: 701001, @@ -1073,7 +1190,7 @@ export default { columnProp: 'unissureQty', headerAlign: 'center', align: 'right', - columnLabel: '报工数量', + columnLabel: '退料数量', columnHidden: false, columnImage: false, columnSortable: false, @@ -1088,10 +1205,10 @@ export default { serialNumber: '701001Table2SScheduleddate', tableId: '701001Table2', tableName: '查询工单', - columnProp: 'startDate', + columnProp: 'needDate', headerAlign: 'center', align: 'left', - columnLabel: '工单开始日期', + columnLabel: '退料时间', columnHidden: false, columnImage: false, columnSortable: false, @@ -1100,7 +1217,7 @@ export default { fixed: '', columnWidth: 100, }, - { + /* { userId: this.$store.state.user.name, functionId: 701001, serialNumber: '701001Table2SScheduleddate', @@ -1118,7 +1235,7 @@ export default { fixed: '', columnWidth: 100, }, - /* { + { userId: this.$store.state.user.name, functionId: 701001, serialNumber: '701001Table2SWorkcenterno', @@ -1317,6 +1434,9 @@ export default { bomLoadFlag: false, sobomList: [], itemNo: '', + materialModalFlag: false, + sobomData:{}, + notifyNo:'', } }, @@ -2093,6 +2213,30 @@ export default { }) }, + enterSOSDetail(row) { + let rows = { + site: this.$store.state.user.site, + notifyNo: this.currentRow.notifyNo, + soorderNo: row.soorderNo, + seqNo: row.seqNo, + partNo: row.fgpartNo, + itemNo: row.itemNo, + } + + this.searchUnissueNotifyMaterialList(rows) + }, + searchUnissueNotifyMaterialList(row){ + this.bomLoadFlag = true + this.materialModalFlag = true + searchNotifyMaterialList(row).then(({ data }) => { + if (data.code === 0) { + this.sobomList = data.rows + } + }).finally(() => { + this.bomLoadFlag = false + }) + }, + // 获取 tableDefault 列 async getColumnList(tableId, columnId) { let queryTable = { diff --git a/src/views/modules/productionInbound/productionInboundRequest.vue b/src/views/modules/productionInbound/productionInboundRequest.vue index 3992be4..3ab328f 100644 --- a/src/views/modules/productionInbound/productionInboundRequest.vue +++ b/src/views/modules/productionInbound/productionInboundRequest.vue @@ -1594,7 +1594,7 @@ export default { let inData = { site: this.$store.state.user.site, notifyNo: this.notifyNo, - fgPartNo: row.partNo, + fgpartNo: row.partNo, soorderNo: row.orderNo, opsItemNo: row.itemNo, seqNo: row.seqNo, @@ -1629,7 +1629,7 @@ export default { notifyNo: this.notifyNo, soorderNo: row.soorderNo, seqNo: row.seqNo, - partNo: row.fgPartNo, + partNo: row.fgpartNo, itemNo: row.itemNo, }