From 75610e7ddab8c92d307a5c8751fc045dd40715e7 Mon Sep 17 00:00:00 2001 From: jinna Date: Thu, 28 May 2026 20:18:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/settlementAnomaly.vue | 11 +++++++-- .../productionTesting/productionQuality.vue | 24 +++++++++---------- .../inspectionArchiving/auditFile/index.vue | 12 ++++++++++ .../tankSolutionTaskDispose.vue | 9 +++++++ 4 files changed, 42 insertions(+), 14 deletions(-) diff --git a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue index e827c9ef..6eecf835 100644 --- a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue +++ b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue @@ -651,13 +651,20 @@ export default { this.selectionList = list; }, searchChange(params, done) { - this.query = params; + this.query = params this.page.currentPage = 1; this.onLoad(); done && done(); }, searchReset() { - this.query = {}; + this.query = { + rosStatusList:3, + memo:['未找到报价单','订单数据错误'] + }; + this.searchParams = { + rosStatusList:3, + memo:['未找到报价单','订单数据错误'] + } this.page.currentPage = 1; this.onLoad(); }, diff --git a/src/views/productionTesting/productionQuality.vue b/src/views/productionTesting/productionQuality.vue index 98eb0df9..da6fe145 100644 --- a/src/views/productionTesting/productionQuality.vue +++ b/src/views/productionTesting/productionQuality.vue @@ -1536,18 +1536,18 @@ export default { } } console.log('detailInfo------------------',this.detailInfo) - // fillInspection(this.detailInfo).then(res =>{ - // if(res.data.code == 200){ - // this.$message.success('保存成功') - // this.showDialog = false - // this.isStart = false - // this.getDChyData = [] - // clearInterval(this.ydInterval) - // clearInterval(this.firstInterval) - // clearInterval(this.secondInderval) - // this.onLoad() - // } - // }) + fillInspection(this.detailInfo).then(res =>{ + if(res.data.code == 200){ + this.$message.success('保存成功') + this.showDialog = false + this.isStart = false + this.getDChyData = [] + clearInterval(this.ydInterval) + clearInterval(this.firstInterval) + clearInterval(this.secondInderval) + this.onLoad() + } + }) }, // 点击应用按钮 diff --git a/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue b/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue index f0e789b6..f16d7d05 100644 --- a/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue +++ b/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue @@ -176,6 +176,7 @@ export default { sortable: 'custom', filterable: true, span: 24, + hide:true // type: 'select', // dicUrl: '/api/blade-desk/BA/WorkCenter/listForSelect', // props: { @@ -183,6 +184,17 @@ export default { // value: 'id', // }, }, + { + label: '工艺能力', + prop: 'caName', + width: 150, + labelWidth: 150, + search: false, + sortable: 'custom', + filterable: true, + span: 24, + display:false + }, { label: '生产标识', prop: 'pqId', diff --git a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue b/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue index 976bce48..e571a058 100644 --- a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue +++ b/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue @@ -847,6 +847,15 @@ export default { // res.data.data.records.map(item =>{ // item.liquidTank = null // }) + res.data.data.records.map(item =>{ + item.firstTestValue = item.firstTestValue == -1 ? '' : item.firstTestValue + item.conductivityFirstTestValue = item.conductivityFirstTestValue == -1 ? '' : item.conductivityFirstTestValue + item.temperatureActual = item.temperatureActual == -1 ? '' : item.temperatureActual + item.phActual = item.phActual == -1 ? '' : item.phActual + item.actualAddValue = item.actualAddValue == -1 ? '' : item.actualAddValue + item.afterAddTheoryValue = item.afterAddTheoryValue == -1 ? '' : item.afterAddTheoryValue + item.firstTestDate = item.firstTestDate == -1 ? '' : item.firstTestDate + }) this.data = res.data.data.records this.data.map(item =>{