From 77c3962c7787e01f548dfad31b03c129d7ba96bc Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 3 Jul 2026 15:46:52 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-03=20=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 | 46 +++++++++++++--------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue
index 8a80e65..b9436c1 100644
--- a/src/views/modules/rohs/rohsRecord.vue
+++ b/src/views/modules/rohs/rohsRecord.vue
@@ -284,11 +284,8 @@
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData">
-              <el-form-item>
-                <span style="cursor: pointer" v-if="!isRohsFieldDisabled('npdEngineer')" slot="label" @click="getBaseList(2001, 3)"><a herf="#">NPD工程师/NPD Engineer</a></span>
-                <span v-else slot="label">NPD工程师/NPD Engineer</span>
-                <el-input v-model="modalData.npdEngineer" @blur="npdEngineerBlur(2001)" :disabled="isRohsFieldDisabled('npdEngineer')" style="width: 100px"></el-input>
-                <el-input v-model="modalData.npdEngineerName" disabled style="width: 155px"></el-input>
+              <el-form-item label="材料有效期/Material Validity Time">
+                <dict-data-select v-model="modalData.materialValidityTime" clearable :disabled="isRohsFieldDisabled('materialValidityTime')" style="width: 260px" dict-type="rohs_material_validity_time"></dict-data-select>
               </el-form-item>
               <el-form-item label="是否需要Deviation/If need deviation or not">
                 <el-radio-group v-model="modalData.needDeviation" :disabled="isRohsFieldDisabled('needDeviation')" style="width: 259px">
@@ -296,23 +293,26 @@
                   <el-radio label="N" @click.native.prevent="radioClick('needDeviation', 'N')">否</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="材料有效期/Material Validity Time">
-                <dict-data-select v-model="modalData.materialValidityTime" clearable :disabled="isRohsFieldDisabled('materialValidityTime')" style="width: 260px" dict-type="rohs_material_validity_time"></dict-data-select>
+              <el-form-item>
+                <span style="cursor: pointer" v-if="!isRohsFieldDisabled('npdEngineer')" slot="label" @click="getBaseList(2001, 3)"><a herf="#">NPD工程师/NPD Engineer</a></span>
+                <span v-else slot="label">NPD工程师/NPD Engineer</span>
+                <el-input v-model="modalData.npdEngineer" @blur="npdEngineerBlur(2001)" :disabled="isRohsFieldDisabled('npdEngineer')" style="width: 100px"></el-input>
+                <el-input v-model="modalData.npdEngineerName" disabled style="width: 155px"></el-input>
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData">
               <el-form-item label="材料有效期备注/Material Validity Time Comments">
-                <el-input v-model="modalData.materialValidityComments" :disabled="isRohsFieldDisabled('materialValidityComments')" style="width: 259px"></el-input>
+                <el-input v-model="modalData.materialValidityComments" :disabled="isRohsFieldDisabled('materialValidityComments')" style="width: 260px"></el-input>
               </el-form-item>
-              <el-form-item style="margin-left: -2px">
+              <el-form-item label="预计提供报告时间(一个月内)/Expect Date" style="margin-left: -2px">
+                <el-date-picker v-model="modalData.expectReportTime" type="date" value-format="yyyy-MM-dd" :disabled="isRohsFieldDisabled('expectReportTime')" style="width: 259px" :editable=false></el-date-picker>
+              </el-form-item>
+              <el-form-item>
                 <span style="cursor: pointer" v-if="!isRohsFieldDisabled('buyer')" slot="label" @click="getBaseList(2000, 2)"><a herf="#">采购/Buyer</a></span>
                 <span v-else slot="label">采购/Buyer</span>
                 <el-input v-model="modalData.buyer" @blur="buyerBlur(2000)" :disabled="isRohsFieldDisabled('buyer')" style="width: 100px"></el-input>
                 <el-input v-model="modalData.buyerName" disabled style="width: 156px"></el-input>
               </el-form-item>
-              <el-form-item label="预计提供报告时间(一个月内)/Expect Date">
-                <el-date-picker v-model="modalData.expectReportTime" type="date" value-format="yyyy-MM-dd" :disabled="isRohsFieldDisabled('expectReportTime')" style="width: 260px" :editable=false></el-date-picker>
-              </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData">
               <el-form-item label="所需审批文件/Qualification Documents needed" >
@@ -1389,10 +1389,8 @@
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
-            <el-form-item>
-              <span slot="label">NPD工程师/NPD Engineer</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 label="材料有效期/Material Validity Time">
+              <dict-data-select :value="currentRow.materialValidityTime || ''" :use-default-value="false" disabled style="width: 260px" dict-type="rohs_material_validity_time"></dict-data-select>
             </el-form-item>
             <el-form-item label="是否需要Deviation/If need deviation or not">
               <el-radio-group :value="currentRow.needDeviation" disabled style="width: 259px">
@@ -1400,22 +1398,24 @@
                 <el-radio label="N">否</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="材料有效期/Material Validity Time">
-              <dict-data-select :value="currentRow.materialValidityTime || ''" :use-default-value="false" disabled style="width: 260px" dict-type="rohs_material_validity_time"></dict-data-select>
+            <el-form-item>
+              <span slot="label">NPD工程师/NPD Engineer</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>
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item label="材料有效期备注/Material Validity Time Comments">
-              <el-input :value="currentRow.materialValidityComments || ''" disabled style="width: 259px"></el-input>
+              <el-input :value="currentRow.materialValidityComments || ''" disabled style="width: 260px"></el-input>
+            </el-form-item>
+            <el-form-item label="预计提供报告时间(一个月内)/Expect Date" style="margin-left: -2px">
+              <el-date-picker :value="normalizeDateOnly(currentRow.expectReportTime)" disabled type="date" value-format="yyyy-MM-dd" style="width: 259px"></el-date-picker>
             </el-form-item>
-            <el-form-item style="margin-left: -2px">
+            <el-form-item>
               <span slot="label">采购/Buyer</span>
               <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-item label="预计提供报告时间(一个月内)/Expect Date">
-              <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 label="所需审批文件/Qualification Documents needed">