From 7d442fa797c22776315868ae828d5f2c22c06bd5 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 20 Mar 2026 16:55:31 +0800 Subject: [PATCH] =?UTF-8?q?2026-03-20=201=E3=80=81=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=88=86=E5=8D=B7=E7=9A=84=E3=80=90=E4=BA=A7=E9=87=8F=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E3=80=91=E8=B0=83=E7=94=A8=E5=AD=98=E5=82=A8=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E6=97=B6=E5=A2=9E=E5=8A=A0=E4=B8=8D=E8=89=AF=E6=95=B0?= =?UTF-8?q?=E5=8F=82=E6=95=B0=202=E3=80=81=E5=90=88=E5=B9=B6=E5=8D=B7?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E5=BD=93=E5=89=8D=E5=8D=B7=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/boxManage/saleBoxManage.vue | 35 +++++++++++++++++-- .../modules/yieldReport/com_merge_roll.vue | 21 +++++------ .../modules/yieldReport/com_separate_roll.vue | 2 +- 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/src/views/modules/boxManage/saleBoxManage.vue b/src/views/modules/boxManage/saleBoxManage.vue index 351569c..bbdeaf4 100644 --- a/src/views/modules/boxManage/saleBoxManage.vue +++ b/src/views/modules/boxManage/saleBoxManage.vue @@ -189,8 +189,8 @@ @@ -249,6 +249,16 @@ label="创建人"> + + @@ -524,6 +534,9 @@ export default { totalQty: 0 }, selectedCaseRecords: [], + // 扫描装盒分页 + casesPageIndex: 1, + casesPageSize: 50, columnArray1: [ { userId: this.$store.state.user.name, @@ -871,6 +884,13 @@ export default { exportName: '销售出库单'+this.dayjs().format('YYYYMMDDHHmmss'), } }, + computed: { + casesPagedList() { + const start = (this.casesPageIndex - 1) * this.casesPageSize + return this.casesList.slice(start, start + this.casesPageSize) + } + }, + /*组件*/ components: { boxing, @@ -1035,6 +1055,16 @@ export default { }) }, + // 扫描装盒分页 - 每页条数变更 + sizeChangeCasesHandle(val) { + this.casesPageSize = val + this.casesPageIndex = 1 + }, + // 扫描装盒分页 - 当前页变更 + currentChangeCasesHandle(val) { + this.casesPageIndex = val + }, + // ===== 盒清单相关方法 ===== refreshCasesTable(){ let templateData = { @@ -1044,6 +1074,7 @@ export default { } searchSoReceiveCasesData(templateData).then(({data}) => { this.casesList = data.rows || [] + this.casesPageIndex = 1 // 更新统计数据 - 从列表第一条记录中获取 if (data.rows && data.rows.length > 0) { const firstRecord = data.rows[0] diff --git a/src/views/modules/yieldReport/com_merge_roll.vue b/src/views/modules/yieldReport/com_merge_roll.vue index 513bb1a..00c0334 100644 --- a/src/views/modules/yieldReport/com_merge_roll.vue +++ b/src/views/modules/yieldReport/com_merge_roll.vue @@ -19,10 +19,11 @@ - @@ -57,8 +58,8 @@ - @@ -271,7 +272,7 @@ export default { /*扫描新卷卷号获取数量*/ scanNewRoll() { const newRollNo = this.pageData.newRollNo; - + if (!newRollNo || newRollNo.trim() === '') { this.$message.warning('请输入新卷卷号！'); return; @@ -316,21 +317,21 @@ export default { /*检验当前卷数量的有效性*/ checkValidQty() { let rollQty = parseFloat(this.pageData.rollQty); - + // 处理无效值 if (isNaN(rollQty) || rollQty < 0) { this.pageData.rollQty = this.originalRollQty; this.$message.warning('当前卷数量无效，已重置为原始数量！'); return; } - + // 校验不能超过原始数量 if (rollQty > this.originalRollQty) { this.$message.warning(`当前卷数量不能超过原始数量 ${this.originalRollQty}！`); this.pageData.rollQty = this.originalRollQty; return; } - + this.pageData.rollQty = rollQty; this.calculateTotalQty(); }, @@ -455,7 +456,7 @@ export default { this.$message.error(data.msg); } else { this.$message.success(data.msg); - + // 打印标签 - 使用新的打印方式 if (data.printData) { // 存储过程返回了打印参数 @@ -471,7 +472,7 @@ export default { }); } } - + //延时一秒关闭 setTimeout(() => { this.closeDialog(); diff --git a/src/views/modules/yieldReport/com_separate_roll.vue b/src/views/modules/yieldReport/com_separate_roll.vue index f7ba4b1..af0c538 100644 --- a/src/views/modules/yieldReport/com_separate_roll.vue +++ b/src/views/modules/yieldReport/com_separate_roll.vue @@ -1431,7 +1431,7 @@ export default { ...this.pageData, rollQty: totalGoodQty, // 该卷的良品总数 rollNums: 1, // 固定为1 - totalDefectQty: totalDefectQty, // 该卷的不良总数 + defectQty: totalDefectQty, // 该卷的不良总数 rollRows: rollRows, // 该卷包含的排数据 remark: rollRemark // 该卷的备注 }