From 8aa9300f6c6d397990e65b1ce46e111c506fc6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Thu, 20 Nov 2025 18:21:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9C=A8=E7=AB=8B=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/orderIssure/newSoIssueNotify.vue | 51 ++++++++++++++++--- .../orderIssure/searchIssureNotify.vue | 34 +++++++++++++ .../productionInboundRequest.vue | 4 +- .../modules/shipment/shipmentNotification.vue | 18 +++++++ 4 files changed, 97 insertions(+), 10 deletions(-) diff --git a/src/views/modules/orderIssure/newSoIssueNotify.vue b/src/views/modules/orderIssure/newSoIssueNotify.vue index 49c3b92..18684a0 100644 --- a/src/views/modules/orderIssure/newSoIssueNotify.vue +++ b/src/views/modules/orderIssure/newSoIssueNotify.vue @@ -426,7 +426,6 @@ export default { dataList2: [], dataList3: [], materialDetailList: [], - materialDetailColumnList: [], currentRow: '', dataListLoading: false, // 是否收藏 @@ -835,6 +834,24 @@ export default { fixed: false, columnWidth: 120, }, + { + userId: this.$store.state.user.name, + functionId: 555001, + serialNumber: '555001Table2IsInWh', + tableId: '555001Table2', + tableName: '查询工单及物料', + columnProp: 'isInWh', + headerAlign: 'center', + align: 'left', + columnLabel: '是否在立库', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false, + columnWidth: 100, + }, { userId: this.$store.state.user.name, functionId: 555001, @@ -872,7 +889,7 @@ export default { fixed: false, columnWidth: 100, }, - + { userId: this.$store.state.user.name, functionId: 555001, @@ -1056,6 +1073,24 @@ export default { fixed: false, columnWidth: 80, }, + { + userId: this.$store.state.user.name, + functionId: 555001, + serialNumber: '555001Table3IsInWh', + tableId: '555001Table3', + tableName: '查询工单及物料', + columnProp: 'isInWh', + headerAlign: 'center', + align: 'left', + columnLabel: '是否在立库', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false, + columnWidth: 100, + }, { userId: this.$store.state.user.name, functionId: 555001, @@ -1357,7 +1392,7 @@ export default { }, mounted() { - this.$nextTick(() => { + this.$nextTick(() => { this.height = window.innerHeight - 220 }) }, @@ -1803,7 +1838,7 @@ export default { this.$message.warning('该OrderNo的数据已存在，请先删除再添加！') return false } - + const dataListExists = this.dataList.some(row => row.soorderNo === this.seqNoData.orderNo) if (dataListExists) { this.$message.warning('该OrderNo的数据已添加过，请先删除再添加！') @@ -1811,7 +1846,7 @@ export default { } this.seqNoModalLoading = true getShopOrderAndMaterialByShoporder(this.seqNoData) - .then(({ data }) => { + .then(({ data }) => { if (data.code === 0) { if (!data.rows || data.rows.length === 0) { this.$message.warning('未查询到数据！') @@ -1991,7 +2026,7 @@ export default { xiadaNotify() { // 检查是否有明细记录 if ( - this.dataList.length == 0 + this.dataList.length == 0 ) { this.$alert('没有明细记录无法下达！!', '提示', { confirmButtonText: '确定', @@ -2008,7 +2043,7 @@ export default { }, confirmXiadaNotify() { if ( - this.dataList.length == 0 + this.dataList.length == 0 ) { this.$alert('没有明细记录无法下达！!', '提示', { confirmButtonText: '确定', @@ -2203,7 +2238,7 @@ export default { this.columnList4 = data.rows break; } - } + } }) }, diff --git a/src/views/modules/orderIssure/searchIssureNotify.vue b/src/views/modules/orderIssure/searchIssureNotify.vue index eae93e7..693df86 100644 --- a/src/views/modules/orderIssure/searchIssureNotify.vue +++ b/src/views/modules/orderIssure/searchIssureNotify.vue @@ -852,6 +852,23 @@ status: true, fixed: '', columnWidth: 100 + },{ + userId: this.$store.state.user.name, + functionId: 701002, + serialNumber: '701002Table3IsInWh', + tableId: "701002Table3", + tableName: "申请单材料明细表", + columnProp: "isInWh", + headerAlign: "center", + align: "center", + columnLabel: "是否进立库", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 },{ userId: this.$store.state.user.name, functionId: 701002, @@ -1010,6 +1027,23 @@ status: true, fixed: '', columnWidth: 100 + },{ + userId: this.$store.state.user.name, + functionId: 701002, + serialNumber: '701002Table4IsInWh', + tableId: "701002Table4", + tableName: "申请单材料明细表", + columnProp: "isInWh", + headerAlign: "center", + align: "center", + columnLabel: "是否进立库", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 },{ userId: this.$store.state.user.name, functionId: 701002, diff --git a/src/views/modules/productionInbound/productionInboundRequest.vue b/src/views/modules/productionInbound/productionInboundRequest.vue index a319c0e..8869de3 100644 --- a/src/views/modules/productionInbound/productionInboundRequest.vue +++ b/src/views/modules/productionInbound/productionInboundRequest.vue @@ -1874,7 +1874,7 @@ export default { }, saveNewUnissueMaterial() { for (let i = 0; i < this.seqNoList.length; i++) { - + const v = parseFloat(this.seqNoList[i].applyQty) if ( v && @@ -2104,7 +2104,7 @@ export default { }, xiadaNotifyModel() { if ( - this.dataList.length == 0 + this.dataList.length == 0 ) { this.$alert('没有明细记录无法下达！!', '提示', { confirmButtonText: '确定', diff --git a/src/views/modules/shipment/shipmentNotification.vue b/src/views/modules/shipment/shipmentNotification.vue index e12656e..893adc1 100644 --- a/src/views/modules/shipment/shipmentNotification.vue +++ b/src/views/modules/shipment/shipmentNotification.vue @@ -1094,6 +1094,24 @@ export default { fixed: '', columnWidth: 80, }, + { + userId: this.$store.state.user.name, + functionId: 701001, + serialNumber: '701001Table3IsInWh', + tableId: '701001Table3', + tableName: '领料申请BOM子表', + columnProp: 'isInWh', + headerAlign: 'center', + align: 'center', + columnLabel: '是否在立库', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, { userId: this.$store.state.user.name, functionId: 701001,