diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue
index 4466a88..d116d2d 100644
--- a/src/views/modules/rohs/rohsRecord.vue
+++ b/src/views/modules/rohs/rohsRecord.vue
@@ -100,7 +100,11 @@
       <el-table-column prop="technicalPlanName" header-align="center" align="center" label="技术计划名称" width="170"></el-table-column>
       <el-table-column prop="buyer" header-align="center" align="center" label="采购编码" width="130"></el-table-column>
       <el-table-column prop="buyerName" header-align="center" align="center" label="采购名称" width="130"></el-table-column>
-      <el-table-column prop="expectReportTime" header-align="center" align="center" label="预计提供报告时间" width="200"></el-table-column>
+      <el-table-column prop="expectReportTime" header-align="center" align="center" label="预计提供报告时间(一个月内)" width="200">
+        <template slot-scope="scope">
+          <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="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">
@@ -271,7 +275,7 @@
                 <el-input v-model="modalData.npdEngineerName" disabled style="width: 155px"></el-input>
               </el-form-item>
               <el-form-item label="材料有效期">
-                <el-date-picker v-model="modalData.materialValidityTime" type="date" value-format="yyyy-MM-dd" :disabled="isRohsFieldDisabled('materialValidityTime')" style="width: 100px" :editable=false></el-date-picker>
+                <dict-data-select v-model="modalData.materialValidityTime" clearable :disabled="isRohsFieldDisabled('materialValidityTime')" style="width: 100px" dict-type="rohs_material_validity_time"></dict-data-select>
               </el-form-item>
               <el-form-item label="是否需要Deviation" style="margin-left: 25px">
                 <el-radio-group v-model="modalData.needDeviation" :disabled="isRohsFieldDisabled('needDeviation')" style="width: 120px">
@@ -280,7 +284,7 @@
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="预计提供报告时间(一个月内)">
-                <el-input class="inlineNumber numInput" v-model="modalData.expectReportTime" :disabled="isRohsFieldDisabled('expectReportTime')" type="number" style="width: 260px"></el-input>
+                <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">
@@ -792,13 +796,13 @@
           </el-form>
           <el-form :inline="true" label-position="top" :model="currentRow">
             <el-form-item label="材料有效期">
-              <el-date-picker :value="currentRow.materialValidityTime" disabled type="date" value-format="yyyy-MM-dd" style="width: 190px"></el-date-picker>
+              <dict-data-select :value="currentRow.materialValidityTime || ''" :use-default-value="false" disabled style="width: 190px" 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>
             <el-form-item label="预计提供报告时间(一个月内)">
-              <el-input :value="currentRow.expectReportTime" disabled style="width: 190px"></el-input>
+              <el-date-picker :value="normalizeDateOnly(currentRow.expectReportTime)" 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">
@@ -1217,7 +1221,7 @@ export default {
         isFiberMaterial: '',
         materialThickness: '',
         buyer: '',
-        expectReportTime: 0,
+        expectReportTime: '',
         qualificationDocumentsNeeded: '',
         qualificationDocumentsNeededList: [],
         testReportIncludingItems: '',
@@ -2112,7 +2116,7 @@ export default {
             }
             row.applicationDate = this.normalizeDateOnly(row.applicationDate)
             row.plannedMassProductionDate = this.normalizeDateOnly(row.plannedMassProductionDate)
-            row.materialValidityTime = this.normalizeDateOnly(row.materialValidityTime)
+            row.expectReportTime = this.normalizeDateOnly(row.expectReportTime)
             row.expiredDate = this.normalizeDateOnly(row.expiredDate)
             row.validUntilDisplay = this.getValidUntilDisplay(row.validUntilValue, row.validUntil)
             return row
@@ -2278,7 +2282,7 @@ export default {
           materialThickness: '',
           buyer: '',
           buyerName: '',
-          expectReportTime: 0,
+          expectReportTime: '',
           qualificationDocumentsNeeded: '',
           qualificationDocumentsNeededList: [],
           testReportIncludingItems: '',