From acb42918319845092724ff5bbd84091a9619f7b5 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 3 Jul 2024 13:40:58 +0800 Subject: [PATCH] =?UTF-8?q?2024-07-03=20=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/qc/FAIResultEntry.vue | 109 +++++++++++++------ src/views/modules/qc/FQCResultEntry.vue | 109 +++++++++++++------ src/views/modules/qc/IPQCResultEntry.vue | 127 +++++++++++++++-------- src/views/modules/qc/IQCResultEntry.vue | 60 +++++++++-- 4 files changed, 295 insertions(+), 110 deletions(-) diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index 765c664..4f1ff70 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -583,34 +583,44 @@ 删除 批量新增
- - - - - - - - - - - - - + + + + + + + + + + + + + + + +
保存 @@ -1018,6 +1028,9 @@ pageIndex: 1, pageSize: 20, totalPage: 0, + pageIndex2: 1, + pageSize2: 20, + totalPage2: 0, height: 200, dataList: [], dataListSelections: [], @@ -2051,7 +2064,9 @@ maxValue: '', minValue: '', valueTypeDb: '', - subDetailValues:[] + subDetailValues:[], + page: 1, + limit: 10, }, options: [], FAISelections: [], @@ -3309,6 +3324,19 @@ this.getDataList() }, + // 子明细每页数 + sizeChangeHandle2 (val) { + this.pageSize2 = val + this.pageIndex2 = 1 + this.subDetailModal2() + }, + + // 子明细当前页 + currentChangeHandle2 (val) { + this.pageIndex2 = val + this.subDetailModal2() + }, + // 多选 selectionChangeHandle (val) { this.dataListSelections = val @@ -3515,8 +3543,15 @@ // 子明细记录信息查询 subDetailModal (row) { this.subDetailData = row + this.subDetailData.limit = this.pageSize2 + this.subDetailData.page = this.pageIndex2 selectFAISubDetailedRecord(this.subDetailData).then(({data}) => { - this.tableData = data.rows + if (data.code === 0) { + this.tableData = data.page.list + this.pageIndex2 = data.page.currPage + this.pageSize2 = data.page.pageSize + this.totalPage2 = data.page.totalCount + } }) this.batchAddData = { samplingLocation: '', @@ -3526,6 +3561,20 @@ this.subDetailFlag = true }, + // 子明细分页查询 + subDetailModal2 () { + this.subDetailData.limit = this.pageSize2 + this.subDetailData.page = this.pageIndex2 + selectFAISubDetailedRecord(this.subDetailData).then(({data}) => { + if (data.code === 0) { + this.tableData = data.page.list + this.pageIndex2 = data.page.currPage + this.pageSize2 = data.page.pageSize + this.totalPage2 = data.page.totalCount + } + }) + }, + // 审核按钮 submitResult () { let tempData1 = '' // 记录不是待审核状态的单号 diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index b8cc8b0..5cfe271 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -512,34 +512,44 @@ 删除 批量新增
- - - - - - - - - - - - - + + + + + + + + + + + + + + + +
保存 @@ -995,6 +1005,9 @@ pageIndex: 1, pageSize: 20, totalPage: 0, + pageIndex2: 1, + pageSize2: 20, + totalPage2: 0, height: 200, dataList: [], dataListSelections: [], @@ -2026,7 +2039,9 @@ maxValue: '', minValue: '', valueTypeDb: '', - subDetailValues:[] + subDetailValues:[], + page: 1, + limit: 10, }, options: [], FAISelections: [], @@ -3283,6 +3298,19 @@ this.getDataList() }, + // 子明细每页数 + sizeChangeHandle2 (val) { + this.pageSize2 = val + this.pageIndex2 = 1 + this.subDetailModal2() + }, + + // 子明细当前页 + currentChangeHandle2 (val) { + this.pageIndex2 = val + this.subDetailModal2() + }, + // 多选 selectionChangeHandle (val) { this.dataListSelections = val @@ -3489,8 +3517,15 @@ // 子明细记录信息查询 subDetailModal (row) { this.subDetailData = row + this.subDetailData.limit = this.pageSize2 + this.subDetailData.page = this.pageIndex2 selectFQCSubDetailedRecord(this.subDetailData).then(({data}) => { - this.tableData = data.rows + if (data.code === 0) { + this.tableData = data.page.list + this.pageIndex2 = data.page.currPage + this.pageSize2 = data.page.pageSize + this.totalPage2 = data.page.totalCount + } }) this.batchAddData = { samplingLocation: '', @@ -3500,6 +3535,20 @@ this.subDetailFlag = true }, + // 子明细分页查询 + subDetailModal2 () { + this.subDetailData.limit = this.pageSize2 + this.subDetailData.page = this.pageIndex2 + selectFQCSubDetailedRecord(this.subDetailData).then(({data}) => { + if (data.code === 0) { + this.tableData = data.page.list + this.pageIndex2 = data.page.currPage + this.pageSize2 = data.page.pageSize + this.totalPage2 = data.page.totalCount + } + }) + }, + // 审核按钮 submitResult () { let tempData1 = '' // 记录不是待审核状态的单号 diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 17bd819..41f1cbd 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -525,40 +525,50 @@ 删除 批量新增
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
保存 @@ -1022,6 +1032,9 @@ pageIndex: 1, pageSize: 20, totalPage: 0, + pageIndex2: 1, + pageSize2: 20, + totalPage2: 0, height: 200, dataList: [], dataListSelections: [], @@ -2078,7 +2091,9 @@ maxValue: '', minValue: '', valueTypeDb: '', - subDetailValues:[] + subDetailValues:[], + page: 1, + limit: 10, }, options: [], modalDisableFlag: false, @@ -3348,6 +3363,19 @@ this.getDataList() }, + // 子明细每页数 + sizeChangeHandle2 (val) { + this.pageSize2 = val + this.pageIndex2 = 1 + this.subDetailModal2() + }, + + // 子明细当前页 + currentChangeHandle2 (val) { + this.pageIndex2 = val + this.subDetailModal2() + }, + // 多选 selectionChangeHandle (val) { this.dataListSelections = val @@ -3560,15 +3588,16 @@ // 子明细记录信息查询 subDetailModal (row) { - // this.subDetailData.inspectionNo = row.inspectionNo - // this.subDetailData.itemNo = row.itemNo - // this.subDetailData.itemDesc = row.itemDesc - // this.subDetailData.defaultValue = row.defaultValue - // this.subDetailData.maxValue = row.maxValue - // this.subDetailData.minValue = row.minValue this.subDetailData = row + this.subDetailData.limit = this.pageSize2 + this.subDetailData.page = this.pageIndex2 selectIPQCSubDetailedRecord(this.subDetailData).then(({data}) => { - this.tableData = data.rows + if (data.code === 0) { + this.tableData = data.page.list + this.pageIndex2 = data.page.currPage + this.pageSize2 = data.page.pageSize + this.totalPage2 = data.page.totalCount + } }) this.batchAddData = { samplingLocation: '', @@ -3578,6 +3607,20 @@ this.subDetailFlag = true }, + // 子明细分页查询 + subDetailModal2 () { + this.subDetailData.limit = this.pageSize2 + this.subDetailData.page = this.pageIndex2 + selectIPQCSubDetailedRecord(this.subDetailData).then(({data}) => { + if (data.code === 0) { + this.tableData = data.page.list + this.pageIndex2 = data.page.currPage + this.pageSize2 = data.page.pageSize + this.totalPage2 = data.page.totalCount + } + }) + }, + // 审核按钮 submitResult () { let tempData1 = '' // 记录不是待审核状态的单号 diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 572b65d..161ef88 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -466,6 +466,16 @@ + + + 保存 @@ -718,6 +728,9 @@ pageIndex: 1, pageSize: 20, totalPage: 0, + pageIndex2: 1, + pageSize2: 20, + totalPage2: 0, height: 200, dataList: [], dataListSelections: [], @@ -1552,7 +1565,9 @@ maxValue: '', minValue: '', valueTypeDb: '', - subDetailValues:[] + subDetailValues:[], + page: 1, + limit: 10, }, options: [], fileFlag: false, @@ -2184,6 +2199,19 @@ this.getDataList() }, + // 子明细每页数 + sizeChangeHandle2 (val) { + this.pageSize2 = val + this.pageIndex2 = 1 + this.subDetailModal2() + }, + + // 子明细当前页 + currentChangeHandle2 (val) { + this.pageIndex2 = val + this.subDetailModal2() + }, + // 多选 selectionChangeHandle (val) { this.dataListSelections = val @@ -2364,15 +2392,17 @@ // 子明细记录信息查询 subDetailModal (row) { - // this.subDetailData.inspectionNo = row.inspectionNo; - // this.subDetailData.itemNo = row.itemNo; - // this.subDetailData.itemDesc = row.itemDesc; - // this.subDetailData.defaultValue = row.defaultValue; - // this.subDetailData.maxValue = row.maxValue; - // this.subDetailData.minValue = row.minValue; this.subDetailData = row + this.subDetailData.limit = this.pageSize2 + this.subDetailData.page = this.pageIndex2 selectIQCSubDetailedRecord(this.subDetailData).then(({data}) => { - this.tableData = data.rows + if (data.code === 0) { + this.tableData = data.page.list + this.pageIndex2 = data.page.currPage + this.pageSize2 = data.page.pageSize + this.totalPage2 = data.page.totalCount + } + // this.tableData = data.rows }) this.batchAddData = { samplingLocation: '', @@ -2382,6 +2412,20 @@ this.subDetailFlag = true }, + // 子明细分页查询 + subDetailModal2 () { + this.subDetailData.limit = this.pageSize2 + this.subDetailData.page = this.pageIndex2 + selectIQCSubDetailedRecord(this.subDetailData).then(({data}) => { + if (data.code === 0) { + this.tableData = data.page.list + this.pageIndex2 = data.page.currPage + this.pageSize2 = data.page.pageSize + this.totalPage2 = data.page.totalCount + } + }) + }, + // 删除检验记录 deleteModal () { if (this.IQCSelections.length === 0) {