From f9ed20811f19e02342d9d4f8d8632f7086f28c49 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 10 Jun 2026 13:40:56 +0800
Subject: [PATCH] =?UTF-8?q?2026-06-10=20RoHs=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/rohs/rohsRecord.vue | 189 +++++++++++++++-----------
 1 file changed, 112 insertions(+), 77 deletions(-)

diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue
index b8614b7..9094240 100644
--- a/src/views/modules/rohs/rohsRecord.vue
+++ b/src/views/modules/rohs/rohsRecord.vue
@@ -727,137 +727,149 @@
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item>
               <span slot="label">申请人</span>
-              <el-input :value="currentRow.applicant || ''" disabled style="width: 150px"></el-input>
-              <el-input :value="currentRow.applicantName || ''" disabled style="width: 240px"></el-input>
+              <el-input :value="currentRow.applicant || ''" disabled style="width: 100px"></el-input>
+              <el-input :value="currentRow.applicantName || ''" disabled style="width: 155px"></el-input>
             </el-form-item>
             <el-form-item label="申请日期">
-              <el-date-picker :value="currentRow.applicationDate" disabled type="date" value-format="yyyy-MM-dd" style="width: 190px"></el-date-picker>
+              <el-date-picker :value="currentRow.applicationDate" disabled type="date" value-format="yyyy-MM-dd" style="width: 150px"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="Site">
+              <el-input :value="currentRow.site || ''" disabled style="width: 95px"></el-input>
             </el-form-item>
             <el-form-item label="工艺">
-              <el-input :value="currentRow.process || ''" disabled style="width: 190px"></el-input>
+              <el-input :value="currentRow.process || ''" disabled style="width: 121px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
-            <el-form-item label="供应商">
-              <el-input :value="currentRow.vendorCode || ''" disabled style="width: 150px"></el-input>
+            <el-form-item>
+              <span slot="label">最终客户</span>
+              <el-input :value="currentRow.endCustomer || ''" disabled style="width: 100px"></el-input>
+              <el-input :value="currentRow.endCustomerName || ''" disabled style="width: 155px"></el-input>
             </el-form-item>
-            <el-form-item label="供应商材料编码" style="margin-left: -10px">
-              <el-input :value="currentRow.vendorMaterialCode || ''" disabled style="width: 240px"></el-input>
+            <el-form-item>
+              <span slot="label">项目编码</span>
+              <el-input :value="currentRow.projectId || ''" disabled style="width: 100px"></el-input>
+              <el-input :value="currentRow.projectName || ''" disabled style="width: 155px"></el-input>
             </el-form-item>
-            <el-form-item label="辅材用途">
-              <el-input :value="currentRow.materialUseFor || ''" disabled style="width: 190px"></el-input>
+            <el-form-item label="WM所需求规格">
+              <el-input :value="currentRow.wmRequiredSpec || ''" disabled style="width: 260px"></el-input>
+            </el-form-item>
+          </el-form>
+          <el-form :inline="true" label-position="top" :model="currentRow">
+            <el-form-item label="供应商">
+              <el-input :value="currentRow.vendorCode || ''" disabled style="width: 396px"></el-input>
+            </el-form-item>
+            <el-form-item label="供应商材料编码">
+              <el-input :value="currentRow.vendorMaterialCode || ''" disabled style="width: 396px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item label="材料分类">
-              <el-input :value="currentRow.materialClassify || ''" disabled style="width: 394px"></el-input>
+              <el-input :value="currentRow.materialClassify || ''" disabled style="width: 668px"></el-input>
             </el-form-item>
             <el-form-item label="其他分类" v-if="currentRow.materialClassify && currentRow.materialClassify.includes('Other其他')">
-              <el-input :value="currentRow.otherMaterialClassify || ''" disabled style="width: 190px"></el-input>
+              <el-input :value="currentRow.otherMaterialClassify || ''" disabled style="width: 123px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
-            <el-form-item>
-              <span slot="label">最终客户</span>
-              <el-input :value="currentRow.endCustomer || ''" disabled style="width: 150px"></el-input>
-              <el-input :value="currentRow.endCustomerName || ''" disabled style="width: 240px"></el-input>
+            <el-form-item label="辅材用途">
+              <el-input :value="currentRow.materialUseFor || ''" disabled style="width: 396px"></el-input>
             </el-form-item>
             <el-form-item>
-              <span slot="label">PM人员/PM</span>
-              <el-input :value="currentRow.pm || ''" disabled style="width: 150px"></el-input>
-              <el-input :value="currentRow.pmName || ''" disabled style="width: 240px"></el-input>
+              <span slot="label">技术计划/TP</span>
+              <el-input :value="currentRow.technicalPlan || ''" disabled style="width: 100px"></el-input>
+              <el-input :value="currentRow.technicalPlanName || ''" disabled style="width: 155px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
-            <el-form-item>
-              <span slot="label">项目编码</span>
-              <el-input :value="currentRow.projectId || ''" disabled style="width: 150px"></el-input>
-              <el-input :value="currentRow.projectName || ''" disabled style="width: 240px"></el-input>
-            </el-form-item>
             <el-form-item label="颜色">
-              <el-input :value="currentRow.color || ''" disabled style="width: 150px"></el-input>
+              <el-input :value="currentRow.color || ''" disabled style="width: 396px"></el-input>
+            </el-form-item>
+            <el-form-item>
+              <span slot="label">PM人员/PM</span>
+              <el-input :value="currentRow.pm || ''" disabled style="width: 100px"></el-input>
+              <el-input :value="currentRow.pmName || ''" disabled style="width: 155px"></el-input>
             </el-form-item>
             <el-form-item label="计划转量产时间">
-              <el-date-picker :value="normalizeDateOnly(currentRow.plannedMassProductionDate)" disabled type="date" value-format="yyyy-MM-dd" style="width: 190px"></el-date-picker>
+              <el-date-picker :value="normalizeDateOnly(currentRow.plannedMassProductionDate)" disabled type="date" value-format="yyyy-MM-dd" style="width: 123px"></el-date-picker>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item>
               <span slot="label">商品组1</span>
-              <el-input :value="currentRow.commGroup1 || ''" disabled style="width: 150px"></el-input>
-              <el-input :value="currentRow.commGroup1Desc || ''" disabled style="width: 240px"></el-input>
-            </el-form-item>
-            <el-form-item label="是否需要Deviation">
-              <el-input :value="displayYesNo(currentRow.needDeviation)" disabled style="width: 190px"></el-input>
+              <el-input :value="currentRow.commGroup1 || ''" disabled style="width: 100px"></el-input>
+              <el-input :value="currentRow.commGroup1Desc || ''" disabled style="width: 155px"></el-input>
             </el-form-item>
-          </el-form>
-          <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item>
               <span slot="label">商品组2</span>
-              <el-input :value="currentRow.commGroup2 || ''" disabled style="width: 150px"></el-input>
-              <el-input :value="currentRow.commGroup2Desc || ''" disabled style="width: 240px"></el-input>
-            </el-form-item>
-            <el-form-item label="是否需要创建300/700/900号">
-              <el-input :value="displayYesNo(currentRow.needCreateNumber)" disabled style="width: 190px"></el-input>
+              <el-input :value="currentRow.commGroup2 || ''" disabled style="width: 100px"></el-input>
+              <el-input :value="currentRow.commGroup2Desc || ''" disabled style="width: 155px"></el-input>
             </el-form-item>
-          </el-form>
-          <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item>
               <span slot="label">商品组3</span>
-              <el-input :value="currentRow.commGroup3 || ''" disabled style="width: 150px"></el-input>
-              <el-input :value="currentRow.commGroup3Desc || ''" disabled style="width: 240px"></el-input>
-            </el-form-item>
-            <el-form-item label="是否Fiber材料">
-              <el-input :value="displayYesNo(currentRow.isFiberMaterial)" disabled style="width: 190px"></el-input>
+              <el-input :value="currentRow.commGroup3 || ''" disabled style="width: 100px"></el-input>
+              <el-input :value="currentRow.commGroup3Desc || ''" disabled style="width: 156px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
-            <el-form-item>
-              <span slot="label">NPD工程师</span>
-              <el-input :value="currentRow.npdEngineer || ''" disabled style="width: 150px"></el-input>
-              <el-input :value="currentRow.npdEngineerName || ''" disabled style="width: 240px"></el-input>
+            <el-form-item label="是否Fiber材料">
+              <el-radio-group :value="currentRow.isFiberMaterial" disabled style="width: 191px">
+                <el-radio label="Y">是</el-radio>
+                <el-radio label="N">否</el-radio>
+              </el-radio-group>
             </el-form-item>
-            <el-form-item label="WM所需求规格">
-              <el-input :value="currentRow.wmRequiredSpec || ''" disabled style="width: 190px"></el-input>
+            <el-form-item label="是否需要创建300/700/900号">
+              <el-radio-group :value="currentRow.needCreateNumber" disabled style="width: 191px">
+                <el-radio label="Y">是</el-radio>
+                <el-radio label="N">否</el-radio>
+              </el-radio-group>
             </el-form-item>
             <el-form-item label="材料厚度">
-              <el-input :value="currentRow.materialThickness || ''" disabled style="width: 190px"></el-input>
+              <el-input :value="currentRow.materialThickness || ''" disabled style="width: 396px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
+            <el-form-item>
+              <span slot="label">NPD工程师</span>
+              <el-input :value="currentRow.npdEngineer || ''" disabled style="width: 100px"></el-input>
+              <el-input :value="currentRow.npdEngineerName || ''" disabled style="width: 155px"></el-input>
+            </el-form-item>
             <el-form-item label="材料有效期">
-              <dict-data-select :value="currentRow.materialValidityTime || ''" :use-default-value="false" disabled style="width: 190px" dict-type="rohs_material_validity_time"></dict-data-select>
+              <dict-data-select :value="currentRow.materialValidityTime || ''" :use-default-value="false" disabled style="width: 100px" dict-type="rohs_material_validity_time"></dict-data-select>
             </el-form-item>
-            <el-form-item label="有效期备注">
-              <el-input :value="currentRow.materialValidityComments || ''" disabled style="width: 190px"></el-input>
+            <el-form-item label="是否需要Deviation" style="margin-left: 25px">
+              <el-radio-group :value="currentRow.needDeviation" disabled style="width: 120px">
+                <el-radio label="Y">是</el-radio>
+                <el-radio label="N">否</el-radio>
+              </el-radio-group>
             </el-form-item>
             <el-form-item label="预计提供报告时间(一个月内)">
-              <el-date-picker :value="normalizeDateOnly(currentRow.expectReportTime)" disabled type="date" value-format="yyyy-MM-dd" style="width: 190px"></el-date-picker>
+              <el-date-picker :value="normalizeDateOnly(currentRow.expectReportTime)" disabled type="date" value-format="yyyy-MM-dd" style="width: 260px"></el-date-picker>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
-            <el-form-item>
-              <span slot="label">技术计划/TP</span>
-              <el-input :value="currentRow.technicalPlan || ''" disabled style="width: 150px"></el-input>
-              <el-input :value="currentRow.technicalPlanName || ''" disabled style="width: 240px"></el-input>
+            <el-form-item label="有效期备注">
+              <el-input :value="currentRow.materialValidityComments || ''" disabled style="width: 532px"></el-input>
             </el-form-item>
             <el-form-item>
               <span slot="label">采购</span>
-              <el-input :value="currentRow.buyer || ''" disabled style="width: 150px"></el-input>
-              <el-input :value="currentRow.buyerName || ''" disabled style="width: 240px"></el-input>
+              <el-input :value="currentRow.buyer || ''" disabled style="width: 100px"></el-input>
+              <el-input :value="currentRow.buyerName || ''" disabled style="width: 156px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item label="所需审批文件">
-              <el-input :value="currentRow.qualificationDocumentsNeeded || ''" disabled style="width: 394px"></el-input>
+              <el-input :value="currentRow.qualificationDocumentsNeeded || ''" disabled style="width: 804px"></el-input>
             </el-form-item>
+          </el-form>
+          <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item label="测试报告必测项">
-              <el-input :value="currentRow.testReportIncludingItems || ''" disabled style="width: 394px"></el-input>
+              <el-input :value="currentRow.testReportIncludingItems || ''" disabled style="width: 804px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item label="备注说明" style="display: block;">
-              <el-input type="textarea" :rows="3" :value="currentRow.remark || ''" disabled resize="none" style="width: 802px;height: 30px"></el-input>
+              <el-input type="textarea" :rows="3" :value="currentRow.remark || ''" disabled resize="none" style="width: 804px;height: 30px"></el-input>
             </el-form-item>
           </el-form>
         </div>
@@ -866,13 +878,18 @@
       <el-tab-pane label="NPD 信息" name="npdInfo">
         <div :style="{height: secondHeight + 'px'}" style="margin-left: 5px;margin-top: 5px; overflow-y: auto;">
           <el-form :inline="true" label-position="top" :model="currentRow">
-            <el-form-item label="现有材料不同规格/Same Material Diff Size"><el-input :value="displayYesNo(currentRow.isSameMaterialDiffSize)" disabled style="width: 205px"></el-input></el-form-item>
+            <el-form-item label="现有材料不同规格/Same Material Diff Size">
+              <el-radio-group :value="currentRow.isSameMaterialDiffSize" disabled style="width: 190px">
+                <el-radio label="Y">是</el-radio>
+                <el-radio label="N">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
-            <el-form-item label="材料描述/Material Desc." style="display: block;"><el-input type="textarea" :rows="3" :value="currentRow.materialDesc || ''" disabled resize="none" style="width: 802px;height: 30px"></el-input></el-form-item>
+            <el-form-item label="材料描述/Material Desc." style="display: block;"><el-input type="textarea" :rows="3" :value="currentRow.materialDesc || ''" disabled resize="none" style="width: 804px;height: 30px"></el-input></el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow" style="margin-top: 50px">
-            <el-form-item label="备注说明/NPD Remark" style="display: block;"><el-input type="textarea" :rows="3" :value="currentRow.npdRemark || ''" disabled resize="none" style="width: 802px;height: 30px"></el-input></el-form-item>
+            <el-form-item label="备注说明/NPD Remark" style="display: block;"><el-input type="textarea" :rows="3" :value="currentRow.npdRemark || ''" disabled resize="none" style="width: 804px;height: 30px"></el-input></el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow" style="margin-top: 50px">
             <el-form-item label="TDS属性/TDS Property" style="display: block;">
@@ -900,7 +917,7 @@
         <div :style="{height: secondHeight + 'px'}" style="margin-left: 5px;margin-top: 5px; overflow-y: auto;">
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item label="SGS报告编号/SGS Report Number">
-              <el-input :value="currentRow.sgsReportNumber || ''" disabled style="width: 230px"></el-input>
+              <el-input :value="currentRow.sgsReportNumber || ''" disabled style="width: 252px"></el-input>
             </el-form-item>
             <el-form-item label="报告日期/Expired Date">
               <el-date-picker :value="currentRow.expiredDate" disabled type="date" value-format="yyyy-MM-dd" style="width: 180px"></el-date-picker>
@@ -913,19 +930,37 @@
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
-            <el-form-item label="是否符合RoHS/Meet RoHS Req"><el-input :value="displayYesNo(currentRow.isMeetRohsRequirement)" disabled style="width: 230px"></el-input></el-form-item>
-            <el-form-item label="材料属性是否是AH/Is AH Grade"><el-input :value="displayYesNo(currentRow.isAhGrade)" disabled style="width: 180px"></el-input></el-form-item>
-            <el-form-item label="HSF供应商等级/Supplier Class"><el-input :value="currentRow.hsfSupplierClassification || ''" disabled style="width: 200px"></el-input></el-form-item>
+            <el-form-item label="是否符合RoHS/Meet RoHS Req">
+              <el-radio-group :value="currentRow.isMeetRohsRequirement" disabled style="width: 252px">
+                <el-radio label="Y">是</el-radio>
+                <el-radio label="N">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label=" ">
+              <el-checkbox
+                :value="currentRow.isAhGrade"
+                true-label="Y"
+                false-label="N"
+                disabled
+                style="width: 200px">材料属性是否是AH/Is AH Grade</el-checkbox>
+            </el-form-item>
+            <el-form-item label="HSF供应商等级/Supplier Class">
+              <el-radio-group :value="currentRow.hsfSupplierClassification" disabled style="width: 200px">
+                <el-radio label="A类">A类</el-radio>
+                <el-radio label="B类">B类</el-radio>
+                <el-radio label="C类">C类</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
+            <el-form-item label="Fiber报告信息/Fiber Information" style="display: block;"><el-input type="textarea" :rows="3" :value="currentRow.fiberInformation || ''" disabled resize="none" style="width: 804px;height: 30px"></el-input></el-form-item>
+          </el-form>
+          <el-form :inline="true" label-position="top" :model="currentRow" style="margin-top: 45px">
             <el-form-item label="HSF审批人/HSF Approver"><el-input :value="currentRow.hsfApprover || ''" disabled style="width: 396px"></el-input></el-form-item>
             <el-form-item label="Inform Related people"><el-input :value="currentRow.relatedPeople || ''" disabled style="width: 396px"></el-input></el-form-item>
           </el-form>
-          <el-form :inline="true" label-position="top" :model="currentRow">
-            <el-form-item label="Fiber报告信息/Fiber Information" style="display: block;"><el-input type="textarea" :rows="3" :value="currentRow.fiberInformation || ''" disabled resize="none" style="width: 802px;height: 30px"></el-input></el-form-item>
-          </el-form>
-          <el-form v-if="shouldShowHsfStandard(currentRow.endCustomer)" :inline="true" label-position="top" :model="currentRow" style="margin-top: 50px">
-            <el-form-item label="HSF标准/HSF Standard" style="display: block;"><el-input type="textarea" :rows="3" :value="currentRow.hsfStandard || ''" disabled resize="none" style="width: 802px;height: 30px"></el-input></el-form-item>
+          <el-form v-if="shouldShowHsfStandard(currentRow.endCustomer)" :inline="true" label-position="top" :model="currentRow" style="margin-top: 0px">
+            <el-form-item label="HSF标准/HSF Standard" style="display: block;"><el-input type="textarea" :rows="3" :value="currentRow.hsfStandard || ''" disabled resize="none" style="width: 804px;height: 30px"></el-input></el-form-item>
           </el-form>
         </div>
       </el-tab-pane>