From deec579ad0d99a623cb091b5d85a8c82159f4717 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 8 Jul 2026 09:12:40 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-07=20RoHS=E4=BC=98=E5=8C=96=EF=BC=8C?=
=?UTF-8?q?=E6=98=BE=E7=A4=BAIFS=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81?=
=?UTF-8?q?=E5=92=8C=E6=8F=8F=E8=BF=B0=EF=BC=8C=E5=B9=B6=E7=BB=99=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/rohs/rohsRecord.vue | 48 +++++++++++++++++++++++++--
1 file changed, 45 insertions(+), 3 deletions(-)
diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue
index f39a543..5b1dc01 100644
--- a/src/views/modules/rohs/rohsRecord.vue
+++ b/src/views/modules/rohs/rohsRecord.vue
@@ -31,6 +31,12 @@
+
+
+
+
+
+
查询
新增
@@ -135,7 +141,16 @@
-
+
+
+ {{ scope.row.mainIfsPartNo || scope.row.ifsPartNo || '' }}
+
+
+
+
+ {{ scope.row.mainPartDesc || scope.row.materialDesc || '' }}
+
+
@@ -1636,7 +1651,9 @@ export default {
status: '',
rohsStatus: '',
currentApprover: '',
- nodeId: ''
+ nodeId: '',
+ ifsPartNo: '',
+ materialDesc: ''
},
exportLoading: false,
exportData: [],
@@ -3234,6 +3251,25 @@ export default {
this.$set(target, 'plannedMassProductionDate', this.normalizeDateOnly(plannedMassProductionDate))
this.$set(target, 'expiredDate', normalizedExpiredDate)
this.$set(target, 'expiryDate', this.calculateExpiryDateByRule(normalizedExpiredDate, target.validUntilValue, target.validUntil))
+ const firstMaterialDisplay = this.resolveFirstMaterialDisplay(target)
+ const fallbackMainIfsPartNo = fallbackData.mainIfsPartNo || fallbackData.ifsPartNo || ''
+ const fallbackMainPartDesc = fallbackData.mainPartDesc || fallbackData.materialDesc || ''
+ this.$set(target, 'mainIfsPartNo', firstMaterialDisplay.mainIfsPartNo || target.mainIfsPartNo || fallbackMainIfsPartNo)
+ this.$set(target, 'mainPartDesc', firstMaterialDisplay.mainPartDesc || target.mainPartDesc || fallbackMainPartDesc)
+ },
+ resolveFirstMaterialDisplay (target) {
+ const materialList = Array.isArray(target && target.materialList) ? target.materialList : []
+ if (!materialList.length) {
+ return {
+ mainIfsPartNo: '',
+ mainPartDesc: ''
+ }
+ }
+ const firstMaterial = materialList[0] || {}
+ return {
+ mainIfsPartNo: String(firstMaterial.finalPartNo || firstMaterial.final_part_no || '').trim(),
+ mainPartDesc: String(firstMaterial.partDesc || firstMaterial.part_desc || '').trim()
+ }
},
refreshCurrentTabTable () {
if (this.activeTable === 'approvalInformation') {
@@ -3290,7 +3326,9 @@ export default {
status: this.searchData.status,
rohsStatus: this.searchData.rohsStatus,
currentApprover: this.searchData.currentApprover,
- nodeId: this.searchData.nodeId
+ nodeId: this.searchData.nodeId,
+ ifsPartNo: this.searchData.ifsPartNo,
+ materialDesc: this.searchData.materialDesc
}
api.getRohsList(params).then(({data}) => {
if (data && data.code === 0) {
@@ -3312,6 +3350,8 @@ export default {
commGroup3Desc: '',
hsfApproverName: '',
relatedPeopleName: '',
+ mainIfsPartNo: '',
+ mainPartDesc: '',
...item
}
})
@@ -3398,6 +3438,8 @@ export default {
commGroup3Desc: '',
hsfApproverName: '',
relatedPeopleName: '',
+ mainIfsPartNo: '',
+ mainPartDesc: '',
...item
}
})