diff --git a/.env.development b/.env.development
index 24b7f33..cad65fb 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,8 @@
 VITE_APP_TITLE = 计量管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
-VITE_APP_API_BASEURL = http://111.198.10.15:21409
+# VITE_APP_API_BASEURL = http://111.198.10.15:21409
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 

diff --git a/.env.development b/.env.development
index 24b7f33..cad65fb 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,8 @@
 VITE_APP_TITLE = 计量管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
-VITE_APP_API_BASEURL = http://111.198.10.15:21409
+# VITE_APP_API_BASEURL = http://111.198.10.15:21409
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.production b/.env.production
index 09991f2..b160531 100644
--- a/.env.production
+++ b/.env.production
@@ -3,6 +3,7 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =

diff --git a/.env.development b/.env.development
index 24b7f33..cad65fb 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,8 @@
 VITE_APP_TITLE = 计量管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
-VITE_APP_API_BASEURL = http://111.198.10.15:21409
+# VITE_APP_API_BASEURL = http://111.198.10.15:21409
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.production b/.env.production
index 09991f2..b160531 100644
--- a/.env.production
+++ b/.env.production
@@ -3,6 +3,7 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 44338aa..5ba0a6d 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -32,3 +32,29 @@
     data,
   })
 }
+
+// 新增数据
+export function addSample(data: object) {
+  return request({
+    url: `${prefix}/sample/submit`,
+    method: 'post',
+    data,
+  })
+}
+// 编辑数据
+export function updateSample(data: object) {
+  return request({
+    url: `${prefix}/sample/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSapmleDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/detail`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/.env.development b/.env.development
index 24b7f33..cad65fb 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,8 @@
 VITE_APP_TITLE = 计量管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
-VITE_APP_API_BASEURL = http://111.198.10.15:21409
+# VITE_APP_API_BASEURL = http://111.198.10.15:21409
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.production b/.env.production
index 09991f2..b160531 100644
--- a/.env.production
+++ b/.env.production
@@ -3,6 +3,7 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 44338aa..5ba0a6d 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -32,3 +32,29 @@
     data,
   })
 }
+
+// 新增数据
+export function addSample(data: object) {
+  return request({
+    url: `${prefix}/sample/submit`,
+    method: 'post',
+    data,
+  })
+}
+// 编辑数据
+export function updateSample(data: object) {
+  return request({
+    url: `${prefix}/sample/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSapmleDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index d470c49..389d4ee 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -50,6 +50,42 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'SampleDetail',
+        component: () => import('@/views/customer/sample/list/edit.vue'),
+        meta: {
+          title: '样品详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/sample/list',
+        },
+      },
+      // {
+      //   path: 'edit',
+      //   name: 'SampleEdit',
+      //   component: () => import('@/views/customer/sample/list/edit.vue'),
+      //   meta: {
+      //     title: '编辑样品',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/sample/list',
+      //   },
+      // },
+      // {
+      //   path: 'detail',
+      //   name: 'SampleDetail',
+      //   component: () => import('@/views/customer/sample/list/detail.vue'),
+      //   meta: {
+      //     title: '样品详情',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/sample/list',
+      //   },
+      // },
+      {
         path: 'overtime',
         name: 'OvertimeSample',
         component: () => import('@/views/customer/sample/overTime/list.vue'),

diff --git a/.env.development b/.env.development
index 24b7f33..cad65fb 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,8 @@
 VITE_APP_TITLE = 计量管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
-VITE_APP_API_BASEURL = http://111.198.10.15:21409
+# VITE_APP_API_BASEURL = http://111.198.10.15:21409
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.production b/.env.production
index 09991f2..b160531 100644
--- a/.env.production
+++ b/.env.production
@@ -3,6 +3,7 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 44338aa..5ba0a6d 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -32,3 +32,29 @@
     data,
   })
 }
+
+// 新增数据
+export function addSample(data: object) {
+  return request({
+    url: `${prefix}/sample/submit`,
+    method: 'post',
+    data,
+  })
+}
+// 编辑数据
+export function updateSample(data: object) {
+  return request({
+    url: `${prefix}/sample/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSapmleDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index d470c49..389d4ee 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -50,6 +50,42 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'SampleDetail',
+        component: () => import('@/views/customer/sample/list/edit.vue'),
+        meta: {
+          title: '样品详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/sample/list',
+        },
+      },
+      // {
+      //   path: 'edit',
+      //   name: 'SampleEdit',
+      //   component: () => import('@/views/customer/sample/list/edit.vue'),
+      //   meta: {
+      //     title: '编辑样品',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/sample/list',
+      //   },
+      // },
+      // {
+      //   path: 'detail',
+      //   name: 'SampleDetail',
+      //   component: () => import('@/views/customer/sample/list/detail.vue'),
+      //   meta: {
+      //     title: '样品详情',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/sample/list',
+      //   },
+      // },
+      {
         path: 'overtime',
         name: 'OvertimeSample',
         component: () => import('@/views/customer/sample/overTime/list.vue'),
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
new file mode 100644
index 0000000..e133fdb
--- /dev/null
+++ b/src/views/customer/sample/list/edit.vue
@@ -0,0 +1,713 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="SampleEdit">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
+import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from './sample_list_interface'
+import sampleDialog from './sampleDialog.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const mesureCategoryList = [
+  {
+    label: '检定',
+    value: 'jd',
+  },
+  {
+    label: '检测',
+    value: 'jc',
+  },
+  {
+    label: '验收检定',
+    value: 'ysjd',
+  },
+  {
+    label: '抽检',
+    value: 'cj',
+  },
+  {
+    label: '校准',
+    value: 'jz',
+  },
+  {
+    label: '测试',
+    value: 'cs',
+  },
+  {
+    label: '验收校准',
+    value: 'ysjz',
+  },
+]// 校检类别
+const mesureResultList = [
+  {
+    label: '合格',
+    value: 'hg',
+  },
+  {
+    label: '修后合格',
+    value: 'xhhg',
+  },
+  {
+    label: '限用',
+    value: 'xy',
+  },
+  {
+    label: '准用',
+    value: 'zy',
+  },
+  {
+    label: '不合格',
+    value: 'bhg',
+  },
+  {
+    label: '漏检',
+    value: 'lj',
+  },
+  {
+    label: '逾期未检定',
+    value: 'yqwjd',
+  },
+]
+const mesureTypeList = [
+  {
+    label: '外检',
+    value: 'wj',
+  },
+  {
+    label: '外包',
+    value: 'wb',
+  },
+]// 检定方式
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  companyAddress: '', // 委托方地址
+  mesureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  mesureContent: '', // 检定项目
+  mesurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  mesureType: '', // 检定方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
+  postalCode: [{ required: true, message: '委托方邮编不能为空', trigger: 'blur' }],
+  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
+  mesureContent: [{ required: true, message: '检定项目不能为空', trigger: 'blur' }],
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+  console.log(visible.value)
+}
+
+// 选好委托方
+const confirmCheckout = (val: any) => {
+  dataForm.value.customerNo = val[0].customerNo
+  dataForm.value.customerName = val[0].customerName
+  dataForm.value.phone = val[0].phone
+  dataForm.value.postalCode = val[0].postalCode
+  dataForm.value.companyAddress = val[0].briefName
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 提交表单
+function submitForm() {
+  if (dataForm.value.id) {
+    const params = {
+      id: dataForm.value.id,
+      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
+    }
+    addSample(params).then((res) => {
+      ElMessage.success('提交成功')
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+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: '',
+    // }
+    dataForm.value = res.data
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                  @focus="customerNoFocus"
+                >
+                  <template #suffix>
+                    <el-icon class="el-input__icon">
+                      <search />
+                    </el-icon>
+                    <!-- <el-button v-if="pageType !== 'detail'" @click="upload">
+                      xuanze
+                    </el-button> -->
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="dataForm.companyAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="dataForm.mesureCategory"
+                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="18">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="dataForm.mesureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="dataForm.mesurePeriod"
+                  :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
+                  v-model="dataForm.manufacturingDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :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
+                  v-model="dataForm.manufacturingDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :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
+                  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-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.mesureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+

diff --git a/.env.development b/.env.development
index 24b7f33..cad65fb 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,8 @@
 VITE_APP_TITLE = 计量管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
-VITE_APP_API_BASEURL = http://111.198.10.15:21409
+# VITE_APP_API_BASEURL = http://111.198.10.15:21409
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.production b/.env.production
index 09991f2..b160531 100644
--- a/.env.production
+++ b/.env.production
@@ -3,6 +3,7 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 44338aa..5ba0a6d 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -32,3 +32,29 @@
     data,
   })
 }
+
+// 新增数据
+export function addSample(data: object) {
+  return request({
+    url: `${prefix}/sample/submit`,
+    method: 'post',
+    data,
+  })
+}
+// 编辑数据
+export function updateSample(data: object) {
+  return request({
+    url: `${prefix}/sample/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSapmleDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index d470c49..389d4ee 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -50,6 +50,42 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'SampleDetail',
+        component: () => import('@/views/customer/sample/list/edit.vue'),
+        meta: {
+          title: '样品详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/sample/list',
+        },
+      },
+      // {
+      //   path: 'edit',
+      //   name: 'SampleEdit',
+      //   component: () => import('@/views/customer/sample/list/edit.vue'),
+      //   meta: {
+      //     title: '编辑样品',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/sample/list',
+      //   },
+      // },
+      // {
+      //   path: 'detail',
+      //   name: 'SampleDetail',
+      //   component: () => import('@/views/customer/sample/list/detail.vue'),
+      //   meta: {
+      //     title: '样品详情',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/sample/list',
+      //   },
+      // },
+      {
         path: 'overtime',
         name: 'OvertimeSample',
         component: () => import('@/views/customer/sample/overTime/list.vue'),
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
new file mode 100644
index 0000000..e133fdb
--- /dev/null
+++ b/src/views/customer/sample/list/edit.vue
@@ -0,0 +1,713 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="SampleEdit">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
+import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from './sample_list_interface'
+import sampleDialog from './sampleDialog.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const mesureCategoryList = [
+  {
+    label: '检定',
+    value: 'jd',
+  },
+  {
+    label: '检测',
+    value: 'jc',
+  },
+  {
+    label: '验收检定',
+    value: 'ysjd',
+  },
+  {
+    label: '抽检',
+    value: 'cj',
+  },
+  {
+    label: '校准',
+    value: 'jz',
+  },
+  {
+    label: '测试',
+    value: 'cs',
+  },
+  {
+    label: '验收校准',
+    value: 'ysjz',
+  },
+]// 校检类别
+const mesureResultList = [
+  {
+    label: '合格',
+    value: 'hg',
+  },
+  {
+    label: '修后合格',
+    value: 'xhhg',
+  },
+  {
+    label: '限用',
+    value: 'xy',
+  },
+  {
+    label: '准用',
+    value: 'zy',
+  },
+  {
+    label: '不合格',
+    value: 'bhg',
+  },
+  {
+    label: '漏检',
+    value: 'lj',
+  },
+  {
+    label: '逾期未检定',
+    value: 'yqwjd',
+  },
+]
+const mesureTypeList = [
+  {
+    label: '外检',
+    value: 'wj',
+  },
+  {
+    label: '外包',
+    value: 'wb',
+  },
+]// 检定方式
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  companyAddress: '', // 委托方地址
+  mesureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  mesureContent: '', // 检定项目
+  mesurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  mesureType: '', // 检定方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
+  postalCode: [{ required: true, message: '委托方邮编不能为空', trigger: 'blur' }],
+  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
+  mesureContent: [{ required: true, message: '检定项目不能为空', trigger: 'blur' }],
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+  console.log(visible.value)
+}
+
+// 选好委托方
+const confirmCheckout = (val: any) => {
+  dataForm.value.customerNo = val[0].customerNo
+  dataForm.value.customerName = val[0].customerName
+  dataForm.value.phone = val[0].phone
+  dataForm.value.postalCode = val[0].postalCode
+  dataForm.value.companyAddress = val[0].briefName
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 提交表单
+function submitForm() {
+  if (dataForm.value.id) {
+    const params = {
+      id: dataForm.value.id,
+      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
+    }
+    addSample(params).then((res) => {
+      ElMessage.success('提交成功')
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+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: '',
+    // }
+    dataForm.value = res.data
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                  @focus="customerNoFocus"
+                >
+                  <template #suffix>
+                    <el-icon class="el-input__icon">
+                      <search />
+                    </el-icon>
+                    <!-- <el-button v-if="pageType !== 'detail'" @click="upload">
+                      xuanze
+                    </el-button> -->
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="dataForm.companyAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="dataForm.mesureCategory"
+                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="18">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="dataForm.mesureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="dataForm.mesurePeriod"
+                  :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
+                  v-model="dataForm.manufacturingDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :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
+                  v-model="dataForm.manufacturingDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :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
+                  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-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.mesureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 79f4348..3d46b46 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -17,8 +17,8 @@
   sampleModel: '', // 型号
   customerId: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 投诉开始时间
-  endTime: '1', // 投诉结束时间
+  startTime: '1', // 检定开始时间
+  endTime: '1', // 检定结束时间
   offset: 1,
   limit: 20,
 })
@@ -56,19 +56,20 @@
   listQuery.value.endTime = timeRange.value[1] as string || ''
   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: '备注', // 备注
-      }]
+
+    // 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
@@ -81,7 +82,7 @@
 
 // 点击编辑/详情
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
-  $router.push(`/customerManage/advice/${pageType}/${row.id}`)
+  $router.push(`/sample/${pageType}/${row.id}`)
 }
 // 点击删除
 const handleDelete = (index: string, row: ISampleList) => {
@@ -166,9 +167,9 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
-// 添加客户
+// 新建样品
 const add = () => {
-  $router.push('/customerManage/advice/add')
+  $router.push('/sample/add')
 }
 // 导出
 const exportAll = () => {
@@ -281,7 +282,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/sample/list/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-        <icon-button v-if="proxy.hasPerm('/sample/list/mould')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button v-if="proxy.hasPerm('/sample/list/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
         <icon-button v-if="proxy.hasPerm('/sample/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />

diff --git a/.env.development b/.env.development
index 24b7f33..cad65fb 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,8 @@
 VITE_APP_TITLE = 计量管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
-VITE_APP_API_BASEURL = http://111.198.10.15:21409
+# VITE_APP_API_BASEURL = http://111.198.10.15:21409
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.production b/.env.production
index 09991f2..b160531 100644
--- a/.env.production
+++ b/.env.production
@@ -3,6 +3,7 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 44338aa..5ba0a6d 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -32,3 +32,29 @@
     data,
   })
 }
+
+// 新增数据
+export function addSample(data: object) {
+  return request({
+    url: `${prefix}/sample/submit`,
+    method: 'post',
+    data,
+  })
+}
+// 编辑数据
+export function updateSample(data: object) {
+  return request({
+    url: `${prefix}/sample/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSapmleDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index d470c49..389d4ee 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -50,6 +50,42 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'SampleDetail',
+        component: () => import('@/views/customer/sample/list/edit.vue'),
+        meta: {
+          title: '样品详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/sample/list',
+        },
+      },
+      // {
+      //   path: 'edit',
+      //   name: 'SampleEdit',
+      //   component: () => import('@/views/customer/sample/list/edit.vue'),
+      //   meta: {
+      //     title: '编辑样品',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/sample/list',
+      //   },
+      // },
+      // {
+      //   path: 'detail',
+      //   name: 'SampleDetail',
+      //   component: () => import('@/views/customer/sample/list/detail.vue'),
+      //   meta: {
+      //     title: '样品详情',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/sample/list',
+      //   },
+      // },
+      {
         path: 'overtime',
         name: 'OvertimeSample',
         component: () => import('@/views/customer/sample/overTime/list.vue'),
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
new file mode 100644
index 0000000..e133fdb
--- /dev/null
+++ b/src/views/customer/sample/list/edit.vue
@@ -0,0 +1,713 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="SampleEdit">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
+import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from './sample_list_interface'
+import sampleDialog from './sampleDialog.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const mesureCategoryList = [
+  {
+    label: '检定',
+    value: 'jd',
+  },
+  {
+    label: '检测',
+    value: 'jc',
+  },
+  {
+    label: '验收检定',
+    value: 'ysjd',
+  },
+  {
+    label: '抽检',
+    value: 'cj',
+  },
+  {
+    label: '校准',
+    value: 'jz',
+  },
+  {
+    label: '测试',
+    value: 'cs',
+  },
+  {
+    label: '验收校准',
+    value: 'ysjz',
+  },
+]// 校检类别
+const mesureResultList = [
+  {
+    label: '合格',
+    value: 'hg',
+  },
+  {
+    label: '修后合格',
+    value: 'xhhg',
+  },
+  {
+    label: '限用',
+    value: 'xy',
+  },
+  {
+    label: '准用',
+    value: 'zy',
+  },
+  {
+    label: '不合格',
+    value: 'bhg',
+  },
+  {
+    label: '漏检',
+    value: 'lj',
+  },
+  {
+    label: '逾期未检定',
+    value: 'yqwjd',
+  },
+]
+const mesureTypeList = [
+  {
+    label: '外检',
+    value: 'wj',
+  },
+  {
+    label: '外包',
+    value: 'wb',
+  },
+]// 检定方式
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  companyAddress: '', // 委托方地址
+  mesureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  mesureContent: '', // 检定项目
+  mesurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  mesureType: '', // 检定方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
+  postalCode: [{ required: true, message: '委托方邮编不能为空', trigger: 'blur' }],
+  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
+  mesureContent: [{ required: true, message: '检定项目不能为空', trigger: 'blur' }],
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+  console.log(visible.value)
+}
+
+// 选好委托方
+const confirmCheckout = (val: any) => {
+  dataForm.value.customerNo = val[0].customerNo
+  dataForm.value.customerName = val[0].customerName
+  dataForm.value.phone = val[0].phone
+  dataForm.value.postalCode = val[0].postalCode
+  dataForm.value.companyAddress = val[0].briefName
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 提交表单
+function submitForm() {
+  if (dataForm.value.id) {
+    const params = {
+      id: dataForm.value.id,
+      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
+    }
+    addSample(params).then((res) => {
+      ElMessage.success('提交成功')
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+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: '',
+    // }
+    dataForm.value = res.data
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                  @focus="customerNoFocus"
+                >
+                  <template #suffix>
+                    <el-icon class="el-input__icon">
+                      <search />
+                    </el-icon>
+                    <!-- <el-button v-if="pageType !== 'detail'" @click="upload">
+                      xuanze
+                    </el-button> -->
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="dataForm.companyAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="dataForm.mesureCategory"
+                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="18">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="dataForm.mesureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="dataForm.mesurePeriod"
+                  :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
+                  v-model="dataForm.manufacturingDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :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
+                  v-model="dataForm.manufacturingDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :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
+                  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-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.mesureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 79f4348..3d46b46 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -17,8 +17,8 @@
   sampleModel: '', // 型号
   customerId: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 投诉开始时间
-  endTime: '1', // 投诉结束时间
+  startTime: '1', // 检定开始时间
+  endTime: '1', // 检定结束时间
   offset: 1,
   limit: 20,
 })
@@ -56,19 +56,20 @@
   listQuery.value.endTime = timeRange.value[1] as string || ''
   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: '备注', // 备注
-      }]
+
+    // 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
@@ -81,7 +82,7 @@
 
 // 点击编辑/详情
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
-  $router.push(`/customerManage/advice/${pageType}/${row.id}`)
+  $router.push(`/sample/${pageType}/${row.id}`)
 }
 // 点击删除
 const handleDelete = (index: string, row: ISampleList) => {
@@ -166,9 +167,9 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
-// 添加客户
+// 新建样品
 const add = () => {
-  $router.push('/customerManage/advice/add')
+  $router.push('/sample/add')
 }
 // 导出
 const exportAll = () => {
@@ -281,7 +282,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/sample/list/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-        <icon-button v-if="proxy.hasPerm('/sample/list/mould')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button v-if="proxy.hasPerm('/sample/list/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
         <icon-button v-if="proxy.hasPerm('/sample/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/customer/sample/list/sampleDialog.vue b/src/views/customer/sample/list/sampleDialog.vue
new file mode 100644
index 0000000..ea2d652
--- /dev/null
+++ b/src/views/customer/sample/list/sampleDialog.vue
@@ -0,0 +1,227 @@
+<script setup lang="ts" name="sampleDialog">
+import { computed, getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ICustomer, ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getCustomerList } from '@/api/customer/customer'
+import { getDictByCode } from '@/api/system/dict'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set(val) {
+    emits('changeVisible', val)
+  },
+})
+
+// 查询条件
+const listQuery: Ref<ICustomerQuery> = ref({
+  bussinessSize: '', // 业务规模
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  grade: '', // 履约评级
+  offset: 1,
+  limit: 20,
+})
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+const businessSizeList = ref<dictType[]>([]) // 业务规模列表
+const gradeList = ref<dictType[]>([]) // 履约评级列表
+// const evaluationList = ref<dictType[]>([]) // 整体评价列表
+function getDict() {
+  // // 获取公司规模
+  // getDictByCode('companySize').then((response) => {
+  //   companySizeList.value = response.data
+  // })
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+  // // 获取整体评价
+  // getDictByCode('evaluation').then((response) => {
+  //   evaluationList.value = response.data
+  // })
+}
+getDict()
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', width: '120', align: 'center' },
+  { text: '公司规模', value: 'companySizeName', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', align: 'center' },
+  { text: '履约评级', value: 'gradeName', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '公司地址', value: 'briefName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<ICustomer[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getCustomerList(listQuery.value).then((response) => {
+  //   // 模拟数据
+  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
+  //   list.value = response.data.rows.map((item: ICustomer) => {
+  //     if (item.companyProvinceName && item.companyCityName) {
+  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+  //     }
+  //     else {
+  //       item.briefName = item.companyProvinceName || item.companyCityName
+  //     }
+  //     return item
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+
+  // 模拟数据
+  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
+    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
+    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
+  list.value = response.map((item: ICustomer) => {
+    if (item.companyProvinceName && item.companyCityName) {
+      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+    }
+    else {
+      item.briefName = item.companyProvinceName || item.companyCityName
+    }
+    return item
+  })
+  total.value = 50
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    bussinessSize: '', // 业务规模
+    customerName: '', // 公司名称
+    customerNo: '', // 客户编号
+    grade: '', // 履约评级
+    offset: 1,
+    limit: 20,
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+// 点击确定
+const clickConfirm = () => {
+  console.log(checkoutList.value)
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+fetchData(true)
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择委托方" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.customerNo"
+            placeholder="客户编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.customerName"
+            placeholder="公司名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+            <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.grade" placeholder="履约评级">
+            <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>

diff --git a/.env.development b/.env.development
index 24b7f33..cad65fb 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,8 @@
 VITE_APP_TITLE = 计量管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
-VITE_APP_API_BASEURL = http://111.198.10.15:21409
+# VITE_APP_API_BASEURL = http://111.198.10.15:21409
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.production b/.env.production
index 09991f2..b160531 100644
--- a/.env.production
+++ b/.env.production
@@ -3,6 +3,7 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 44338aa..5ba0a6d 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -32,3 +32,29 @@
     data,
   })
 }
+
+// 新增数据
+export function addSample(data: object) {
+  return request({
+    url: `${prefix}/sample/submit`,
+    method: 'post',
+    data,
+  })
+}
+// 编辑数据
+export function updateSample(data: object) {
+  return request({
+    url: `${prefix}/sample/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSapmleDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/sample/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index d470c49..389d4ee 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -50,6 +50,42 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'SampleDetail',
+        component: () => import('@/views/customer/sample/list/edit.vue'),
+        meta: {
+          title: '样品详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/sample/list',
+        },
+      },
+      // {
+      //   path: 'edit',
+      //   name: 'SampleEdit',
+      //   component: () => import('@/views/customer/sample/list/edit.vue'),
+      //   meta: {
+      //     title: '编辑样品',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/sample/list',
+      //   },
+      // },
+      // {
+      //   path: 'detail',
+      //   name: 'SampleDetail',
+      //   component: () => import('@/views/customer/sample/list/detail.vue'),
+      //   meta: {
+      //     title: '样品详情',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/sample/list',
+      //   },
+      // },
+      {
         path: 'overtime',
         name: 'OvertimeSample',
         component: () => import('@/views/customer/sample/overTime/list.vue'),
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
new file mode 100644
index 0000000..e133fdb
--- /dev/null
+++ b/src/views/customer/sample/list/edit.vue
@@ -0,0 +1,713 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="SampleEdit">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
+import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from './sample_list_interface'
+import sampleDialog from './sampleDialog.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const mesureCategoryList = [
+  {
+    label: '检定',
+    value: 'jd',
+  },
+  {
+    label: '检测',
+    value: 'jc',
+  },
+  {
+    label: '验收检定',
+    value: 'ysjd',
+  },
+  {
+    label: '抽检',
+    value: 'cj',
+  },
+  {
+    label: '校准',
+    value: 'jz',
+  },
+  {
+    label: '测试',
+    value: 'cs',
+  },
+  {
+    label: '验收校准',
+    value: 'ysjz',
+  },
+]// 校检类别
+const mesureResultList = [
+  {
+    label: '合格',
+    value: 'hg',
+  },
+  {
+    label: '修后合格',
+    value: 'xhhg',
+  },
+  {
+    label: '限用',
+    value: 'xy',
+  },
+  {
+    label: '准用',
+    value: 'zy',
+  },
+  {
+    label: '不合格',
+    value: 'bhg',
+  },
+  {
+    label: '漏检',
+    value: 'lj',
+  },
+  {
+    label: '逾期未检定',
+    value: 'yqwjd',
+  },
+]
+const mesureTypeList = [
+  {
+    label: '外检',
+    value: 'wj',
+  },
+  {
+    label: '外包',
+    value: 'wb',
+  },
+]// 检定方式
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  companyAddress: '', // 委托方地址
+  mesureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  mesureContent: '', // 检定项目
+  mesurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  mesureType: '', // 检定方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
+  postalCode: [{ required: true, message: '委托方邮编不能为空', trigger: 'blur' }],
+  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
+  mesureContent: [{ required: true, message: '检定项目不能为空', trigger: 'blur' }],
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+  console.log(visible.value)
+}
+
+// 选好委托方
+const confirmCheckout = (val: any) => {
+  dataForm.value.customerNo = val[0].customerNo
+  dataForm.value.customerName = val[0].customerName
+  dataForm.value.phone = val[0].phone
+  dataForm.value.postalCode = val[0].postalCode
+  dataForm.value.companyAddress = val[0].briefName
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 提交表单
+function submitForm() {
+  if (dataForm.value.id) {
+    const params = {
+      id: dataForm.value.id,
+      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
+    }
+    addSample(params).then((res) => {
+      ElMessage.success('提交成功')
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+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: '',
+    // }
+    dataForm.value = res.data
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                  @focus="customerNoFocus"
+                >
+                  <template #suffix>
+                    <el-icon class="el-input__icon">
+                      <search />
+                    </el-icon>
+                    <!-- <el-button v-if="pageType !== 'detail'" @click="upload">
+                      xuanze
+                    </el-button> -->
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="dataForm.companyAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="dataForm.mesureCategory"
+                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="18">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="dataForm.mesureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="dataForm.mesurePeriod"
+                  :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
+                  v-model="dataForm.manufacturingDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :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
+                  v-model="dataForm.manufacturingDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :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
+                  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-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.mesureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 79f4348..3d46b46 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -17,8 +17,8 @@
   sampleModel: '', // 型号
   customerId: '', // 委托方代码
   customerName: '', // 委托方名称
-  startTime: '1', // 投诉开始时间
-  endTime: '1', // 投诉结束时间
+  startTime: '1', // 检定开始时间
+  endTime: '1', // 检定结束时间
   offset: 1,
   limit: 20,
 })
@@ -56,19 +56,20 @@
   listQuery.value.endTime = timeRange.value[1] as string || ''
   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: '备注', // 备注
-      }]
+
+    // 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
@@ -81,7 +82,7 @@
 
 // 点击编辑/详情
 const handleEdit = (row: ISampleList, pageType: 'edit' | 'detail') => {
-  $router.push(`/customerManage/advice/${pageType}/${row.id}`)
+  $router.push(`/sample/${pageType}/${row.id}`)
 }
 // 点击删除
 const handleDelete = (index: string, row: ISampleList) => {
@@ -166,9 +167,9 @@
 const uploadAll = () => {
   fileRef.value.click()
 }
-// 添加客户
+// 新建样品
 const add = () => {
-  $router.push('/customerManage/advice/add')
+  $router.push('/sample/add')
 }
 // 导出
 const exportAll = () => {
@@ -281,7 +282,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/sample/list/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-        <icon-button v-if="proxy.hasPerm('/sample/list/mould')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button v-if="proxy.hasPerm('/sample/list/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
         <icon-button v-if="proxy.hasPerm('/sample/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
diff --git a/src/views/customer/sample/list/sampleDialog.vue b/src/views/customer/sample/list/sampleDialog.vue
new file mode 100644
index 0000000..ea2d652
--- /dev/null
+++ b/src/views/customer/sample/list/sampleDialog.vue
@@ -0,0 +1,227 @@
+<script setup lang="ts" name="sampleDialog">
+import { computed, getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ICustomer, ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getCustomerList } from '@/api/customer/customer'
+import { getDictByCode } from '@/api/system/dict'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+const visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set(val) {
+    emits('changeVisible', val)
+  },
+})
+
+// 查询条件
+const listQuery: Ref<ICustomerQuery> = ref({
+  bussinessSize: '', // 业务规模
+  customerName: '', // 公司名称
+  customerNo: '', // 客户编号
+  grade: '', // 履约评级
+  offset: 1,
+  limit: 20,
+})
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+// const companySizeList = ref<dictType[]>([]) // 公司规模列表
+const businessSizeList = ref<dictType[]>([]) // 业务规模列表
+const gradeList = ref<dictType[]>([]) // 履约评级列表
+// const evaluationList = ref<dictType[]>([]) // 整体评价列表
+function getDict() {
+  // // 获取公司规模
+  // getDictByCode('companySize').then((response) => {
+  //   companySizeList.value = response.data
+  // })
+  // 获取业务规模
+  getDictByCode('businessSize').then((response) => {
+    businessSizeList.value = response.data
+  })
+  // 获取履约评级
+  getDictByCode('grade').then((response) => {
+    gradeList.value = response.data
+  })
+  // // 获取整体评价
+  // getDictByCode('evaluation').then((response) => {
+  //   evaluationList.value = response.data
+  // })
+}
+getDict()
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', width: '120', align: 'center' },
+  { text: '公司规模', value: 'companySizeName', align: 'center' },
+  { text: '业务规模', value: 'businessSizeName', align: 'center' },
+  { text: '履约评级', value: 'gradeName', align: 'center' },
+  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '公司地址', value: 'briefName', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<ICustomer[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getCustomerList(listQuery.value).then((response) => {
+  //   // 模拟数据
+  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
+  //   list.value = response.data.rows.map((item: ICustomer) => {
+  //     if (item.companyProvinceName && item.companyCityName) {
+  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+  //     }
+  //     else {
+  //       item.briefName = item.companyProvinceName || item.companyCityName
+  //     }
+  //     return item
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+
+  // 模拟数据
+  const response = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
+    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '2集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' },
+    { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '3集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
+  list.value = response.map((item: ICustomer) => {
+    if (item.companyProvinceName && item.companyCityName) {
+      item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+    }
+    else {
+      item.briefName = item.companyProvinceName || item.companyCityName
+    }
+    return item
+  })
+  total.value = 50
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    bussinessSize: '', // 业务规模
+    customerName: '', // 公司名称
+    customerNo: '', // 客户编号
+    grade: '', // 履约评级
+    offset: 1,
+    limit: 20,
+  }
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+// 点击确定
+const clickConfirm = () => {
+  console.log(checkoutList.value)
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+fetchData(true)
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择委托方" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.customerNo"
+            placeholder="客户编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.customerName"
+            placeholder="公司名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+            <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.grade" placeholder="履约评级">
+            <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 1d81f8b..f8c4555 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,8 +4,8 @@
   sampleModel: string // 型号
   customerId: string // 委托方代码
   customerName: string // 委托方名称
-  startTime: string // 投诉开始时间
-  endTime: string // 投诉结束时间
+  startTime: string // 检定开始时间
+  endTime: string // 检定结束时间
   offset: number
   limit: number
 }
@@ -22,3 +22,48 @@
   effectiveDate: string // 上次检定时间
   remark: string // 备注
 }
+
+export interface ISampleEdit {
+  id?: string
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  companyAddress: string // 委托方地址
+  mesureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  ABC: string // ABC
+  deliverer?: string // 送检人
+  delivererTel?: string // 送检人联系方式
+  mesureContent: string // 检定项目
+  mesurePeriod: string // 检定周期
+  remark: string // 备注
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  mesureType: string // 检定方式
+}
+
+// 检定记录
+export interface SimpleMeasureRecord {
+  orderCode: string // 委托单编号
+  orderTime: string // 委托单日期
+  customerCode: string // 委托人代码
+  customerName: string // 委托人名称
+  deliverer: string // 送检人
+  deliverTime: string // 送检日期
+}
+
+// 检定证书
+export interface SimpleCertification {
+  certificationCode: string // 证书编号
+  certificationName: string // 证书形成
+  certificationType: string // 证书类型
+  effectiveDate: string // 证书出具日期
+  expirationDate: string // 证书有效期
+}