From 45dd5e79c2869df52fc11641c71a5bda15f39c3d Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 1 Jul 2026 10:51:26 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-01=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 | 45 ++++++++++-----------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue
index f847b31..8705204 100644
--- a/src/views/modules/rohs/rohsRecord.vue
+++ b/src/views/modules/rohs/rohsRecord.vue
@@ -114,7 +114,6 @@
           <span>{{ normalizeDateOnly(scope.row.expectReportTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="sgsReportNumber" header-align="center" align="center" label="SGS报告编号" width="190" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="rohsStatus" header-align="center" align="center" label="RoHS状态" width="130"></el-table-column>
       <el-table-column prop="expiredDate" header-align="center" align="center" label="报告日期" width="165"></el-table-column>
       <el-table-column prop="validUntilDisplay" header-align="center" align="center" label="有效期" width="170" :show-overflow-tooltip="true">
@@ -416,19 +415,8 @@
         <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="SGS报告编号/SGS Report Number">
-                <el-input v-model="modalData.sgsReportNumber" :disabled="isRohsFieldDisabled('sgsReportNumber')" style="width: 190px"></el-input>
-              </el-form-item>
-              <el-form-item label="状态/Status">
-                <el-select v-model="modalData.rohsStatus" clearable :disabled="isRohsFieldDisabled('rohsStatus')" style="width: 190px">
-                  <el-option label="Active" value="Active"></el-option>
-                  <el-option label="Dead" value="Dead"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-            <el-form :inline="true" label-position="top" :model="modalData">
               <el-form-item label="报告日期/Expired Date">
-                <el-date-picker v-model="modalData.expiredDate" type="date" value-format="yyyy-MM-dd" :disabled="isRohsFieldDisabled('expiredDate')" style="width: 190px" :editable=false></el-date-picker>
+                <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">
                 <el-input-number
@@ -438,14 +426,20 @@
                   :step="1"
                   :precision="0"
                   :disabled="isValidUntilValueDisabled()"
-                  style="width: 190px">
+                  style="width: 150px">
                 </el-input-number>
               </el-form-item>
               <el-form-item label="有效期单位/Valid Until Unit">
-                <dict-data-select v-model="modalData.validUntil" clearable :disabled="isValidUntilUnitDisabled()" style="width: 190px" dict-type="rohs_valid_until"></dict-data-select>
+                <dict-data-select v-model="modalData.validUntil" clearable :disabled="isValidUntilUnitDisabled()" style="width: 150px" dict-type="rohs_valid_until"></dict-data-select>
               </el-form-item>
               <el-form-item label="失效日期/Expiry Date">
-                <el-date-picker v-model="modalData.expiryDate" type="date" value-format="yyyy-MM-dd" disabled style="width: 192px" :editable=false></el-date-picker>
+                <el-date-picker v-model="modalData.expiryDate" type="date" value-format="yyyy-MM-dd" disabled style="width: 150px" :editable=false></el-date-picker>
+              </el-form-item>
+              <el-form-item label="状态/Status">
+                <el-select v-model="modalData.rohsStatus" clearable :disabled="isRohsFieldDisabled('rohsStatus')" style="width: 150px">
+                  <el-option label="Active" value="Active"></el-option>
+                  <el-option label="Dead" value="Dead"></el-option>
+                </el-select>
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData">
@@ -948,26 +942,21 @@
 
       <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="SGS报告编号/SGS Report Number">
-              <el-input :value="currentRow.sgsReportNumber || ''" disabled style="width: 190px"></el-input>
-            </el-form-item>
-            <el-form-item label="状态/Status">
-              <el-input :value="currentRow.rohsStatus || ''" disabled style="width: 190px"></el-input>
-            </el-form-item>
-          </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item label="报告日期/Expired Date">
-              <el-date-picker :value="currentRow.expiredDate" disabled type="date" value-format="yyyy-MM-dd" style="width: 190px"></el-date-picker>
+              <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">
-              <el-input :value="currentRow.validUntilValue || ''" disabled style="width: 190px"></el-input>
+              <el-input :value="currentRow.validUntilValue || ''" disabled style="width: 150px"></el-input>
             </el-form-item>
             <el-form-item label="有效期单位/Valid Until Unit">
-              <el-input :value="currentRow.validUntil || ''" disabled style="width: 190px"></el-input>
+              <el-input :value="currentRow.validUntil || ''" disabled style="width: 150px"></el-input>
             </el-form-item>
             <el-form-item label="失效日期/Expiry Date">
-              <el-date-picker :value="currentRow.expiryDate" disabled type="date" value-format="yyyy-MM-dd" style="width: 192px"></el-date-picker>
+              <el-date-picker :value="currentRow.expiryDate" disabled type="date" value-format="yyyy-MM-dd" style="width: 150px"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="状态/Status">
+              <el-input :value="currentRow.rohsStatus || ''" disabled style="width: 150px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">