diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue index 53aaac0..b81fed8 100644 --- a/src/views/modules/ecss/codelnotifyConfirm.vue +++ b/src/views/modules/ecss/codelnotifyConfirm.vue @@ -348,21 +348,26 @@ - + - + - + + + + + + @@ -391,7 +396,7 @@ @@ -720,6 +725,7 @@ grossWeight:'', netWeight:'', palletRemark:'', + rolls:'', }, boxModelFlag:false, @@ -2533,12 +2539,15 @@ }); }, /** - * 根据物料装箱数量自动计算总箱数、毛重和净重 + * 根据物料装箱数量自动计算总箱数、毛重、净重和总Rolls */ calculateTotalBoxQtyAndWeights() { // 获取有装箱数量的物料列表 const selectedRows = this.dataList8.filter(item => item.useQty && item.useQty > 0); + // 先计算总Rolls（不管是否有缓存属性，都可以汇总） + this.calculateTotalRolls(); + if (selectedRows.length === 0) { // 没有装箱数量时，清空 this.palletModelData.boxQty = null; @@ -2581,6 +2590,30 @@ this.palletModelData.grossWeight = parseFloat(totalGrossWeight.toFixed(2)); this.palletModelData.netWeight = parseFloat(totalNetWeight.toFixed(2)); }, + + /** + * 汇总明细的Rolls总和 + */ + calculateTotalRolls() { + let totalRolls = 0; + this.dataList8.forEach(row => { + const rollsValue = parseFloat(row.rolls); + if (!isNaN(rollsValue) && rollsValue > 0) { + totalRolls += rollsValue; + } + }); + // 自动填入总Rolls（取整） + this.$set(this.palletModelData, 'rolls', totalRolls > 0 ? Math.round(totalRolls) : null); + }, + + /** + * 延迟计算总Rolls（等待v-model更新完成） + */ + delayCalculateTotalRolls() { + this.$nextTick(() => { + this.calculateTotalRolls(); + }); + }, /** * 根据箱数自动计算毛重和净重 * 计算公式（来自后端代码2991-2992行）： diff --git a/src/views/modules/ecss/components/PackingDetailTab.vue b/src/views/modules/ecss/components/PackingDetailTab.vue index b11d057..9787b35 100644 --- a/src/views/modules/ecss/components/PackingDetailTab.vue +++ b/src/views/modules/ecss/components/PackingDetailTab.vue @@ -117,21 +117,26 @@ :close-on-click-modal="false"> - + - + - + + + + + +
@@ -258,6 +263,20 @@ + + + + - + @@ -342,7 +362,8 @@ export default { item_no: '', box_qty: 1, grossWeight: 0, - netWeight: 0 + netWeight: 0, + rolls: 0 }, editBoxSubmitting: false, currentEditBox: null, @@ -537,6 +558,24 @@ export default { fixed: '', columnWidth: 50 }, + { + userId: this.$store.state.user.name, + functionId: 801002, + serialNumber: '801002TableNetWeight', + tableId: "801002Table3", + tableName: "装箱明细", + columnProp: "rolls", + headerAlign: "center", + align: "right", + columnLabel: "总Rolls", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 50 + }, ] } }, @@ -714,6 +753,7 @@ export default { this.editBoxForm.box_qty = boxRow.box_qty; this.editBoxForm.grossWeight = boxRow.grossWeight; this.editBoxForm.netWeight = boxRow.netWeight; + this.editBoxForm.rolls = boxRow.rolls; this.editBoxDialogVisible = true; }, @@ -863,6 +903,7 @@ export default { box_qty: this.editBoxForm.box_qty, grossWeight: this.editBoxForm.grossWeight, netWeight: this.editBoxForm.netWeight, + rolls: this.editBoxForm.rolls, updateBy: this.$store.state.user.name }; @@ -1090,6 +1131,7 @@ export default { box_qty: box.box_qty, grossWeight: box.grossWeight, netWeight: box.netWeight, + rolls: box.rolls, // Box的总Rolls // 明细信息 _detailKey: `${detail.seqNo}_${detail.itemNo}_${detail.notifyDetailItemNo}`, _hasDetail: true, @@ -1099,14 +1141,14 @@ export default { poNo: detail.poNo, pn: detail.pn, qty: detail.qty, - rolls: detail.rolls + detailRolls: detail.rolls // 明细的Rolls }; tableData.push(rowData); // 保存原始数据 this.batchEditOriginalData[rowData._detailKey] = { qty: detail.qty, - rolls: detail.rolls + detailRolls: detail.rolls }; }); @@ -1114,7 +1156,8 @@ export default { this.batchEditOriginalData[this.getBoxRowKey(box)] = { box_qty: box.box_qty, grossWeight: box.grossWeight, - netWeight: box.netWeight + netWeight: box.netWeight, + rolls: box.rolls }; } else { // 没有明细时，创建一行空明细的数据 @@ -1127,11 +1170,12 @@ export default { box_qty: box.box_qty, grossWeight: box.grossWeight, netWeight: box.netWeight, + rolls: box.rolls, // Box的总Rolls _hasDetail: false, poNo: '', pn: '', qty: '', - rolls: '' + detailRolls: '' }; tableData.push(rowData); @@ -1139,7 +1183,8 @@ export default { this.batchEditOriginalData[this.getBoxRowKey(box)] = { box_qty: box.box_qty, grossWeight: box.grossWeight, - netWeight: box.netWeight + netWeight: box.netWeight, + rolls: box.rolls }; } } @@ -1158,8 +1203,8 @@ export default { * 表格行合并方法 */ batchEditSpanMethod({ row, column, rowIndex, columnIndex }) { - // Box信息列（前4列：序号、箱数、毛重、净重）需要合并 - if (columnIndex < 4) { + // Box信息列（前5列：序号、箱数、毛重、净重、总Rolls）需要合并 + if (columnIndex < 5) { if (row._isFirstRowOfBox) { return { rowspan: row._rowSpan, @@ -1372,6 +1417,63 @@ export default { } }, + /** + * 明细Rolls输入事件处理 - 自动计算总Rolls + */ + onDetailRollsInput(row) { + this.$nextTick(() => { + this.calculateBoxTotalRolls(row); + }); + }, + + /** + * 计算同一Box下所有明细Rolls的总和 + */ + calculateBoxTotalRolls(row) { + const boxKey = row._boxKey; + + // 获取同一Box下的所有行 + const boxRows = this.batchEditTableData.filter(r => r._boxKey === boxKey && r._hasDetail); + + // 计算明细Rolls总和 + let totalDetailRolls = 0; + let hasDetailRolls = false; + + boxRows.forEach(r => { + const rollsValue = parseFloat(r.detailRolls); + if (!isNaN(rollsValue) && rollsValue > 0) { + totalDetailRolls += rollsValue; + hasDetailRolls = true; + } + }); + + // 计算新的总Rolls值（有明细Rolls则计算，否则清空） + const newRolls = hasDetailRolls ? Math.round(totalDetailRolls) : null; + + // 同步更新所有同Box的行的总Rolls + this.batchEditTableData.forEach(r => { + if (r._boxKey === boxKey) { + this.$set(r, 'rolls', newRolls); + } + }); + + // 触发Box字段变化检测 + this.onBatchBoxFieldChange(row, 'rolls'); + }, + + /** + * 检查Box是否有明细Rolls值（用于禁用总Rolls输入） + */ + hasDetailRolls(row) { + const boxKey = row._boxKey; + const boxRows = this.batchEditTableData.filter(r => r._boxKey === boxKey && r._hasDetail); + + return boxRows.some(r => { + const rollsValue = parseFloat(r.detailRolls); + return !isNaN(rollsValue) && rollsValue > 0; + }); + }, + /** * 获取批量编辑行样式 */ @@ -1411,7 +1513,8 @@ export default { palletRemark: row.palletRemark, box_qty: row.box_qty, grossWeight: row.grossWeight, - netWeight: row.netWeight + netWeight: row.netWeight, + rolls: row.rolls // Box的总Rolls }); } @@ -1429,7 +1532,7 @@ export default { poNo: row.poNo, pn: row.pn, qty: row.qty, - rolls: row.rolls + rolls: row.detailRolls // 明细的Rolls }); } @@ -1596,7 +1699,7 @@ export default { .batch-edit-toolbar { margin-bottom: 10px; display: flex; - justify-content: flex-end; + justify-content: flex-start; } /* 批量编辑弹窗样式 */