From 24c8e1b6c3aa07eafd1fea5973bc7ffa880a4181 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 8 Jan 2025 14:19:50 +0800 Subject: [PATCH] =?UTF-8?q?2025-01-08=20=E7=BB=B4=E4=BF=AE=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=BE=85=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/eam/eamWorkOrderForDefect.vue | 4 +++- src/views/modules/qc/FAIResultEntry.vue | 9 +++++++-- src/views/modules/qc/FQCResultEntry.vue | 9 +++++++-- src/views/modules/qc/IPQCResultEntry.vue | 9 +++++++-- src/views/modules/qc/IQCResultEntry.vue | 13 +++++++++++-- src/views/modules/qc/qcItem.vue | 18 +++++++++--------- .../reportWorkOrder/reportDefectOrder.vue | 12 ++++++------ 7 files changed, 50 insertions(+), 24 deletions(-) diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue index 0821d39..46ad944 100644 --- a/src/views/modules/eam/eamWorkOrderForDefect.vue +++ b/src/views/modules/eam/eamWorkOrderForDefect.vue @@ -49,6 +49,8 @@ + + @@ -61,7 +63,7 @@ - + - 应用 - 保存 + 应用 + 保存 关闭 @@ -998,6 +998,7 @@ data () { return { loadFlag: false, + transferLoadFlag: false, inspectionNo: '', fileFlag: false, fileContentList: [], @@ -3418,6 +3419,7 @@ this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) this.saveInformationData.type = type + this.transferLoadFlag = true // this.saveInformationData.subDetailList = this.acquisitionList saveFAIDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { @@ -3434,6 +3436,9 @@ confirmButtonText: '确定' }) } + this.transferLoadFlag = false + }).catch(()=>{ + this.transferLoadFlag = false }) }, diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index d9343a5..c401233 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -501,8 +501,8 @@ - 应用 - 保存 + 应用 + 保存 关闭 @@ -974,6 +974,7 @@ data () { return { loadFlag: false, + transferLoadFlag: false, inspectionNo: '', fileFlag: false, fileContentList: [], @@ -3391,6 +3392,7 @@ this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) this.saveInformationData.type = type + this.transferLoadFlag = true // this.saveInformationData.subDetailList = this.acquisitionList saveFQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { @@ -3407,6 +3409,9 @@ confirmButtonText: '确定' }) } + this.transferLoadFlag = false + }).catch(()=>{ + this.transferLoadFlag = false }) }, diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index d9ce746..acd875e 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -515,8 +515,8 @@ - 应用 - 保存 + 应用 + 保存 关闭 @@ -995,6 +995,7 @@ data () { return { loadFlag: false, + transferLoadFlag: false, inspectionNo: '', fileFlag: false, fileContentList: [], @@ -3470,6 +3471,7 @@ this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) this.saveInformationData.type = type + this.transferLoadFlag = true // this.saveInformationData.subDetailList = this.acquisitionList saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { @@ -3486,6 +3488,9 @@ confirmButtonText: '确定' }) } + this.transferLoadFlag = false + }).catch(()=>{ + this.transferLoadFlag = false }) }, diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 16f8a7a..85dcc7a 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -408,8 +408,8 @@ - 应用 - 保存 + 应用 + 保存 关闭 @@ -720,6 +720,7 @@ data () { return { loadFlag: false, + transferLoadFlag: false, // 是否收藏 favorite: false, // 导出 start @@ -1867,6 +1868,8 @@ }) } this.loadFlag = false + }).catch(()=>{ + this.loadFlag = false }) }, @@ -1897,6 +1900,8 @@ }) } this.loadFlag = false + }).catch(()=>{ + this.loadFlag = false }) }, @@ -2339,6 +2344,7 @@ this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) this.saveInformationData.type = type + this.transferLoadFlag = true // this.saveInformationData.subDetailList = this.acquisitionList saveIQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { @@ -2355,6 +2361,9 @@ confirmButtonText: '确定' }) } + this.transferLoadFlag = false + }).catch(()=>{ + this.transferLoadFlag = false }) }, diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue index 7b87df0..230ea3b 100644 --- a/src/views/modules/qc/qcItem.vue +++ b/src/views/modules/qc/qcItem.vue @@ -38,8 +38,8 @@ - 查询 - 新增 + 查询 + 新增 导入 @@ -88,8 +88,8 @@ width="160" label="操作"> @@ -976,7 +976,7 @@ this.inspectionTypeSearch() // 动态列 this.getTableUserColumn(this.$route.meta.menuId+'table',1) - if (!this.authSearch) { + if (this.authSearch) { // 获取数据列表 this.getDataList() } @@ -1597,10 +1597,10 @@ let updateFlag = this.isAuth(this.menuId+":update") let deleteFlag = this.isAuth(this.menuId+":delete") //处理页面的权限数据 - this.authSearch = !searchFlag - this.authSave = !saveFlag - this.authUpdate = !updateFlag - this.authDelete = !deleteFlag + this.authSearch = searchFlag + this.authSave = saveFlag + this.authUpdate = updateFlag + this.authDelete = deleteFlag }, } } diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index 342890b..dd23c4e 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -1824,8 +1824,8 @@ planID: row.planID, planOperatorName: row.planOperatorName, workTime: '', - remark: '', - disposalMeasures: '', + remark: row.remark, + disposalMeasures: row.disposalMeasures, mesUser: this.$store.state.user.name, itemList: [], defectID: row.defectID, @@ -1837,11 +1837,11 @@ reachDate: row.reachDate, operator: row.reachOperator, operatorName: row.reachOperatorName, - handlingMethod: '', + handlingMethod: row.handlingMethod, feedBackDesc: row.feedBackDesc, - faultReason: '', - preventiveMeasure: '', - result: '' + faultReason: row.faultReason, + preventiveMeasure: row.preventiveMeasure, + result: row.result } this.activeTable = 'inspection_form' this.queryHistoryRecord()