From a407f4c025381f4e8f8076cfaa7c70a72f5f0a23 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 14 Jul 2026 09:27:56 +0800 Subject: [PATCH] =?UTF-8?q?2026-07-14=20=E5=BC=82=E5=B8=B8=E8=A7=84?= =?UTF-8?q?=E5=88=99=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/sceneExceptionRuleConfig.vue | 8 ++-- .../modules/yieldReport/produce_order.vue | 48 +++++++++++++++---- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/src/views/modules/sys/sceneExceptionRuleConfig.vue b/src/views/modules/sys/sceneExceptionRuleConfig.vue index f3710ef..51dfb92 100644 --- a/src/views/modules/sys/sceneExceptionRuleConfig.vue +++ b/src/views/modules/sys/sceneExceptionRuleConfig.vue @@ -29,10 +29,10 @@ align="center" width="50"> - - - - + + + + diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index 88d7e90..d91b965 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -136,7 +136,6 @@ - - + + { - this.height = window.innerHeight - 235 + this.height = window.innerHeight - 243 }) }, methods: { @@ -1819,15 +1832,35 @@ export default { } // 开始真的查询; this.searchData.searchFlag = true + this.searchData.page = this.pageIndex + this.searchData.limit = this.pageSize + this.searchData.exportFlag = 'N' + this.dataListLoading = true getProduceScheduleList(this.searchData).then(({data}) => { // 设置查询数据 - this.produceScheduleList = data.rows + this.produceScheduleList = data.rows || [] + this.totalPage = data.total || 0 + this.currentRow = {} + }).finally(() => { + this.dataListLoading = false }) }, /* 刷新页面table */ refreshPageTables() { this.currentRow = {} + this.pageIndex = 1 + this.getProduceScheduleList() + }, + // 主表分页大小改变 + sizeChangeHandle(val) { + this.pageSize = val + this.pageIndex = 1 + this.getProduceScheduleList() + }, + // 主表当前页改变 + currentChangeHandle(val) { + this.pageIndex = val this.getProduceScheduleList() }, /* 设置选中行的参数 */ @@ -2287,12 +2320,7 @@ export default { const hasSeqNo = this.searchData.seqNo && this.searchData.seqNo.trim() !== '' const hasOrderNo = this.searchData.orderNo && this.searchData.orderNo.trim() !== '' if (hasResourceId || hasSeqNo || hasOrderNo) { - this.searchData.searchFlag = true; - getProduceScheduleList(this.searchData).then(({data}) => { - // 设置查询数据 - this.searchData.exportFlag = 'N'; - this.produceScheduleList = data.rows - }) + this.getProduceScheduleList() } })