diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue
index 6473f0a..5ef72b7 100644
--- a/src/views/modules/rohs/rohsRecord.vue
+++ b/src/views/modules/rohs/rohsRecord.vue
@@ -257,7 +257,7 @@
                 <el-input v-model="modalData.sgsReportNumber" style="width: 230px"></el-input>
               </el-form-item>
               <el-form-item label="报告日期/Expired Date">
-                <el-date-picker v-model="modalData.expiredDate" type="date" value-format="yyyy-MM-dd" style="width: 150px" :editable=false></el-date-picker>
+                <el-date-picker v-model="modalData.expiredDate" type="date" value-format="yyyy-MM-dd" style="width: 180px" :editable=false></el-date-picker>
               </el-form-item>
               <el-form-item label="有效期/Valid Until">
                 <dict-data-select v-model="modalData.validUntil" clearable style="width: 180px" dict-type="rohs_valid_until"></dict-data-select>
@@ -265,7 +265,7 @@
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData">
               <el-form-item label="是否符合RoHS/Meet RoHS Req">
-                <el-radio-group v-model="modalData.isMeetRohsRequirement" style="width: 180px">
+                <el-radio-group v-model="modalData.isMeetRohsRequirement" style="width: 230px">
                   <el-radio label="Y" @click.native.prevent="radioClick('isMeetRohsRequirement', 'Y')">是</el-radio>
                   <el-radio label="N" @click.native.prevent="radioClick('isMeetRohsRequirement', 'N')">否</el-radio>
                 </el-radio-group>
@@ -277,7 +277,7 @@
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="HSF供应商等级/Supplier Class">
-                <el-radio-group v-model="modalData.hsfSupplierClassification" style="width: 200px">
+                <el-radio-group v-model="modalData.hsfSupplierClassification" style="width: 180px">
                   <el-radio label="A类" @click.native.prevent="radioClick('hsfSupplierClassification', 'A类')">A类</el-radio>
                   <el-radio label="B类" @click.native.prevent="radioClick('hsfSupplierClassification', 'B类')">B类</el-radio>
                   <el-radio label="C类" @click.native.prevent="radioClick('hsfSupplierClassification', 'C类')">C类</el-radio>
@@ -405,25 +405,12 @@
               <el-input :value="currentRow.applicant || ''" disabled style="width: 150px"></el-input>
               <el-input :value="currentRow.applicantName || ''" disabled style="width: 240px"></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>
-            </el-form-item>
             <el-form-item label="申请日期/Application Date">
               <el-date-picker :value="currentRow.applicationDate" disabled type="date" value-format="yyyy-MM-dd" style="width: 190px"></el-date-picker>
             </el-form-item>
-          </el-form>
-          <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item label="工艺/Process">
               <el-input :value="currentRow.process || ''" disabled style="width: 190px"></el-input>
             </el-form-item>
-            <el-form-item label="计划转量产时间/Planned Mass Production">
-              <el-date-picker :value="currentRow.plannedMassProductionDate" disabled type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width: 190px"></el-date-picker>
-            </el-form-item>
-            <el-form-item label="颜色/Color">
-              <el-input :value="currentRow.color || ''" disabled style="width: 190px"></el-input>
-            </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item label="供应商代码/Vendor Code">
@@ -450,6 +437,11 @@
               <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>
+            <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>
+            </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item>
@@ -457,29 +449,41 @@
               <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="需创建内部编号/Need Create No.">
-              <el-input :value="displayYesNo(currentRow.needCreateNumber)" disabled style="width: 190px"></el-input>
+            <el-form-item label="颜色/Color">
+              <el-input :value="currentRow.color || ''" disabled style="width: 150px"></el-input>
+            </el-form-item>
+            <el-form-item label="计划转量产时间/Planned Mass Production">
+              <el-date-picker :value="currentRow.plannedMassProductionDate" disabled type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width: 230px"></el-date-picker>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item>
               <span slot="label">商品组1 / Comm Group 1</span>
-              <el-input :value="currentRow.commGroup1 || ''" disabled style="width: 128px"></el-input>
-              <el-input :value="currentRow.commGroup1Desc || ''" disabled style="width: 327px"></el-input>
+              <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="是否需偏差许可/Need Deviation">
+              <el-input :value="displayYesNo(currentRow.needDeviation)" disabled style="width: 190px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item>
               <span slot="label">商品组2 / Comm Group 2</span>
-              <el-input :value="currentRow.commGroup2 || ''" disabled style="width: 128px"></el-input>
-              <el-input :value="currentRow.commGroup2Desc || ''" disabled style="width: 327px"></el-input>
+              <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="需创建内部编号/Need Create No.">
+              <el-input :value="displayYesNo(currentRow.needCreateNumber)" disabled style="width: 190px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item>
               <span slot="label">商品组3 / Comm Group 3</span>
-              <el-input :value="currentRow.commGroup3 || ''" disabled style="width: 128px"></el-input>
-              <el-input :value="currentRow.commGroup3Desc || ''" disabled style="width: 327px"></el-input>
+              <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材料/Fiber Material">
+              <el-input :value="displayYesNo(currentRow.isFiberMaterial)" disabled style="width: 190px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
@@ -488,8 +492,11 @@
               <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>
-            <el-form-item label="是否需偏差许可/Need Deviation">
-              <el-input :value="displayYesNo(currentRow.needDeviation)" disabled style="width: 190px"></el-input>
+            <el-form-item label="WM所需求规格/WM Required Spec">
+              <el-input :value="currentRow.wmRequiredSpec || ''" disabled style="width: 190px"></el-input>
+            </el-form-item>
+            <el-form-item label="材料厚度/Material Thickness">
+              <el-input :value="currentRow.materialThickness || ''" disabled style="width: 190px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
@@ -499,8 +506,8 @@
             <el-form-item label="有效期备注/Validity Comments">
               <el-input :value="currentRow.materialValidityComments || ''" disabled style="width: 190px"></el-input>
             </el-form-item>
-            <el-form-item label="是否Fiber材料/Fiber Material">
-              <el-input :value="displayYesNo(currentRow.isFiberMaterial)" disabled style="width: 190px"></el-input>
+            <el-form-item label="报告时间(月)/Expect Report Time">
+              <el-input :value="currentRow.expectReportTime" disabled style="width: 190px"></el-input>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
@@ -509,22 +516,11 @@
               <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>
-            <el-form-item label="WM所需求规格/WM Required Spec">
-              <el-input :value="currentRow.wmRequiredSpec || ''" disabled style="width: 190px"></el-input>
-            </el-form-item>
-            <el-form-item label="材料厚度/Material Thickness">
-              <el-input :value="currentRow.materialThickness || ''" disabled style="width: 190px"></el-input>
-            </el-form-item>
-          </el-form>
-          <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item>
               <span slot="label">采购/Buyer</span>
               <el-input :value="currentRow.buyer || ''" disabled style="width: 150px"></el-input>
               <el-input :value="currentRow.buyerName || ''" disabled style="width: 240px"></el-input>
             </el-form-item>
-            <el-form-item label="报告时间(月)/Expect Report Time">
-              <el-input :value="currentRow.expectReportTime" disabled style="width: 190px"></el-input>
-            </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item label="所需审批文件/Docs Needed">
@@ -549,16 +545,16 @@
               <el-input :value="currentRow.sgsReportNumber || ''" disabled style="width: 230px"></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: 150px"></el-date-picker>
+              <el-date-picker :value="currentRow.expiredDate" disabled type="date" value-format="yyyy-MM-dd" style="width: 180px"></el-date-picker>
             </el-form-item>
             <el-form-item label="有效期/Valid Until">
               <el-input :value="currentRow.validUntil || ''" disabled style="width: 180px"></el-input>
             </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: 180px"></el-input></el-form-item>
+            <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="HSF供应商等级/Supplier Class"><el-input :value="currentRow.hsfSupplierClassification || ''" disabled style="width: 180px"></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>