diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e133fdb..5758df9 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -89,11 +89,20 @@
     label: '逾期未检定',
     value: 'yqwjd',
   },
-]
+]// 检定结果
+const mesureResultMap = {
+  hg: '合格',
+  xhhg: '修后合格',
+  xy: '限用',
+  zy: '准用',
+  bhg: '不合格',
+  lj: '漏检',
+  yqwjd: '逾期未检定',
+}// 检定结果字典
 const mesureTypeList = [
   {
-    label: '外检',
-    value: 'wj',
+    label: '自检',
+    value: 'zj',
   },
   {
     label: '外包',
@@ -337,30 +346,32 @@
 
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
-    // res.data = {
-    //   ABC: 'A',
-    //   companyAddress: '北京/北京市',
-    //   customerName: '京东集团',
-    //   customerNo: 'sygf202211290001',
-    //   id: '',
-    //   labelBind: '11222',
-    //   manufacturer: '北京某厂家',
-    //   manufacturerCountry: 'CN',
-    //   manufacturingDate: '2023-03',
-    //   manufacturingNo: '123121',
-    //   mesureCategory: 'jd',
-    //   mesureContent: '项目1',
-    //   mesurePeriod: '1',
-    //   mesureType: 'wj',
-    //   minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    //   phone: '950618',
-    //   postalCode: 'test',
-    //   remark: '无备注',
-    //   sampleModel: '型号1',
-    //   sampleName: '样品1',
-    //   sampleNo: '',
-    // }
+  // res.data = {
+  //   ABC: 'A',
+  //   companyAddress: '北京/北京市',
+  //   customerName: '京东集团',
+  //   customerNo: 'sygf202211290001',
+  //   id: '',
+  //   labelBind: '11222',
+  //   manufacturer: '北京某厂家',
+  //   manufacturerCountry: 'CN',
+  //   manufacturingDate: '2023-03',
+  //   manufacturingNo: '123121',
+  //   mesureCategory: 'jd',
+  //   mesureContent: '项目1',
+  //   mesurePeriod: '1',
+  //   mesureType: 'zj',
+  //   minioFileName: '小程序工期表-1117_1674961769128.xlsx',
+  //   phone: '950618',
+  //   postalCode: 'test',
+  //   remark: '无备注',
+  //   sampleModel: '型号1',
+  //   sampleName: '样品1',
+  //   sampleNo: '',
+  //   measureResultCode: 'bhg',
+  // }
     dataForm.value = res.data
+    dataForm.value.measureResult = mesureResultMap[dataForm.value.measureResultCode]
     for (const item of menu) {
       item.searchFunc()
     }
@@ -599,7 +610,13 @@
             </el-col>
             <el-col :span="6">
               <el-form-item v-if="pageType === 'detail'" label="检定日期:">
-                <el-date-picker
+                <el-input
+                  v-model="dataForm.measureDate"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+                <!-- <el-date-picker
                   v-model="dataForm.manufacturingDate"
                   type="date"
                   format="YYYY-MM-DD"
@@ -608,12 +625,18 @@
                   :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
-                />
+                /> -->
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-date-picker
+                <el-input
+                  v-model="dataForm.effectiveDate"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+                <!-- <el-date-picker
                   v-model="dataForm.manufacturingDate"
                   type="date"
                   format="YYYY-MM-DD"
@@ -622,19 +645,25 @@
                   :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
-                />
+                /> -->
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-select
+                <el-input
+                  v-model="dataForm.measureResult"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                />
+                <!-- <el-select
                   v-model="dataForm.mesureCategory"
                   :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureResultList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
+                </el-select> -->
               </el-form-item>
             </el-col>
           </el-row>

diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e133fdb..5758df9 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -89,11 +89,20 @@
     label: '逾期未检定',
     value: 'yqwjd',
   },
-]
+]// 检定结果
+const mesureResultMap = {
+  hg: '合格',
+  xhhg: '修后合格',
+  xy: '限用',
+  zy: '准用',
+  bhg: '不合格',
+  lj: '漏检',
+  yqwjd: '逾期未检定',
+}// 检定结果字典
 const mesureTypeList = [
   {
-    label: '外检',
-    value: 'wj',
+    label: '自检',
+    value: 'zj',
   },
   {
     label: '外包',
@@ -337,30 +346,32 @@
 
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
-    // res.data = {
-    //   ABC: 'A',
-    //   companyAddress: '北京/北京市',
-    //   customerName: '京东集团',
-    //   customerNo: 'sygf202211290001',
-    //   id: '',
-    //   labelBind: '11222',
-    //   manufacturer: '北京某厂家',
-    //   manufacturerCountry: 'CN',
-    //   manufacturingDate: '2023-03',
-    //   manufacturingNo: '123121',
-    //   mesureCategory: 'jd',
-    //   mesureContent: '项目1',
-    //   mesurePeriod: '1',
-    //   mesureType: 'wj',
-    //   minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    //   phone: '950618',
-    //   postalCode: 'test',
-    //   remark: '无备注',
-    //   sampleModel: '型号1',
-    //   sampleName: '样品1',
-    //   sampleNo: '',
-    // }
+  // res.data = {
+  //   ABC: 'A',
+  //   companyAddress: '北京/北京市',
+  //   customerName: '京东集团',
+  //   customerNo: 'sygf202211290001',
+  //   id: '',
+  //   labelBind: '11222',
+  //   manufacturer: '北京某厂家',
+  //   manufacturerCountry: 'CN',
+  //   manufacturingDate: '2023-03',
+  //   manufacturingNo: '123121',
+  //   mesureCategory: 'jd',
+  //   mesureContent: '项目1',
+  //   mesurePeriod: '1',
+  //   mesureType: 'zj',
+  //   minioFileName: '小程序工期表-1117_1674961769128.xlsx',
+  //   phone: '950618',
+  //   postalCode: 'test',
+  //   remark: '无备注',
+  //   sampleModel: '型号1',
+  //   sampleName: '样品1',
+  //   sampleNo: '',
+  //   measureResultCode: 'bhg',
+  // }
     dataForm.value = res.data
+    dataForm.value.measureResult = mesureResultMap[dataForm.value.measureResultCode]
     for (const item of menu) {
       item.searchFunc()
     }
@@ -599,7 +610,13 @@
             </el-col>
             <el-col :span="6">
               <el-form-item v-if="pageType === 'detail'" label="检定日期:">
-                <el-date-picker
+                <el-input
+                  v-model="dataForm.measureDate"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+                <!-- <el-date-picker
                   v-model="dataForm.manufacturingDate"
                   type="date"
                   format="YYYY-MM-DD"
@@ -608,12 +625,18 @@
                   :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
-                />
+                /> -->
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-date-picker
+                <el-input
+                  v-model="dataForm.effectiveDate"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+                <!-- <el-date-picker
                   v-model="dataForm.manufacturingDate"
                   type="date"
                   format="YYYY-MM-DD"
@@ -622,19 +645,25 @@
                   :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
-                />
+                /> -->
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-select
+                <el-input
+                  v-model="dataForm.measureResult"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                />
+                <!-- <el-select
                   v-model="dataForm.mesureCategory"
                   :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureResultList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
+                </el-select> -->
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 3d46b46..08dc008 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -47,33 +47,46 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  loadingTable.value = true
+  // loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
-  getSampleList(listQuery.value).then((response) => {
-    // 模拟数据
+  // getSampleList(listQuery.value).then((response) => {
+  // 模拟数据
 
-    // response.data.rows = [
-    //   {
-    //     id: '1597579843411234817',
-    //     sampleNo: '1', // 样品编号
-    //     sampleName: '1', // 样品名称
-    //     sampleModel: '1', // 型号
-    //     evaluationName: '1', // 出厂编号
-    //     customerId: '1', // 委托方代码
-    //     customerName: '1', // 委托方名称
-    //     mesurePeriod: '1', // 检定周期
-    //     effectiveDate: '1', // 上次检定时间
-    //     remark: '备注', // 备注
-    //   }]
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
+  // response.data.rows = [
+  //   {
+  //     id: '1597579843411234817',
+  //     sampleNo: '1', // 样品编号
+  //     sampleName: '1', // 样品名称
+  //     sampleModel: '1', // 型号
+  //     evaluationName: '1', // 出厂编号
+  //     customerId: '1', // 委托方代码
+  //     customerName: '1', // 委托方名称
+  //     mesurePeriod: '1', // 检定周期
+  //     effectiveDate: '1', // 上次检定时间
+  //     remark: '备注', // 备注
+  //   }]
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      id: '1597579843411234817',
+      sampleNo: '1', // 样品编号
+      sampleName: '1', // 样品名称
+      sampleModel: '1', // 型号
+      evaluationName: '1', // 出厂编号
+      customerId: '1', // 委托方代码
+      customerName: '1', // 委托方名称
+      mesurePeriod: '1', // 检定周期
+      effectiveDate: '1', // 上次检定时间
+      remark: '备注', // 备注
+    }]
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {

diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index e133fdb..5758df9 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -89,11 +89,20 @@
     label: '逾期未检定',
     value: 'yqwjd',
   },
-]
+]// 检定结果
+const mesureResultMap = {
+  hg: '合格',
+  xhhg: '修后合格',
+  xy: '限用',
+  zy: '准用',
+  bhg: '不合格',
+  lj: '漏检',
+  yqwjd: '逾期未检定',
+}// 检定结果字典
 const mesureTypeList = [
   {
-    label: '外检',
-    value: 'wj',
+    label: '自检',
+    value: 'zj',
   },
   {
     label: '外包',
@@ -337,30 +346,32 @@
 
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
-    // res.data = {
-    //   ABC: 'A',
-    //   companyAddress: '北京/北京市',
-    //   customerName: '京东集团',
-    //   customerNo: 'sygf202211290001',
-    //   id: '',
-    //   labelBind: '11222',
-    //   manufacturer: '北京某厂家',
-    //   manufacturerCountry: 'CN',
-    //   manufacturingDate: '2023-03',
-    //   manufacturingNo: '123121',
-    //   mesureCategory: 'jd',
-    //   mesureContent: '项目1',
-    //   mesurePeriod: '1',
-    //   mesureType: 'wj',
-    //   minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-    //   phone: '950618',
-    //   postalCode: 'test',
-    //   remark: '无备注',
-    //   sampleModel: '型号1',
-    //   sampleName: '样品1',
-    //   sampleNo: '',
-    // }
+  // res.data = {
+  //   ABC: 'A',
+  //   companyAddress: '北京/北京市',
+  //   customerName: '京东集团',
+  //   customerNo: 'sygf202211290001',
+  //   id: '',
+  //   labelBind: '11222',
+  //   manufacturer: '北京某厂家',
+  //   manufacturerCountry: 'CN',
+  //   manufacturingDate: '2023-03',
+  //   manufacturingNo: '123121',
+  //   mesureCategory: 'jd',
+  //   mesureContent: '项目1',
+  //   mesurePeriod: '1',
+  //   mesureType: 'zj',
+  //   minioFileName: '小程序工期表-1117_1674961769128.xlsx',
+  //   phone: '950618',
+  //   postalCode: 'test',
+  //   remark: '无备注',
+  //   sampleModel: '型号1',
+  //   sampleName: '样品1',
+  //   sampleNo: '',
+  //   measureResultCode: 'bhg',
+  // }
     dataForm.value = res.data
+    dataForm.value.measureResult = mesureResultMap[dataForm.value.measureResultCode]
     for (const item of menu) {
       item.searchFunc()
     }
@@ -599,7 +610,13 @@
             </el-col>
             <el-col :span="6">
               <el-form-item v-if="pageType === 'detail'" label="检定日期:">
-                <el-date-picker
+                <el-input
+                  v-model="dataForm.measureDate"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+                <!-- <el-date-picker
                   v-model="dataForm.manufacturingDate"
                   type="date"
                   format="YYYY-MM-DD"
@@ -608,12 +625,18 @@
                   :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
-                />
+                /> -->
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item v-if="pageType === 'detail'" label="有效日期:">
-                <el-date-picker
+                <el-input
+                  v-model="dataForm.effectiveDate"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+                <!-- <el-date-picker
                   v-model="dataForm.manufacturingDate"
                   type="date"
                   format="YYYY-MM-DD"
@@ -622,19 +645,25 @@
                   :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
-                />
+                /> -->
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item v-if="pageType === 'detail'" label="检定结果:">
-                <el-select
+                <el-input
+                  v-model="dataForm.measureResult"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                />
+                <!-- <el-select
                   v-model="dataForm.mesureCategory"
                   :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
                   <el-option v-for="item of mesureResultList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
+                </el-select> -->
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 3d46b46..08dc008 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -47,33 +47,46 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  loadingTable.value = true
+  // loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
   listQuery.value.startTime = timeRange.value[0] as string || ''
   listQuery.value.endTime = timeRange.value[1] as string || ''
-  getSampleList(listQuery.value).then((response) => {
-    // 模拟数据
+  // getSampleList(listQuery.value).then((response) => {
+  // 模拟数据
 
-    // response.data.rows = [
-    //   {
-    //     id: '1597579843411234817',
-    //     sampleNo: '1', // 样品编号
-    //     sampleName: '1', // 样品名称
-    //     sampleModel: '1', // 型号
-    //     evaluationName: '1', // 出厂编号
-    //     customerId: '1', // 委托方代码
-    //     customerName: '1', // 委托方名称
-    //     mesurePeriod: '1', // 检定周期
-    //     effectiveDate: '1', // 上次检定时间
-    //     remark: '备注', // 备注
-    //   }]
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
+  // response.data.rows = [
+  //   {
+  //     id: '1597579843411234817',
+  //     sampleNo: '1', // 样品编号
+  //     sampleName: '1', // 样品名称
+  //     sampleModel: '1', // 型号
+  //     evaluationName: '1', // 出厂编号
+  //     customerId: '1', // 委托方代码
+  //     customerName: '1', // 委托方名称
+  //     mesurePeriod: '1', // 检定周期
+  //     effectiveDate: '1', // 上次检定时间
+  //     remark: '备注', // 备注
+  //   }]
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      id: '1597579843411234817',
+      sampleNo: '1', // 样品编号
+      sampleName: '1', // 样品名称
+      sampleModel: '1', // 型号
+      evaluationName: '1', // 出厂编号
+      customerId: '1', // 委托方代码
+      customerName: '1', // 委托方名称
+      mesurePeriod: '1', // 检定周期
+      effectiveDate: '1', // 上次检定时间
+      remark: '备注', // 备注
+    }]
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index f8c4555..f5d0514 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -47,6 +47,10 @@
   minioFileName: string // 说明书
   labelBind: string // 标签绑定
   mesureType: string // 检定方式
+  measureDate?: string // 检定日期
+  effectiveDate?: string // 有效日期
+  measureResultCode?: string // 检定结果代码
+  measureResult?: string // 检定结果
 }
 
 // 检定记录