From 5eb444f8f83a2c567f1a8dd3e0bd60d9887e56e1 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 28 Aug 2024 17:54:22 +0800 Subject: [PATCH] =?UTF-8?q?2024-08-28=20=E9=87=87=E9=9B=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=88=E9=A1=B9=E7=9B=AE=E6=9D=A1=E4=BB=B6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/qc/FAIResultEntry.vue | 9 +++++++-- src/views/modules/qc/FQCResultEntry.vue | 9 +++++++-- src/views/modules/qc/IPQCResultEntry.vue | 9 +++++++-- src/views/modules/report/IPQC_detail_report.vue | 15 ++++++++++++++- src/views/modules/report/IQC_detail_report.vue | 15 ++++++++++++++- 5 files changed, 49 insertions(+), 8 deletions(-) diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index f816f7a..f93d6cc 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -307,7 +307,7 @@ - 保存 + 保存 关闭 @@ -2382,7 +2382,8 @@ inspectionNo: '' }, fileLoading: false, - subDetailLoading: false + subDetailLoading: false, + saveLoading: false } }, @@ -3050,6 +3051,7 @@ this.$message.warning('请选择检验模板！') return } + this.saveLoading = true if (this.modalData.flag === '1') { saveFAIInspection(this.modalData).then(({data}) => { if (data && data.code === 0) { @@ -3069,6 +3071,9 @@ confirmButtonText: '确定' }) } + this.saveLoading = false + }).catch(()=>{ + this.saveLoading = false }) } }, diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index 9be1b30..ec5523b 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -291,7 +291,7 @@ - 保存 + 保存 关闭 @@ -2356,7 +2356,8 @@ inspectionNo: '' }, fileLoading: false, - subDetailLoading: false + subDetailLoading: false, + saveLoading: false } }, @@ -3024,6 +3025,7 @@ this.$message.warning('请选择检验模板！') return } + this.saveLoading = true if (this.modalData.flag === '1') { saveFQCInspection(this.modalData).then(({data}) => { if (data && data.code === 0) { @@ -3043,6 +3045,9 @@ confirmButtonText: '确定' }) } + this.saveLoading = false + }).catch(()=>{ + this.saveLoading = false }) } }, diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index a8b1c90..d2d4866 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -305,7 +305,7 @@ - 保存 + 保存 关闭 @@ -2429,7 +2429,8 @@ inspectionNo: '' }, fileLoading: false, - subDetailLoading: false + subDetailLoading: false, + saveLoading: false } }, @@ -3318,6 +3319,7 @@ this.$message.warning('请选择检验模板！') return } + this.saveLoading = true if(this.modalData.flag === '1'){ saveOsInspection(this.modalData).then(({data}) => { if (data && data.code === 0) { @@ -3337,6 +3339,9 @@ confirmButtonText: '确定' }) } + this.saveLoading = false + }).catch(()=>{ + this.saveLoading = false }) } }, diff --git a/src/views/modules/report/IPQC_detail_report.vue b/src/views/modules/report/IPQC_detail_report.vue index c6a09d5..04fdc8b 100644 --- a/src/views/modules/report/IPQC_detail_report.vue +++ b/src/views/modules/report/IPQC_detail_report.vue @@ -1044,7 +1044,7 @@ export default { this.getTableUserColumn(this.$route.meta.menuId+'table',1) if (!this.authSearch) { // 获取数据列表 - this.getDataList() + //this.getDataList() } }, @@ -1115,6 +1115,19 @@ export default { // 查询获取数据列表 getDataList () { + let searchFlag = true + Object.keys(this.searchData).forEach(val=>{ + if (val !== 'userName' && val !== 'inspectionTypeNo' && val !== 'page' && val !== 'limit' && val !== 'downloadType') { + if (this.searchData[val].length > 0) { + searchFlag = false + return + } + } + }) + if (searchFlag) { + this.$message.warning('数据量过大，请填写查询条件后再执行操作！') + return + } this.searchLoading = true this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex diff --git a/src/views/modules/report/IQC_detail_report.vue b/src/views/modules/report/IQC_detail_report.vue index 81aa640..2f97503 100644 --- a/src/views/modules/report/IQC_detail_report.vue +++ b/src/views/modules/report/IQC_detail_report.vue @@ -1089,7 +1089,7 @@ export default { this.getTableUserColumn(this.$route.meta.menuId+'table',1) if (!this.authSearch) { // 获取数据列表 - this.getDataList() + //this.getDataList() } }, @@ -1160,6 +1160,19 @@ export default { // 查询获取数据列表 getDataList () { + let searchFlag = true + Object.keys(this.searchData).forEach(val=>{ + if (val !== 'userName' && val !== 'inspectionTypeNo' && val !== 'page' && val !== 'limit' && val !== 'downloadType') { + if (this.searchData[val].length > 0) { + searchFlag = false + return + } + } + }) + if (searchFlag) { + this.$message.warning('数据量过大，请填写查询条件后再执行操作！') + return + } this.searchLoading = true this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex