From 4944dca1567a3bc1e3b6183e0a3f110c8b622e50 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 7 Jul 2026 11:11:14 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-07=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 | 38 +++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue
index ec8f072..4a1e262 100644
--- a/src/views/modules/rohs/rohsRecord.vue
+++ b/src/views/modules/rohs/rohsRecord.vue
@@ -365,15 +365,15 @@
         <!-- NPD 信息 -->
         <el-tab-pane label="NPD 信息" name="npdInfo">
           <div style="height: 755px; overflow-y: auto;">
+<!--            <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">-->
+<!--              <el-form-item label="现有材料不同规格/Same Material Diff Size">-->
+<!--                <el-radio-group v-model="modalData.isSameMaterialDiffSize" :disabled="isRohsFieldDisabled('isSameMaterialDiffSize')" style="width: 190px">-->
+<!--                  <el-radio label="Y" @click.native.prevent="radioClick('isSameMaterialDiffSize', 'Y')">是</el-radio>-->
+<!--                  <el-radio label="N" @click.native.prevent="radioClick('isSameMaterialDiffSize', 'N')">否</el-radio>-->
+<!--                </el-radio-group>-->
+<!--              </el-form-item>-->
+<!--            </el-form>-->
             <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
-              <el-form-item label="现有材料不同规格/Same Material Diff Size">
-                <el-radio-group v-model="modalData.isSameMaterialDiffSize" :disabled="isRohsFieldDisabled('isSameMaterialDiffSize')" style="width: 190px">
-                  <el-radio label="Y" @click.native.prevent="radioClick('isSameMaterialDiffSize', 'Y')">是</el-radio>
-                  <el-radio label="N" @click.native.prevent="radioClick('isSameMaterialDiffSize', 'N')">否</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-form>
-            <el-form :inline="true" label-position="top" :model="modalData">
               <el-form-item style="display: block;">
                 <template slot="label">
                   <span>材料描述/Material Desc.</span>
@@ -408,7 +408,7 @@
                   :row-click-select="true"
                   :show-order-ref2="false"
                   label="序列号"
-                  :height="470"
+                  :height="510"
                   style="margin-top: 2px"
                   :columns="tdsFileColumnList"
                   :order-ref1="modalData.site || ''"
@@ -424,7 +424,7 @@
         <el-tab-pane label="HSF 填写信息" name="hsfInfo">
           <div style="height: 755px">
             <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
-              <el-form-item label="报告日期/Expired Date">
+              <el-form-item label="报告日期/Report Date">
                 <el-date-picker v-model="modalData.expiredDate" type="date" value-format="yyyy-MM-dd" :disabled="isRohsFieldDisabled('expiredDate')" style="width: 150px" :editable=false></el-date-picker>
               </el-form-item>
               <el-form-item label="有效期数值/Valid Until Value">
@@ -1465,14 +1465,14 @@
 
       <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-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="现有材料不同规格/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: 804px;height: 30px"></el-input></el-form-item>
           </el-form>
@@ -1505,7 +1505,7 @@
       <el-tab-pane label="HSF 填写信息" name="hsfInfo">
         <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="报告日期/Expired Date">
+            <el-form-item label="报告日期/Report Date">
               <el-date-picker :value="currentRow.expiredDate" disabled type="date" value-format="yyyy-MM-dd" style="width: 150px"></el-date-picker>
             </el-form-item>
             <el-form-item label="有效期数值/Valid Until Value">