diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index fcf9853..a637219 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -2,10 +2,11 @@
 /**
  * 添加/编辑/详情客户
  */
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
+import type { CustomerPerson, ICustomer, Menu, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample, dictType } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -13,7 +14,9 @@
 import { validatePhone } from '@/utils/validate'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { calc } from '@/utils/useCalc'
+import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -23,11 +26,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -90,54 +89,96 @@
   { text: '联系方式', value: 'phone', required: true, reg: validatePhone, align: 'center' },
 ])
 
+// -----------------------------------表格----------------------------------------------
 // 其他关联数据列表
 const dataList = ref({
   personList: [] as CustomerPerson[],
   sampleRecords: [] as SimpleSample[],
   contractRecords: [] as SimpleContract[],
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
+  measureRecords: [] as SimpleMeasureRecord[], // 检定记录
+  certificationRecords: [] as SimpleCertification[], // 检定证书
 })
-// 获取样品列表 500
+// 检测记录和检定证书查询条件
+const listQuery = ref<IRecord>({
+  sampleId: '', // 样品id
+  customerId: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+// 合同记录请求参数
+const contractListQuery = ref({
+  agreementKind: '1', // 合同种类-收入合同1
+  agreementName: '', // 合同名字
+  agreementNo: '', // 合同编号
+  agreementType: '', // 合同类型-采购合同/业务合同等-字典code
+  customerId: infoId.value, // 单位id（客户id）（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  estimateSignEndDate: '', // 预计签订/实际签订结束日期
+  estimateSignStartDate: '', // 预计签订/实际签订开始日期
+  firstParty: '', // 单位名字（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  formId: SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE, // 表单id
+  ids: [], // 导出ids
+  status: '', // 合同完成状态-字典code
+  offset: 1,
+  limit: 10,
+})
+// 样品记录查询条件
+const sampleListQuery = ref({
+  id: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+const totalRecords = ref(0) // 检定记录
+const totalCertifications = ref(0) // 检定证书
+const totalContract = ref(0) // 合同记录
+const totalSample = ref(0) // 样品记录
+// 获取样品列表
 const fetchSampleList = function () {
-  // getSampleByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.sampleRecords = res.data.rows
-  // })
-}
-// 获取合同记录 200
-const fetchContractRecords = function () {
-  getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-    dataList.value.contractRecords = res.data.rows
+  getSampleByCustomer(sampleListQuery.value).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+    totalSample.value = res.data.total
   })
 }
-// 获取检定记录 待测试
+// 获取合同记录
+const fetchContractRecords = function () {
+  getContractByCustomer(contractListQuery.value).then((response) => {
+    dataList.value.contractRecords = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        estimateSignDate: item.estimateSignDate ? dayjs(item.estimateSignDate).format('YYYY-MM-DD') : item.estimateSignDate,
+        agreementAmount: calc(Number(item.agreementAmount), 100, '/'),
+      }
+    })
+    totalContract.value = parseInt(response.data.total)
+  })
+}
+// 获取检定记录
 const fetchMeasureRecords = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  getOrderByCustomer(postData).then((res) => {
-    dataList.value.measureRecords = res.data.rows
+  getOrderByCustomer(listQuery.value).then((res) => {
+    dataList.value.measureRecords = res.data.rows.map((item: { orderTime: string; deliverTime: string }) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : '',
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : '',
+      }
+    })
+    totalRecords.value = parseInt(res.data.total)
   })
 }
 // 获取检定证书 待测试
 const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
+  getCertificationByCustomer(listQuery.value).then((res) => {
+    dataList.value.certificationRecords = res.data.rows.map((item: { effectiveDate: string; expirationDate: string }) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : '',
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : '',
+
+      }
+    })
+    totalCertifications.value = parseInt(res.data.total)
+  })
 }
-interface Menu {
-  name: string
-  columns: TableColumn[]
-  pagination: boolean
-  query?: { id: string; limit: number; offset: number }
-  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function | null
-}
+
 // 菜单
 const menu = ref<Menu[]>([
   {
@@ -160,12 +201,12 @@
       offset: 1,
     },
     columns: [
-      { text: '样品编号', value: 'sampleCode', align: 'center' },
+      { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
       { text: '样品名称', value: 'sampleName', align: 'center' },
       { text: '型号', value: 'sampleModel', align: 'center' },
       { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-      { text: '上次检定时间', value: 'mesureTime', align: 'center' },
-      { text: '检定周期', value: 'mesurePeriod', align: 'center' },
+      { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180' },
+      { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
     ],
     pagination: true,
     list: 'sampleRecords',
@@ -174,12 +215,11 @@
   {
     name: '合同记录',
     columns: [
-      { text: '合同编号', value: 'contractCode', align: 'center' },
-      { text: '合同名称', value: 'contractName', align: 'center' },
-      { text: '合同金额', value: 'contractPrice', align: 'center' },
-      { text: '合同状态', value: 'contractStatus', align: 'center' },
-      { text: '合同时间', value: 'contractTime', align: 'center' },
-      { text: '负责人', value: 'aCompanyDutyman', align: 'center' },
+      { text: '合同编号', value: 'agreementNo', align: 'center', width: '160' },
+      { text: '合同名称', value: 'agreementName', align: 'center' },
+      { text: '合同金额', value: 'agreementAmount', align: 'center' },
+      { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '160' },
+      { text: '负责人', value: 'director', align: 'center' },
     ],
     query: {
       id: '',
@@ -193,12 +233,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center' },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     query: {
       id: '',
@@ -217,11 +257,11 @@
       offset: 1,
     },
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -232,6 +272,33 @@
 const currentMenuObj = computed(() => {
   return menu.value.find(item => item.name === currentMenu.value)
 })
+
+watch(currentMenuObj, () => {
+  listQuery.value.offset = 1
+  if (currentMenuObj.value?.searchFunc) {
+    currentMenuObj.value?.searchFunc()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (val.value && currentMenuObj) {
+    listQuery.value.offset = val.value.offset // 检定记录和检定证书
+    listQuery.value.limit = val.value.limit // 检定记录和检定证书
+    contractListQuery.value.offset = val.value.offset // 合同记录
+    contractListQuery.value.limit = val.value.limit // 合同记录
+    sampleListQuery.value.offset = val.value.offset // 样品记录
+    sampleListQuery.value.limit = val.value.limit // 样品记录
+    if (currentMenuObj.value?.searchFunc) {
+      currentMenuObj.value?.searchFunc()
+    }
+  }
+}
+
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
@@ -248,8 +315,8 @@
 const SelectionList: Ref<CustomerPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  customerName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '公司名称必填', trigger: 'blur' }],
+  businessContent: [{ required: true, message: '业务内容必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -447,13 +514,19 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -743,6 +816,7 @@
         </el-button>
       </template>
       <el-table
+        id="form"
         v-loading="loading"
         :data="customerPersonList"
         border
@@ -777,7 +851,7 @@
           </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" />
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :total="currentMenu === '检定记录' ? totalRecords : currentMenu === '检定证书' ? totalCertifications : currentMenu === '合同记录' ? totalContract : totalSample" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index fcf9853..a637219 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -2,10 +2,11 @@
 /**
  * 添加/编辑/详情客户
  */
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
+import type { CustomerPerson, ICustomer, Menu, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample, dictType } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -13,7 +14,9 @@
 import { validatePhone } from '@/utils/validate'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { calc } from '@/utils/useCalc'
+import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -23,11 +26,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -90,54 +89,96 @@
   { text: '联系方式', value: 'phone', required: true, reg: validatePhone, align: 'center' },
 ])
 
+// -----------------------------------表格----------------------------------------------
 // 其他关联数据列表
 const dataList = ref({
   personList: [] as CustomerPerson[],
   sampleRecords: [] as SimpleSample[],
   contractRecords: [] as SimpleContract[],
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
+  measureRecords: [] as SimpleMeasureRecord[], // 检定记录
+  certificationRecords: [] as SimpleCertification[], // 检定证书
 })
-// 获取样品列表 500
+// 检测记录和检定证书查询条件
+const listQuery = ref<IRecord>({
+  sampleId: '', // 样品id
+  customerId: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+// 合同记录请求参数
+const contractListQuery = ref({
+  agreementKind: '1', // 合同种类-收入合同1
+  agreementName: '', // 合同名字
+  agreementNo: '', // 合同编号
+  agreementType: '', // 合同类型-采购合同/业务合同等-字典code
+  customerId: infoId.value, // 单位id（客户id）（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  estimateSignEndDate: '', // 预计签订/实际签订结束日期
+  estimateSignStartDate: '', // 预计签订/实际签订开始日期
+  firstParty: '', // 单位名字（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  formId: SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE, // 表单id
+  ids: [], // 导出ids
+  status: '', // 合同完成状态-字典code
+  offset: 1,
+  limit: 10,
+})
+// 样品记录查询条件
+const sampleListQuery = ref({
+  id: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+const totalRecords = ref(0) // 检定记录
+const totalCertifications = ref(0) // 检定证书
+const totalContract = ref(0) // 合同记录
+const totalSample = ref(0) // 样品记录
+// 获取样品列表
 const fetchSampleList = function () {
-  // getSampleByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.sampleRecords = res.data.rows
-  // })
-}
-// 获取合同记录 200
-const fetchContractRecords = function () {
-  getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-    dataList.value.contractRecords = res.data.rows
+  getSampleByCustomer(sampleListQuery.value).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+    totalSample.value = res.data.total
   })
 }
-// 获取检定记录 待测试
+// 获取合同记录
+const fetchContractRecords = function () {
+  getContractByCustomer(contractListQuery.value).then((response) => {
+    dataList.value.contractRecords = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        estimateSignDate: item.estimateSignDate ? dayjs(item.estimateSignDate).format('YYYY-MM-DD') : item.estimateSignDate,
+        agreementAmount: calc(Number(item.agreementAmount), 100, '/'),
+      }
+    })
+    totalContract.value = parseInt(response.data.total)
+  })
+}
+// 获取检定记录
 const fetchMeasureRecords = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  getOrderByCustomer(postData).then((res) => {
-    dataList.value.measureRecords = res.data.rows
+  getOrderByCustomer(listQuery.value).then((res) => {
+    dataList.value.measureRecords = res.data.rows.map((item: { orderTime: string; deliverTime: string }) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : '',
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : '',
+      }
+    })
+    totalRecords.value = parseInt(res.data.total)
   })
 }
 // 获取检定证书 待测试
 const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
+  getCertificationByCustomer(listQuery.value).then((res) => {
+    dataList.value.certificationRecords = res.data.rows.map((item: { effectiveDate: string; expirationDate: string }) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : '',
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : '',
+
+      }
+    })
+    totalCertifications.value = parseInt(res.data.total)
+  })
 }
-interface Menu {
-  name: string
-  columns: TableColumn[]
-  pagination: boolean
-  query?: { id: string; limit: number; offset: number }
-  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function | null
-}
+
 // 菜单
 const menu = ref<Menu[]>([
   {
@@ -160,12 +201,12 @@
       offset: 1,
     },
     columns: [
-      { text: '样品编号', value: 'sampleCode', align: 'center' },
+      { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
       { text: '样品名称', value: 'sampleName', align: 'center' },
       { text: '型号', value: 'sampleModel', align: 'center' },
       { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-      { text: '上次检定时间', value: 'mesureTime', align: 'center' },
-      { text: '检定周期', value: 'mesurePeriod', align: 'center' },
+      { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180' },
+      { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
     ],
     pagination: true,
     list: 'sampleRecords',
@@ -174,12 +215,11 @@
   {
     name: '合同记录',
     columns: [
-      { text: '合同编号', value: 'contractCode', align: 'center' },
-      { text: '合同名称', value: 'contractName', align: 'center' },
-      { text: '合同金额', value: 'contractPrice', align: 'center' },
-      { text: '合同状态', value: 'contractStatus', align: 'center' },
-      { text: '合同时间', value: 'contractTime', align: 'center' },
-      { text: '负责人', value: 'aCompanyDutyman', align: 'center' },
+      { text: '合同编号', value: 'agreementNo', align: 'center', width: '160' },
+      { text: '合同名称', value: 'agreementName', align: 'center' },
+      { text: '合同金额', value: 'agreementAmount', align: 'center' },
+      { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '160' },
+      { text: '负责人', value: 'director', align: 'center' },
     ],
     query: {
       id: '',
@@ -193,12 +233,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center' },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     query: {
       id: '',
@@ -217,11 +257,11 @@
       offset: 1,
     },
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -232,6 +272,33 @@
 const currentMenuObj = computed(() => {
   return menu.value.find(item => item.name === currentMenu.value)
 })
+
+watch(currentMenuObj, () => {
+  listQuery.value.offset = 1
+  if (currentMenuObj.value?.searchFunc) {
+    currentMenuObj.value?.searchFunc()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (val.value && currentMenuObj) {
+    listQuery.value.offset = val.value.offset // 检定记录和检定证书
+    listQuery.value.limit = val.value.limit // 检定记录和检定证书
+    contractListQuery.value.offset = val.value.offset // 合同记录
+    contractListQuery.value.limit = val.value.limit // 合同记录
+    sampleListQuery.value.offset = val.value.offset // 样品记录
+    sampleListQuery.value.limit = val.value.limit // 样品记录
+    if (currentMenuObj.value?.searchFunc) {
+      currentMenuObj.value?.searchFunc()
+    }
+  }
+}
+
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
@@ -248,8 +315,8 @@
 const SelectionList: Ref<CustomerPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  customerName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '公司名称必填', trigger: 'blur' }],
+  businessContent: [{ required: true, message: '业务内容必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -447,13 +514,19 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -743,6 +816,7 @@
         </el-button>
       </template>
       <el-table
+        id="form"
         v-loading="loading"
         :data="customerPersonList"
         border
@@ -777,7 +851,7 @@
           </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" />
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :total="currentMenu === '检定记录' ? totalRecords : currentMenu === '检定证书' ? totalCertifications : currentMenu === '合同记录' ? totalContract : totalSample" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2ce3c37..dc0a3c0 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -286,7 +286,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" width="100" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/meter/customer/update')"

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index fcf9853..a637219 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -2,10 +2,11 @@
 /**
  * 添加/编辑/详情客户
  */
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
+import type { CustomerPerson, ICustomer, Menu, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample, dictType } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -13,7 +14,9 @@
 import { validatePhone } from '@/utils/validate'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { calc } from '@/utils/useCalc'
+import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -23,11 +26,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -90,54 +89,96 @@
   { text: '联系方式', value: 'phone', required: true, reg: validatePhone, align: 'center' },
 ])
 
+// -----------------------------------表格----------------------------------------------
 // 其他关联数据列表
 const dataList = ref({
   personList: [] as CustomerPerson[],
   sampleRecords: [] as SimpleSample[],
   contractRecords: [] as SimpleContract[],
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
+  measureRecords: [] as SimpleMeasureRecord[], // 检定记录
+  certificationRecords: [] as SimpleCertification[], // 检定证书
 })
-// 获取样品列表 500
+// 检测记录和检定证书查询条件
+const listQuery = ref<IRecord>({
+  sampleId: '', // 样品id
+  customerId: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+// 合同记录请求参数
+const contractListQuery = ref({
+  agreementKind: '1', // 合同种类-收入合同1
+  agreementName: '', // 合同名字
+  agreementNo: '', // 合同编号
+  agreementType: '', // 合同类型-采购合同/业务合同等-字典code
+  customerId: infoId.value, // 单位id（客户id）（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  estimateSignEndDate: '', // 预计签订/实际签订结束日期
+  estimateSignStartDate: '', // 预计签订/实际签订开始日期
+  firstParty: '', // 单位名字（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  formId: SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE, // 表单id
+  ids: [], // 导出ids
+  status: '', // 合同完成状态-字典code
+  offset: 1,
+  limit: 10,
+})
+// 样品记录查询条件
+const sampleListQuery = ref({
+  id: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+const totalRecords = ref(0) // 检定记录
+const totalCertifications = ref(0) // 检定证书
+const totalContract = ref(0) // 合同记录
+const totalSample = ref(0) // 样品记录
+// 获取样品列表
 const fetchSampleList = function () {
-  // getSampleByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.sampleRecords = res.data.rows
-  // })
-}
-// 获取合同记录 200
-const fetchContractRecords = function () {
-  getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-    dataList.value.contractRecords = res.data.rows
+  getSampleByCustomer(sampleListQuery.value).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+    totalSample.value = res.data.total
   })
 }
-// 获取检定记录 待测试
+// 获取合同记录
+const fetchContractRecords = function () {
+  getContractByCustomer(contractListQuery.value).then((response) => {
+    dataList.value.contractRecords = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        estimateSignDate: item.estimateSignDate ? dayjs(item.estimateSignDate).format('YYYY-MM-DD') : item.estimateSignDate,
+        agreementAmount: calc(Number(item.agreementAmount), 100, '/'),
+      }
+    })
+    totalContract.value = parseInt(response.data.total)
+  })
+}
+// 获取检定记录
 const fetchMeasureRecords = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  getOrderByCustomer(postData).then((res) => {
-    dataList.value.measureRecords = res.data.rows
+  getOrderByCustomer(listQuery.value).then((res) => {
+    dataList.value.measureRecords = res.data.rows.map((item: { orderTime: string; deliverTime: string }) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : '',
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : '',
+      }
+    })
+    totalRecords.value = parseInt(res.data.total)
   })
 }
 // 获取检定证书 待测试
 const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
+  getCertificationByCustomer(listQuery.value).then((res) => {
+    dataList.value.certificationRecords = res.data.rows.map((item: { effectiveDate: string; expirationDate: string }) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : '',
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : '',
+
+      }
+    })
+    totalCertifications.value = parseInt(res.data.total)
+  })
 }
-interface Menu {
-  name: string
-  columns: TableColumn[]
-  pagination: boolean
-  query?: { id: string; limit: number; offset: number }
-  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function | null
-}
+
 // 菜单
 const menu = ref<Menu[]>([
   {
@@ -160,12 +201,12 @@
       offset: 1,
     },
     columns: [
-      { text: '样品编号', value: 'sampleCode', align: 'center' },
+      { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
       { text: '样品名称', value: 'sampleName', align: 'center' },
       { text: '型号', value: 'sampleModel', align: 'center' },
       { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-      { text: '上次检定时间', value: 'mesureTime', align: 'center' },
-      { text: '检定周期', value: 'mesurePeriod', align: 'center' },
+      { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180' },
+      { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
     ],
     pagination: true,
     list: 'sampleRecords',
@@ -174,12 +215,11 @@
   {
     name: '合同记录',
     columns: [
-      { text: '合同编号', value: 'contractCode', align: 'center' },
-      { text: '合同名称', value: 'contractName', align: 'center' },
-      { text: '合同金额', value: 'contractPrice', align: 'center' },
-      { text: '合同状态', value: 'contractStatus', align: 'center' },
-      { text: '合同时间', value: 'contractTime', align: 'center' },
-      { text: '负责人', value: 'aCompanyDutyman', align: 'center' },
+      { text: '合同编号', value: 'agreementNo', align: 'center', width: '160' },
+      { text: '合同名称', value: 'agreementName', align: 'center' },
+      { text: '合同金额', value: 'agreementAmount', align: 'center' },
+      { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '160' },
+      { text: '负责人', value: 'director', align: 'center' },
     ],
     query: {
       id: '',
@@ -193,12 +233,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center' },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     query: {
       id: '',
@@ -217,11 +257,11 @@
       offset: 1,
     },
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -232,6 +272,33 @@
 const currentMenuObj = computed(() => {
   return menu.value.find(item => item.name === currentMenu.value)
 })
+
+watch(currentMenuObj, () => {
+  listQuery.value.offset = 1
+  if (currentMenuObj.value?.searchFunc) {
+    currentMenuObj.value?.searchFunc()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (val.value && currentMenuObj) {
+    listQuery.value.offset = val.value.offset // 检定记录和检定证书
+    listQuery.value.limit = val.value.limit // 检定记录和检定证书
+    contractListQuery.value.offset = val.value.offset // 合同记录
+    contractListQuery.value.limit = val.value.limit // 合同记录
+    sampleListQuery.value.offset = val.value.offset // 样品记录
+    sampleListQuery.value.limit = val.value.limit // 样品记录
+    if (currentMenuObj.value?.searchFunc) {
+      currentMenuObj.value?.searchFunc()
+    }
+  }
+}
+
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
@@ -248,8 +315,8 @@
 const SelectionList: Ref<CustomerPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  customerName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '公司名称必填', trigger: 'blur' }],
+  businessContent: [{ required: true, message: '业务内容必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -447,13 +514,19 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -743,6 +816,7 @@
         </el-button>
       </template>
       <el-table
+        id="form"
         v-loading="loading"
         :data="customerPersonList"
         border
@@ -777,7 +851,7 @@
           </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" />
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :total="currentMenu === '检定记录' ? totalRecords : currentMenu === '检定证书' ? totalCertifications : currentMenu === '合同记录' ? totalContract : totalSample" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2ce3c37..dc0a3c0 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -286,7 +286,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" width="100" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/meter/customer/update')"
diff --git a/src/views/customer/customerInfo/customer_interface.ts b/src/views/customer/customerInfo/customer_interface.ts
index 17bcd47..34b2d0e 100644
--- a/src/views/customer/customerInfo/customer_interface.ts
+++ b/src/views/customer/customerInfo/customer_interface.ts
@@ -1,3 +1,5 @@
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 列表查询条件
 export interface ICustomerQuery {
   businessSize: string // 业务规模
@@ -111,3 +113,18 @@
   effectiveDate: string // 证书出具日期
   expirationDate: string // 证书有效期
 }
+
+export interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  query?: { id: string; limit: number; offset: number }
+  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
+  searchFunc: Function | null
+}
+
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index fcf9853..a637219 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -2,10 +2,11 @@
 /**
  * 添加/编辑/详情客户
  */
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
+import type { CustomerPerson, ICustomer, Menu, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample, dictType } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -13,7 +14,9 @@
 import { validatePhone } from '@/utils/validate'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { calc } from '@/utils/useCalc'
+import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -23,11 +26,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -90,54 +89,96 @@
   { text: '联系方式', value: 'phone', required: true, reg: validatePhone, align: 'center' },
 ])
 
+// -----------------------------------表格----------------------------------------------
 // 其他关联数据列表
 const dataList = ref({
   personList: [] as CustomerPerson[],
   sampleRecords: [] as SimpleSample[],
   contractRecords: [] as SimpleContract[],
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
+  measureRecords: [] as SimpleMeasureRecord[], // 检定记录
+  certificationRecords: [] as SimpleCertification[], // 检定证书
 })
-// 获取样品列表 500
+// 检测记录和检定证书查询条件
+const listQuery = ref<IRecord>({
+  sampleId: '', // 样品id
+  customerId: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+// 合同记录请求参数
+const contractListQuery = ref({
+  agreementKind: '1', // 合同种类-收入合同1
+  agreementName: '', // 合同名字
+  agreementNo: '', // 合同编号
+  agreementType: '', // 合同类型-采购合同/业务合同等-字典code
+  customerId: infoId.value, // 单位id（客户id）（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  estimateSignEndDate: '', // 预计签订/实际签订结束日期
+  estimateSignStartDate: '', // 预计签订/实际签订开始日期
+  firstParty: '', // 单位名字（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  formId: SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE, // 表单id
+  ids: [], // 导出ids
+  status: '', // 合同完成状态-字典code
+  offset: 1,
+  limit: 10,
+})
+// 样品记录查询条件
+const sampleListQuery = ref({
+  id: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+const totalRecords = ref(0) // 检定记录
+const totalCertifications = ref(0) // 检定证书
+const totalContract = ref(0) // 合同记录
+const totalSample = ref(0) // 样品记录
+// 获取样品列表
 const fetchSampleList = function () {
-  // getSampleByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.sampleRecords = res.data.rows
-  // })
-}
-// 获取合同记录 200
-const fetchContractRecords = function () {
-  getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-    dataList.value.contractRecords = res.data.rows
+  getSampleByCustomer(sampleListQuery.value).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+    totalSample.value = res.data.total
   })
 }
-// 获取检定记录 待测试
+// 获取合同记录
+const fetchContractRecords = function () {
+  getContractByCustomer(contractListQuery.value).then((response) => {
+    dataList.value.contractRecords = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        estimateSignDate: item.estimateSignDate ? dayjs(item.estimateSignDate).format('YYYY-MM-DD') : item.estimateSignDate,
+        agreementAmount: calc(Number(item.agreementAmount), 100, '/'),
+      }
+    })
+    totalContract.value = parseInt(response.data.total)
+  })
+}
+// 获取检定记录
 const fetchMeasureRecords = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  getOrderByCustomer(postData).then((res) => {
-    dataList.value.measureRecords = res.data.rows
+  getOrderByCustomer(listQuery.value).then((res) => {
+    dataList.value.measureRecords = res.data.rows.map((item: { orderTime: string; deliverTime: string }) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : '',
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : '',
+      }
+    })
+    totalRecords.value = parseInt(res.data.total)
   })
 }
 // 获取检定证书 待测试
 const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
+  getCertificationByCustomer(listQuery.value).then((res) => {
+    dataList.value.certificationRecords = res.data.rows.map((item: { effectiveDate: string; expirationDate: string }) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : '',
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : '',
+
+      }
+    })
+    totalCertifications.value = parseInt(res.data.total)
+  })
 }
-interface Menu {
-  name: string
-  columns: TableColumn[]
-  pagination: boolean
-  query?: { id: string; limit: number; offset: number }
-  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function | null
-}
+
 // 菜单
 const menu = ref<Menu[]>([
   {
@@ -160,12 +201,12 @@
       offset: 1,
     },
     columns: [
-      { text: '样品编号', value: 'sampleCode', align: 'center' },
+      { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
       { text: '样品名称', value: 'sampleName', align: 'center' },
       { text: '型号', value: 'sampleModel', align: 'center' },
       { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-      { text: '上次检定时间', value: 'mesureTime', align: 'center' },
-      { text: '检定周期', value: 'mesurePeriod', align: 'center' },
+      { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180' },
+      { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
     ],
     pagination: true,
     list: 'sampleRecords',
@@ -174,12 +215,11 @@
   {
     name: '合同记录',
     columns: [
-      { text: '合同编号', value: 'contractCode', align: 'center' },
-      { text: '合同名称', value: 'contractName', align: 'center' },
-      { text: '合同金额', value: 'contractPrice', align: 'center' },
-      { text: '合同状态', value: 'contractStatus', align: 'center' },
-      { text: '合同时间', value: 'contractTime', align: 'center' },
-      { text: '负责人', value: 'aCompanyDutyman', align: 'center' },
+      { text: '合同编号', value: 'agreementNo', align: 'center', width: '160' },
+      { text: '合同名称', value: 'agreementName', align: 'center' },
+      { text: '合同金额', value: 'agreementAmount', align: 'center' },
+      { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '160' },
+      { text: '负责人', value: 'director', align: 'center' },
     ],
     query: {
       id: '',
@@ -193,12 +233,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center' },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     query: {
       id: '',
@@ -217,11 +257,11 @@
       offset: 1,
     },
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -232,6 +272,33 @@
 const currentMenuObj = computed(() => {
   return menu.value.find(item => item.name === currentMenu.value)
 })
+
+watch(currentMenuObj, () => {
+  listQuery.value.offset = 1
+  if (currentMenuObj.value?.searchFunc) {
+    currentMenuObj.value?.searchFunc()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (val.value && currentMenuObj) {
+    listQuery.value.offset = val.value.offset // 检定记录和检定证书
+    listQuery.value.limit = val.value.limit // 检定记录和检定证书
+    contractListQuery.value.offset = val.value.offset // 合同记录
+    contractListQuery.value.limit = val.value.limit // 合同记录
+    sampleListQuery.value.offset = val.value.offset // 样品记录
+    sampleListQuery.value.limit = val.value.limit // 样品记录
+    if (currentMenuObj.value?.searchFunc) {
+      currentMenuObj.value?.searchFunc()
+    }
+  }
+}
+
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
@@ -248,8 +315,8 @@
 const SelectionList: Ref<CustomerPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  customerName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '公司名称必填', trigger: 'blur' }],
+  businessContent: [{ required: true, message: '业务内容必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -447,13 +514,19 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -743,6 +816,7 @@
         </el-button>
       </template>
       <el-table
+        id="form"
         v-loading="loading"
         :data="customerPersonList"
         border
@@ -777,7 +851,7 @@
           </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" />
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :total="currentMenu === '检定记录' ? totalRecords : currentMenu === '检定证书' ? totalCertifications : currentMenu === '合同记录' ? totalContract : totalSample" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2ce3c37..dc0a3c0 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -286,7 +286,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" width="100" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/meter/customer/update')"
diff --git a/src/views/customer/customerInfo/customer_interface.ts b/src/views/customer/customerInfo/customer_interface.ts
index 17bcd47..34b2d0e 100644
--- a/src/views/customer/customerInfo/customer_interface.ts
+++ b/src/views/customer/customerInfo/customer_interface.ts
@@ -1,3 +1,5 @@
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 列表查询条件
 export interface ICustomerQuery {
   businessSize: string // 业务规模
@@ -111,3 +113,18 @@
   effectiveDate: string // 证书出具日期
   expirationDate: string // 证书有效期
 }
+
+export interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  query?: { id: string; limit: number; offset: number }
+  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
+  searchFunc: Function | null
+}
+
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1006f99..e6a9544 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -1,7 +1,7 @@
 <!-- 新建、编辑、详情 -->
 <script lang="ts" setup name="SampleEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
@@ -28,6 +28,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -74,17 +75,17 @@
 
 // 校验规则
 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: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
-  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
-  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
-  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  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: 'change' }],
+  // phone: [{ required: true, message: '委托方电话必填', trigger: 'change' }],
+  // postalCode: [{ required: true, message: '委托方邮编必填', trigger: 'change' }],
+  // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
+  measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+  powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -99,6 +100,10 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
   // 检定方式
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
@@ -110,6 +115,7 @@
 }
 getDict()
 
+// 检定记录、检定证书请求参数
 const listQuery = ref<IRecord>({
   sampleId: infoId.value, // 样品id
   customerId: '', // 客户id
@@ -236,14 +242,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -457,7 +469,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -479,7 +491,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -505,11 +517,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -587,7 +599,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index fcf9853..a637219 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -2,10 +2,11 @@
 /**
  * 添加/编辑/详情客户
  */
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
+import type { CustomerPerson, ICustomer, Menu, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample, dictType } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -13,7 +14,9 @@
 import { validatePhone } from '@/utils/validate'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { calc } from '@/utils/useCalc'
+import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -23,11 +26,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -90,54 +89,96 @@
   { text: '联系方式', value: 'phone', required: true, reg: validatePhone, align: 'center' },
 ])
 
+// -----------------------------------表格----------------------------------------------
 // 其他关联数据列表
 const dataList = ref({
   personList: [] as CustomerPerson[],
   sampleRecords: [] as SimpleSample[],
   contractRecords: [] as SimpleContract[],
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
+  measureRecords: [] as SimpleMeasureRecord[], // 检定记录
+  certificationRecords: [] as SimpleCertification[], // 检定证书
 })
-// 获取样品列表 500
+// 检测记录和检定证书查询条件
+const listQuery = ref<IRecord>({
+  sampleId: '', // 样品id
+  customerId: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+// 合同记录请求参数
+const contractListQuery = ref({
+  agreementKind: '1', // 合同种类-收入合同1
+  agreementName: '', // 合同名字
+  agreementNo: '', // 合同编号
+  agreementType: '', // 合同类型-采购合同/业务合同等-字典code
+  customerId: infoId.value, // 单位id（客户id）（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  estimateSignEndDate: '', // 预计签订/实际签订结束日期
+  estimateSignStartDate: '', // 预计签订/实际签订开始日期
+  firstParty: '', // 单位名字（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  formId: SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE, // 表单id
+  ids: [], // 导出ids
+  status: '', // 合同完成状态-字典code
+  offset: 1,
+  limit: 10,
+})
+// 样品记录查询条件
+const sampleListQuery = ref({
+  id: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+const totalRecords = ref(0) // 检定记录
+const totalCertifications = ref(0) // 检定证书
+const totalContract = ref(0) // 合同记录
+const totalSample = ref(0) // 样品记录
+// 获取样品列表
 const fetchSampleList = function () {
-  // getSampleByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.sampleRecords = res.data.rows
-  // })
-}
-// 获取合同记录 200
-const fetchContractRecords = function () {
-  getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-    dataList.value.contractRecords = res.data.rows
+  getSampleByCustomer(sampleListQuery.value).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+    totalSample.value = res.data.total
   })
 }
-// 获取检定记录 待测试
+// 获取合同记录
+const fetchContractRecords = function () {
+  getContractByCustomer(contractListQuery.value).then((response) => {
+    dataList.value.contractRecords = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        estimateSignDate: item.estimateSignDate ? dayjs(item.estimateSignDate).format('YYYY-MM-DD') : item.estimateSignDate,
+        agreementAmount: calc(Number(item.agreementAmount), 100, '/'),
+      }
+    })
+    totalContract.value = parseInt(response.data.total)
+  })
+}
+// 获取检定记录
 const fetchMeasureRecords = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  getOrderByCustomer(postData).then((res) => {
-    dataList.value.measureRecords = res.data.rows
+  getOrderByCustomer(listQuery.value).then((res) => {
+    dataList.value.measureRecords = res.data.rows.map((item: { orderTime: string; deliverTime: string }) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : '',
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : '',
+      }
+    })
+    totalRecords.value = parseInt(res.data.total)
   })
 }
 // 获取检定证书 待测试
 const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
+  getCertificationByCustomer(listQuery.value).then((res) => {
+    dataList.value.certificationRecords = res.data.rows.map((item: { effectiveDate: string; expirationDate: string }) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : '',
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : '',
+
+      }
+    })
+    totalCertifications.value = parseInt(res.data.total)
+  })
 }
-interface Menu {
-  name: string
-  columns: TableColumn[]
-  pagination: boolean
-  query?: { id: string; limit: number; offset: number }
-  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function | null
-}
+
 // 菜单
 const menu = ref<Menu[]>([
   {
@@ -160,12 +201,12 @@
       offset: 1,
     },
     columns: [
-      { text: '样品编号', value: 'sampleCode', align: 'center' },
+      { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
       { text: '样品名称', value: 'sampleName', align: 'center' },
       { text: '型号', value: 'sampleModel', align: 'center' },
       { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-      { text: '上次检定时间', value: 'mesureTime', align: 'center' },
-      { text: '检定周期', value: 'mesurePeriod', align: 'center' },
+      { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180' },
+      { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
     ],
     pagination: true,
     list: 'sampleRecords',
@@ -174,12 +215,11 @@
   {
     name: '合同记录',
     columns: [
-      { text: '合同编号', value: 'contractCode', align: 'center' },
-      { text: '合同名称', value: 'contractName', align: 'center' },
-      { text: '合同金额', value: 'contractPrice', align: 'center' },
-      { text: '合同状态', value: 'contractStatus', align: 'center' },
-      { text: '合同时间', value: 'contractTime', align: 'center' },
-      { text: '负责人', value: 'aCompanyDutyman', align: 'center' },
+      { text: '合同编号', value: 'agreementNo', align: 'center', width: '160' },
+      { text: '合同名称', value: 'agreementName', align: 'center' },
+      { text: '合同金额', value: 'agreementAmount', align: 'center' },
+      { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '160' },
+      { text: '负责人', value: 'director', align: 'center' },
     ],
     query: {
       id: '',
@@ -193,12 +233,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center' },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     query: {
       id: '',
@@ -217,11 +257,11 @@
       offset: 1,
     },
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -232,6 +272,33 @@
 const currentMenuObj = computed(() => {
   return menu.value.find(item => item.name === currentMenu.value)
 })
+
+watch(currentMenuObj, () => {
+  listQuery.value.offset = 1
+  if (currentMenuObj.value?.searchFunc) {
+    currentMenuObj.value?.searchFunc()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (val.value && currentMenuObj) {
+    listQuery.value.offset = val.value.offset // 检定记录和检定证书
+    listQuery.value.limit = val.value.limit // 检定记录和检定证书
+    contractListQuery.value.offset = val.value.offset // 合同记录
+    contractListQuery.value.limit = val.value.limit // 合同记录
+    sampleListQuery.value.offset = val.value.offset // 样品记录
+    sampleListQuery.value.limit = val.value.limit // 样品记录
+    if (currentMenuObj.value?.searchFunc) {
+      currentMenuObj.value?.searchFunc()
+    }
+  }
+}
+
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
@@ -248,8 +315,8 @@
 const SelectionList: Ref<CustomerPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  customerName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '公司名称必填', trigger: 'blur' }],
+  businessContent: [{ required: true, message: '业务内容必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -447,13 +514,19 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -743,6 +816,7 @@
         </el-button>
       </template>
       <el-table
+        id="form"
         v-loading="loading"
         :data="customerPersonList"
         border
@@ -777,7 +851,7 @@
           </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" />
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :total="currentMenu === '检定记录' ? totalRecords : currentMenu === '检定证书' ? totalCertifications : currentMenu === '合同记录' ? totalContract : totalSample" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2ce3c37..dc0a3c0 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -286,7 +286,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" width="100" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/meter/customer/update')"
diff --git a/src/views/customer/customerInfo/customer_interface.ts b/src/views/customer/customerInfo/customer_interface.ts
index 17bcd47..34b2d0e 100644
--- a/src/views/customer/customerInfo/customer_interface.ts
+++ b/src/views/customer/customerInfo/customer_interface.ts
@@ -1,3 +1,5 @@
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 列表查询条件
 export interface ICustomerQuery {
   businessSize: string // 业务规模
@@ -111,3 +113,18 @@
   effectiveDate: string // 证书出具日期
   expirationDate: string // 证书有效期
 }
+
+export interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  query?: { id: string; limit: number; offset: number }
+  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
+  searchFunc: Function | null
+}
+
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1006f99..e6a9544 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -1,7 +1,7 @@
 <!-- 新建、编辑、详情 -->
 <script lang="ts" setup name="SampleEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
@@ -28,6 +28,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -74,17 +75,17 @@
 
 // 校验规则
 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: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
-  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
-  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
-  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  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: 'change' }],
+  // phone: [{ required: true, message: '委托方电话必填', trigger: 'change' }],
+  // postalCode: [{ required: true, message: '委托方邮编必填', trigger: 'change' }],
+  // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
+  measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+  powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -99,6 +100,10 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
   // 检定方式
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
@@ -110,6 +115,7 @@
 }
 getDict()
 
+// 检定记录、检定证书请求参数
 const listQuery = ref<IRecord>({
   sampleId: infoId.value, // 样品id
   customerId: '', // 客户id
@@ -236,14 +242,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -457,7 +469,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -479,7 +491,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -505,11 +517,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -587,7 +599,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 36f2463..6e41a94 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -32,9 +32,9 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
   {

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index fcf9853..a637219 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -2,10 +2,11 @@
 /**
  * 添加/编辑/详情客户
  */
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
+import type { CustomerPerson, ICustomer, Menu, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample, dictType } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -13,7 +14,9 @@
 import { validatePhone } from '@/utils/validate'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { calc } from '@/utils/useCalc'
+import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -23,11 +26,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -90,54 +89,96 @@
   { text: '联系方式', value: 'phone', required: true, reg: validatePhone, align: 'center' },
 ])
 
+// -----------------------------------表格----------------------------------------------
 // 其他关联数据列表
 const dataList = ref({
   personList: [] as CustomerPerson[],
   sampleRecords: [] as SimpleSample[],
   contractRecords: [] as SimpleContract[],
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
+  measureRecords: [] as SimpleMeasureRecord[], // 检定记录
+  certificationRecords: [] as SimpleCertification[], // 检定证书
 })
-// 获取样品列表 500
+// 检测记录和检定证书查询条件
+const listQuery = ref<IRecord>({
+  sampleId: '', // 样品id
+  customerId: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+// 合同记录请求参数
+const contractListQuery = ref({
+  agreementKind: '1', // 合同种类-收入合同1
+  agreementName: '', // 合同名字
+  agreementNo: '', // 合同编号
+  agreementType: '', // 合同类型-采购合同/业务合同等-字典code
+  customerId: infoId.value, // 单位id（客户id）（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  estimateSignEndDate: '', // 预计签订/实际签订结束日期
+  estimateSignStartDate: '', // 预计签订/实际签订开始日期
+  firstParty: '', // 单位名字（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  formId: SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE, // 表单id
+  ids: [], // 导出ids
+  status: '', // 合同完成状态-字典code
+  offset: 1,
+  limit: 10,
+})
+// 样品记录查询条件
+const sampleListQuery = ref({
+  id: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+const totalRecords = ref(0) // 检定记录
+const totalCertifications = ref(0) // 检定证书
+const totalContract = ref(0) // 合同记录
+const totalSample = ref(0) // 样品记录
+// 获取样品列表
 const fetchSampleList = function () {
-  // getSampleByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.sampleRecords = res.data.rows
-  // })
-}
-// 获取合同记录 200
-const fetchContractRecords = function () {
-  getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-    dataList.value.contractRecords = res.data.rows
+  getSampleByCustomer(sampleListQuery.value).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+    totalSample.value = res.data.total
   })
 }
-// 获取检定记录 待测试
+// 获取合同记录
+const fetchContractRecords = function () {
+  getContractByCustomer(contractListQuery.value).then((response) => {
+    dataList.value.contractRecords = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        estimateSignDate: item.estimateSignDate ? dayjs(item.estimateSignDate).format('YYYY-MM-DD') : item.estimateSignDate,
+        agreementAmount: calc(Number(item.agreementAmount), 100, '/'),
+      }
+    })
+    totalContract.value = parseInt(response.data.total)
+  })
+}
+// 获取检定记录
 const fetchMeasureRecords = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  getOrderByCustomer(postData).then((res) => {
-    dataList.value.measureRecords = res.data.rows
+  getOrderByCustomer(listQuery.value).then((res) => {
+    dataList.value.measureRecords = res.data.rows.map((item: { orderTime: string; deliverTime: string }) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : '',
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : '',
+      }
+    })
+    totalRecords.value = parseInt(res.data.total)
   })
 }
 // 获取检定证书 待测试
 const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
+  getCertificationByCustomer(listQuery.value).then((res) => {
+    dataList.value.certificationRecords = res.data.rows.map((item: { effectiveDate: string; expirationDate: string }) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : '',
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : '',
+
+      }
+    })
+    totalCertifications.value = parseInt(res.data.total)
+  })
 }
-interface Menu {
-  name: string
-  columns: TableColumn[]
-  pagination: boolean
-  query?: { id: string; limit: number; offset: number }
-  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function | null
-}
+
 // 菜单
 const menu = ref<Menu[]>([
   {
@@ -160,12 +201,12 @@
       offset: 1,
     },
     columns: [
-      { text: '样品编号', value: 'sampleCode', align: 'center' },
+      { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
       { text: '样品名称', value: 'sampleName', align: 'center' },
       { text: '型号', value: 'sampleModel', align: 'center' },
       { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-      { text: '上次检定时间', value: 'mesureTime', align: 'center' },
-      { text: '检定周期', value: 'mesurePeriod', align: 'center' },
+      { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180' },
+      { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
     ],
     pagination: true,
     list: 'sampleRecords',
@@ -174,12 +215,11 @@
   {
     name: '合同记录',
     columns: [
-      { text: '合同编号', value: 'contractCode', align: 'center' },
-      { text: '合同名称', value: 'contractName', align: 'center' },
-      { text: '合同金额', value: 'contractPrice', align: 'center' },
-      { text: '合同状态', value: 'contractStatus', align: 'center' },
-      { text: '合同时间', value: 'contractTime', align: 'center' },
-      { text: '负责人', value: 'aCompanyDutyman', align: 'center' },
+      { text: '合同编号', value: 'agreementNo', align: 'center', width: '160' },
+      { text: '合同名称', value: 'agreementName', align: 'center' },
+      { text: '合同金额', value: 'agreementAmount', align: 'center' },
+      { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '160' },
+      { text: '负责人', value: 'director', align: 'center' },
     ],
     query: {
       id: '',
@@ -193,12 +233,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center' },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     query: {
       id: '',
@@ -217,11 +257,11 @@
       offset: 1,
     },
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -232,6 +272,33 @@
 const currentMenuObj = computed(() => {
   return menu.value.find(item => item.name === currentMenu.value)
 })
+
+watch(currentMenuObj, () => {
+  listQuery.value.offset = 1
+  if (currentMenuObj.value?.searchFunc) {
+    currentMenuObj.value?.searchFunc()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (val.value && currentMenuObj) {
+    listQuery.value.offset = val.value.offset // 检定记录和检定证书
+    listQuery.value.limit = val.value.limit // 检定记录和检定证书
+    contractListQuery.value.offset = val.value.offset // 合同记录
+    contractListQuery.value.limit = val.value.limit // 合同记录
+    sampleListQuery.value.offset = val.value.offset // 样品记录
+    sampleListQuery.value.limit = val.value.limit // 样品记录
+    if (currentMenuObj.value?.searchFunc) {
+      currentMenuObj.value?.searchFunc()
+    }
+  }
+}
+
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
@@ -248,8 +315,8 @@
 const SelectionList: Ref<CustomerPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  customerName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '公司名称必填', trigger: 'blur' }],
+  businessContent: [{ required: true, message: '业务内容必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -447,13 +514,19 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -743,6 +816,7 @@
         </el-button>
       </template>
       <el-table
+        id="form"
         v-loading="loading"
         :data="customerPersonList"
         border
@@ -777,7 +851,7 @@
           </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" />
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :total="currentMenu === '检定记录' ? totalRecords : currentMenu === '检定证书' ? totalCertifications : currentMenu === '合同记录' ? totalContract : totalSample" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2ce3c37..dc0a3c0 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -286,7 +286,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" width="100" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/meter/customer/update')"
diff --git a/src/views/customer/customerInfo/customer_interface.ts b/src/views/customer/customerInfo/customer_interface.ts
index 17bcd47..34b2d0e 100644
--- a/src/views/customer/customerInfo/customer_interface.ts
+++ b/src/views/customer/customerInfo/customer_interface.ts
@@ -1,3 +1,5 @@
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 列表查询条件
 export interface ICustomerQuery {
   businessSize: string // 业务规模
@@ -111,3 +113,18 @@
   effectiveDate: string // 证书出具日期
   expirationDate: string // 证书有效期
 }
+
+export interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  query?: { id: string; limit: number; offset: number }
+  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
+  searchFunc: Function | null
+}
+
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1006f99..e6a9544 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -1,7 +1,7 @@
 <!-- 新建、编辑、详情 -->
 <script lang="ts" setup name="SampleEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
@@ -28,6 +28,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -74,17 +75,17 @@
 
 // 校验规则
 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: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
-  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
-  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
-  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  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: 'change' }],
+  // phone: [{ required: true, message: '委托方电话必填', trigger: 'change' }],
+  // postalCode: [{ required: true, message: '委托方邮编必填', trigger: 'change' }],
+  // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
+  measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+  powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -99,6 +100,10 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
   // 检定方式
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
@@ -110,6 +115,7 @@
 }
 getDict()
 
+// 检定记录、检定证书请求参数
 const listQuery = ref<IRecord>({
   sampleId: infoId.value, // 样品id
   customerId: '', // 客户id
@@ -236,14 +242,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -457,7 +469,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -479,7 +491,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -505,11 +517,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -587,7 +599,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 36f2463..6e41a94 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -32,9 +32,9 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
   {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index f619517..e8ac2bb 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -1,3 +1,4 @@
+<!-- 选择客户 -->
 <script setup lang="ts" name="SelectCustomer">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -35,12 +36,12 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '130', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '90', align: 'center' },
   { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
   { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
   { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
-  { text: '公司地址', value: 'fullAddress', width: '130', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
@@ -143,7 +144,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="选择委托方" @close="cancle">
+  <el-dialog v-model="visible" title="选择委托方" width="65%" @close="cancle">
     <search-area
       :need-clear="true"
       style="padding-left: 0;padding-right: 0;"

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index fcf9853..a637219 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -2,10 +2,11 @@
 /**
  * 添加/编辑/详情客户
  */
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
+import type { CustomerPerson, ICustomer, Menu, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample, dictType } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -13,7 +14,9 @@
 import { validatePhone } from '@/utils/validate'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { calc } from '@/utils/useCalc'
+import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -23,11 +26,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -90,54 +89,96 @@
   { text: '联系方式', value: 'phone', required: true, reg: validatePhone, align: 'center' },
 ])
 
+// -----------------------------------表格----------------------------------------------
 // 其他关联数据列表
 const dataList = ref({
   personList: [] as CustomerPerson[],
   sampleRecords: [] as SimpleSample[],
   contractRecords: [] as SimpleContract[],
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
+  measureRecords: [] as SimpleMeasureRecord[], // 检定记录
+  certificationRecords: [] as SimpleCertification[], // 检定证书
 })
-// 获取样品列表 500
+// 检测记录和检定证书查询条件
+const listQuery = ref<IRecord>({
+  sampleId: '', // 样品id
+  customerId: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+// 合同记录请求参数
+const contractListQuery = ref({
+  agreementKind: '1', // 合同种类-收入合同1
+  agreementName: '', // 合同名字
+  agreementNo: '', // 合同编号
+  agreementType: '', // 合同类型-采购合同/业务合同等-字典code
+  customerId: infoId.value, // 单位id（客户id）（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  estimateSignEndDate: '', // 预计签订/实际签订结束日期
+  estimateSignStartDate: '', // 预计签订/实际签订开始日期
+  firstParty: '', // 单位名字（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  formId: SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE, // 表单id
+  ids: [], // 导出ids
+  status: '', // 合同完成状态-字典code
+  offset: 1,
+  limit: 10,
+})
+// 样品记录查询条件
+const sampleListQuery = ref({
+  id: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+const totalRecords = ref(0) // 检定记录
+const totalCertifications = ref(0) // 检定证书
+const totalContract = ref(0) // 合同记录
+const totalSample = ref(0) // 样品记录
+// 获取样品列表
 const fetchSampleList = function () {
-  // getSampleByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.sampleRecords = res.data.rows
-  // })
-}
-// 获取合同记录 200
-const fetchContractRecords = function () {
-  getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-    dataList.value.contractRecords = res.data.rows
+  getSampleByCustomer(sampleListQuery.value).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+    totalSample.value = res.data.total
   })
 }
-// 获取检定记录 待测试
+// 获取合同记录
+const fetchContractRecords = function () {
+  getContractByCustomer(contractListQuery.value).then((response) => {
+    dataList.value.contractRecords = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        estimateSignDate: item.estimateSignDate ? dayjs(item.estimateSignDate).format('YYYY-MM-DD') : item.estimateSignDate,
+        agreementAmount: calc(Number(item.agreementAmount), 100, '/'),
+      }
+    })
+    totalContract.value = parseInt(response.data.total)
+  })
+}
+// 获取检定记录
 const fetchMeasureRecords = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  getOrderByCustomer(postData).then((res) => {
-    dataList.value.measureRecords = res.data.rows
+  getOrderByCustomer(listQuery.value).then((res) => {
+    dataList.value.measureRecords = res.data.rows.map((item: { orderTime: string; deliverTime: string }) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : '',
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : '',
+      }
+    })
+    totalRecords.value = parseInt(res.data.total)
   })
 }
 // 获取检定证书 待测试
 const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
+  getCertificationByCustomer(listQuery.value).then((res) => {
+    dataList.value.certificationRecords = res.data.rows.map((item: { effectiveDate: string; expirationDate: string }) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : '',
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : '',
+
+      }
+    })
+    totalCertifications.value = parseInt(res.data.total)
+  })
 }
-interface Menu {
-  name: string
-  columns: TableColumn[]
-  pagination: boolean
-  query?: { id: string; limit: number; offset: number }
-  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function | null
-}
+
 // 菜单
 const menu = ref<Menu[]>([
   {
@@ -160,12 +201,12 @@
       offset: 1,
     },
     columns: [
-      { text: '样品编号', value: 'sampleCode', align: 'center' },
+      { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
       { text: '样品名称', value: 'sampleName', align: 'center' },
       { text: '型号', value: 'sampleModel', align: 'center' },
       { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-      { text: '上次检定时间', value: 'mesureTime', align: 'center' },
-      { text: '检定周期', value: 'mesurePeriod', align: 'center' },
+      { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180' },
+      { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
     ],
     pagination: true,
     list: 'sampleRecords',
@@ -174,12 +215,11 @@
   {
     name: '合同记录',
     columns: [
-      { text: '合同编号', value: 'contractCode', align: 'center' },
-      { text: '合同名称', value: 'contractName', align: 'center' },
-      { text: '合同金额', value: 'contractPrice', align: 'center' },
-      { text: '合同状态', value: 'contractStatus', align: 'center' },
-      { text: '合同时间', value: 'contractTime', align: 'center' },
-      { text: '负责人', value: 'aCompanyDutyman', align: 'center' },
+      { text: '合同编号', value: 'agreementNo', align: 'center', width: '160' },
+      { text: '合同名称', value: 'agreementName', align: 'center' },
+      { text: '合同金额', value: 'agreementAmount', align: 'center' },
+      { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '160' },
+      { text: '负责人', value: 'director', align: 'center' },
     ],
     query: {
       id: '',
@@ -193,12 +233,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center' },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     query: {
       id: '',
@@ -217,11 +257,11 @@
       offset: 1,
     },
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -232,6 +272,33 @@
 const currentMenuObj = computed(() => {
   return menu.value.find(item => item.name === currentMenu.value)
 })
+
+watch(currentMenuObj, () => {
+  listQuery.value.offset = 1
+  if (currentMenuObj.value?.searchFunc) {
+    currentMenuObj.value?.searchFunc()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (val.value && currentMenuObj) {
+    listQuery.value.offset = val.value.offset // 检定记录和检定证书
+    listQuery.value.limit = val.value.limit // 检定记录和检定证书
+    contractListQuery.value.offset = val.value.offset // 合同记录
+    contractListQuery.value.limit = val.value.limit // 合同记录
+    sampleListQuery.value.offset = val.value.offset // 样品记录
+    sampleListQuery.value.limit = val.value.limit // 样品记录
+    if (currentMenuObj.value?.searchFunc) {
+      currentMenuObj.value?.searchFunc()
+    }
+  }
+}
+
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
@@ -248,8 +315,8 @@
 const SelectionList: Ref<CustomerPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  customerName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '公司名称必填', trigger: 'blur' }],
+  businessContent: [{ required: true, message: '业务内容必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -447,13 +514,19 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -743,6 +816,7 @@
         </el-button>
       </template>
       <el-table
+        id="form"
         v-loading="loading"
         :data="customerPersonList"
         border
@@ -777,7 +851,7 @@
           </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" />
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :total="currentMenu === '检定记录' ? totalRecords : currentMenu === '检定证书' ? totalCertifications : currentMenu === '合同记录' ? totalContract : totalSample" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2ce3c37..dc0a3c0 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -286,7 +286,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" width="100" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/meter/customer/update')"
diff --git a/src/views/customer/customerInfo/customer_interface.ts b/src/views/customer/customerInfo/customer_interface.ts
index 17bcd47..34b2d0e 100644
--- a/src/views/customer/customerInfo/customer_interface.ts
+++ b/src/views/customer/customerInfo/customer_interface.ts
@@ -1,3 +1,5 @@
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 列表查询条件
 export interface ICustomerQuery {
   businessSize: string // 业务规模
@@ -111,3 +113,18 @@
   effectiveDate: string // 证书出具日期
   expirationDate: string // 证书有效期
 }
+
+export interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  query?: { id: string; limit: number; offset: number }
+  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
+  searchFunc: Function | null
+}
+
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1006f99..e6a9544 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -1,7 +1,7 @@
 <!-- 新建、编辑、详情 -->
 <script lang="ts" setup name="SampleEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
@@ -28,6 +28,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -74,17 +75,17 @@
 
 // 校验规则
 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: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
-  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
-  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
-  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  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: 'change' }],
+  // phone: [{ required: true, message: '委托方电话必填', trigger: 'change' }],
+  // postalCode: [{ required: true, message: '委托方邮编必填', trigger: 'change' }],
+  // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
+  measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+  powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -99,6 +100,10 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
   // 检定方式
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
@@ -110,6 +115,7 @@
 }
 getDict()
 
+// 检定记录、检定证书请求参数
 const listQuery = ref<IRecord>({
   sampleId: infoId.value, // 样品id
   customerId: '', // 客户id
@@ -236,14 +242,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -457,7 +469,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -479,7 +491,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -505,11 +517,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -587,7 +599,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 36f2463..6e41a94 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -32,9 +32,9 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
   {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index f619517..e8ac2bb 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -1,3 +1,4 @@
+<!-- 选择客户 -->
 <script setup lang="ts" name="SelectCustomer">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -35,12 +36,12 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '130', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '90', align: 'center' },
   { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
   { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
   { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
-  { text: '公司地址', value: 'fullAddress', width: '130', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
@@ -143,7 +144,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="选择委托方" @close="cancle">
+  <el-dialog v-model="visible" title="选择委托方" width="65%" @close="cancle">
     <search-area
       :need-clear="true"
       style="padding-left: 0;padding-right: 0;"
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 3f39bbd..a7bd992 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -24,6 +24,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -70,6 +71,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
 }
 getDict()
 
@@ -131,12 +136,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center', width: 120 },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center', width: 120 },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -145,11 +150,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: 120 },
-      { text: '证书有效期', value: 'expirationDate', align: 'center', width: 120 },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -340,7 +345,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -362,7 +367,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -388,11 +393,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -490,7 +495,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index fcf9853..a637219 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -2,10 +2,11 @@
 /**
  * 添加/编辑/详情客户
  */
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
+import type { CustomerPerson, ICustomer, Menu, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample, dictType } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -13,7 +14,9 @@
 import { validatePhone } from '@/utils/validate'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { calc } from '@/utils/useCalc'
+import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -23,11 +26,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -90,54 +89,96 @@
   { text: '联系方式', value: 'phone', required: true, reg: validatePhone, align: 'center' },
 ])
 
+// -----------------------------------表格----------------------------------------------
 // 其他关联数据列表
 const dataList = ref({
   personList: [] as CustomerPerson[],
   sampleRecords: [] as SimpleSample[],
   contractRecords: [] as SimpleContract[],
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
+  measureRecords: [] as SimpleMeasureRecord[], // 检定记录
+  certificationRecords: [] as SimpleCertification[], // 检定证书
 })
-// 获取样品列表 500
+// 检测记录和检定证书查询条件
+const listQuery = ref<IRecord>({
+  sampleId: '', // 样品id
+  customerId: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+// 合同记录请求参数
+const contractListQuery = ref({
+  agreementKind: '1', // 合同种类-收入合同1
+  agreementName: '', // 合同名字
+  agreementNo: '', // 合同编号
+  agreementType: '', // 合同类型-采购合同/业务合同等-字典code
+  customerId: infoId.value, // 单位id（客户id）（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  estimateSignEndDate: '', // 预计签订/实际签订结束日期
+  estimateSignStartDate: '', // 预计签订/实际签订开始日期
+  firstParty: '', // 单位名字（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  formId: SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE, // 表单id
+  ids: [], // 导出ids
+  status: '', // 合同完成状态-字典code
+  offset: 1,
+  limit: 10,
+})
+// 样品记录查询条件
+const sampleListQuery = ref({
+  id: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+const totalRecords = ref(0) // 检定记录
+const totalCertifications = ref(0) // 检定证书
+const totalContract = ref(0) // 合同记录
+const totalSample = ref(0) // 样品记录
+// 获取样品列表
 const fetchSampleList = function () {
-  // getSampleByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.sampleRecords = res.data.rows
-  // })
-}
-// 获取合同记录 200
-const fetchContractRecords = function () {
-  getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-    dataList.value.contractRecords = res.data.rows
+  getSampleByCustomer(sampleListQuery.value).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+    totalSample.value = res.data.total
   })
 }
-// 获取检定记录 待测试
+// 获取合同记录
+const fetchContractRecords = function () {
+  getContractByCustomer(contractListQuery.value).then((response) => {
+    dataList.value.contractRecords = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        estimateSignDate: item.estimateSignDate ? dayjs(item.estimateSignDate).format('YYYY-MM-DD') : item.estimateSignDate,
+        agreementAmount: calc(Number(item.agreementAmount), 100, '/'),
+      }
+    })
+    totalContract.value = parseInt(response.data.total)
+  })
+}
+// 获取检定记录
 const fetchMeasureRecords = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  getOrderByCustomer(postData).then((res) => {
-    dataList.value.measureRecords = res.data.rows
+  getOrderByCustomer(listQuery.value).then((res) => {
+    dataList.value.measureRecords = res.data.rows.map((item: { orderTime: string; deliverTime: string }) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : '',
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : '',
+      }
+    })
+    totalRecords.value = parseInt(res.data.total)
   })
 }
 // 获取检定证书 待测试
 const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
+  getCertificationByCustomer(listQuery.value).then((res) => {
+    dataList.value.certificationRecords = res.data.rows.map((item: { effectiveDate: string; expirationDate: string }) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : '',
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : '',
+
+      }
+    })
+    totalCertifications.value = parseInt(res.data.total)
+  })
 }
-interface Menu {
-  name: string
-  columns: TableColumn[]
-  pagination: boolean
-  query?: { id: string; limit: number; offset: number }
-  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function | null
-}
+
 // 菜单
 const menu = ref<Menu[]>([
   {
@@ -160,12 +201,12 @@
       offset: 1,
     },
     columns: [
-      { text: '样品编号', value: 'sampleCode', align: 'center' },
+      { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
       { text: '样品名称', value: 'sampleName', align: 'center' },
       { text: '型号', value: 'sampleModel', align: 'center' },
       { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-      { text: '上次检定时间', value: 'mesureTime', align: 'center' },
-      { text: '检定周期', value: 'mesurePeriod', align: 'center' },
+      { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180' },
+      { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
     ],
     pagination: true,
     list: 'sampleRecords',
@@ -174,12 +215,11 @@
   {
     name: '合同记录',
     columns: [
-      { text: '合同编号', value: 'contractCode', align: 'center' },
-      { text: '合同名称', value: 'contractName', align: 'center' },
-      { text: '合同金额', value: 'contractPrice', align: 'center' },
-      { text: '合同状态', value: 'contractStatus', align: 'center' },
-      { text: '合同时间', value: 'contractTime', align: 'center' },
-      { text: '负责人', value: 'aCompanyDutyman', align: 'center' },
+      { text: '合同编号', value: 'agreementNo', align: 'center', width: '160' },
+      { text: '合同名称', value: 'agreementName', align: 'center' },
+      { text: '合同金额', value: 'agreementAmount', align: 'center' },
+      { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '160' },
+      { text: '负责人', value: 'director', align: 'center' },
     ],
     query: {
       id: '',
@@ -193,12 +233,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center' },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     query: {
       id: '',
@@ -217,11 +257,11 @@
       offset: 1,
     },
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -232,6 +272,33 @@
 const currentMenuObj = computed(() => {
   return menu.value.find(item => item.name === currentMenu.value)
 })
+
+watch(currentMenuObj, () => {
+  listQuery.value.offset = 1
+  if (currentMenuObj.value?.searchFunc) {
+    currentMenuObj.value?.searchFunc()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (val.value && currentMenuObj) {
+    listQuery.value.offset = val.value.offset // 检定记录和检定证书
+    listQuery.value.limit = val.value.limit // 检定记录和检定证书
+    contractListQuery.value.offset = val.value.offset // 合同记录
+    contractListQuery.value.limit = val.value.limit // 合同记录
+    sampleListQuery.value.offset = val.value.offset // 样品记录
+    sampleListQuery.value.limit = val.value.limit // 样品记录
+    if (currentMenuObj.value?.searchFunc) {
+      currentMenuObj.value?.searchFunc()
+    }
+  }
+}
+
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
@@ -248,8 +315,8 @@
 const SelectionList: Ref<CustomerPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  customerName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '公司名称必填', trigger: 'blur' }],
+  businessContent: [{ required: true, message: '业务内容必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -447,13 +514,19 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -743,6 +816,7 @@
         </el-button>
       </template>
       <el-table
+        id="form"
         v-loading="loading"
         :data="customerPersonList"
         border
@@ -777,7 +851,7 @@
           </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" />
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :total="currentMenu === '检定记录' ? totalRecords : currentMenu === '检定证书' ? totalCertifications : currentMenu === '合同记录' ? totalContract : totalSample" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2ce3c37..dc0a3c0 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -286,7 +286,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" width="100" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/meter/customer/update')"
diff --git a/src/views/customer/customerInfo/customer_interface.ts b/src/views/customer/customerInfo/customer_interface.ts
index 17bcd47..34b2d0e 100644
--- a/src/views/customer/customerInfo/customer_interface.ts
+++ b/src/views/customer/customerInfo/customer_interface.ts
@@ -1,3 +1,5 @@
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 列表查询条件
 export interface ICustomerQuery {
   businessSize: string // 业务规模
@@ -111,3 +113,18 @@
   effectiveDate: string // 证书出具日期
   expirationDate: string // 证书有效期
 }
+
+export interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  query?: { id: string; limit: number; offset: number }
+  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
+  searchFunc: Function | null
+}
+
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1006f99..e6a9544 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -1,7 +1,7 @@
 <!-- 新建、编辑、详情 -->
 <script lang="ts" setup name="SampleEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
@@ -28,6 +28,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -74,17 +75,17 @@
 
 // 校验规则
 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: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
-  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
-  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
-  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  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: 'change' }],
+  // phone: [{ required: true, message: '委托方电话必填', trigger: 'change' }],
+  // postalCode: [{ required: true, message: '委托方邮编必填', trigger: 'change' }],
+  // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
+  measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+  powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -99,6 +100,10 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
   // 检定方式
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
@@ -110,6 +115,7 @@
 }
 getDict()
 
+// 检定记录、检定证书请求参数
 const listQuery = ref<IRecord>({
   sampleId: infoId.value, // 样品id
   customerId: '', // 客户id
@@ -236,14 +242,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -457,7 +469,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -479,7 +491,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -505,11 +517,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -587,7 +599,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 36f2463..6e41a94 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -32,9 +32,9 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
   {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index f619517..e8ac2bb 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -1,3 +1,4 @@
+<!-- 选择客户 -->
 <script setup lang="ts" name="SelectCustomer">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -35,12 +36,12 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '130', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '90', align: 'center' },
   { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
   { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
   { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
-  { text: '公司地址', value: 'fullAddress', width: '130', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
@@ -143,7 +144,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="选择委托方" @close="cancle">
+  <el-dialog v-model="visible" title="选择委托方" width="65%" @close="cancle">
     <search-area
       :need-clear="true"
       style="padding-left: 0;padding-right: 0;"
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 3f39bbd..a7bd992 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -24,6 +24,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -70,6 +71,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
 }
 getDict()
 
@@ -131,12 +136,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center', width: 120 },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center', width: 120 },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -145,11 +150,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: 120 },
-      { text: '证书有效期', value: 'expirationDate', align: 'center', width: 120 },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -340,7 +345,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -362,7 +367,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -388,11 +393,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -490,7 +495,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index e4ba687..92e4b4a 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -37,7 +37,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index fcf9853..a637219 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -2,10 +2,11 @@
 /**
  * 添加/编辑/详情客户
  */
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
+import type { CustomerPerson, ICustomer, Menu, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample, dictType } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -13,7 +14,9 @@
 import { validatePhone } from '@/utils/validate'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { calc } from '@/utils/useCalc'
+import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -23,11 +26,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -90,54 +89,96 @@
   { text: '联系方式', value: 'phone', required: true, reg: validatePhone, align: 'center' },
 ])
 
+// -----------------------------------表格----------------------------------------------
 // 其他关联数据列表
 const dataList = ref({
   personList: [] as CustomerPerson[],
   sampleRecords: [] as SimpleSample[],
   contractRecords: [] as SimpleContract[],
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
+  measureRecords: [] as SimpleMeasureRecord[], // 检定记录
+  certificationRecords: [] as SimpleCertification[], // 检定证书
 })
-// 获取样品列表 500
+// 检测记录和检定证书查询条件
+const listQuery = ref<IRecord>({
+  sampleId: '', // 样品id
+  customerId: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+// 合同记录请求参数
+const contractListQuery = ref({
+  agreementKind: '1', // 合同种类-收入合同1
+  agreementName: '', // 合同名字
+  agreementNo: '', // 合同编号
+  agreementType: '', // 合同类型-采购合同/业务合同等-字典code
+  customerId: infoId.value, // 单位id（客户id）（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  estimateSignEndDate: '', // 预计签订/实际签订结束日期
+  estimateSignStartDate: '', // 预计签订/实际签订开始日期
+  firstParty: '', // 单位名字（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  formId: SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE, // 表单id
+  ids: [], // 导出ids
+  status: '', // 合同完成状态-字典code
+  offset: 1,
+  limit: 10,
+})
+// 样品记录查询条件
+const sampleListQuery = ref({
+  id: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+const totalRecords = ref(0) // 检定记录
+const totalCertifications = ref(0) // 检定证书
+const totalContract = ref(0) // 合同记录
+const totalSample = ref(0) // 样品记录
+// 获取样品列表
 const fetchSampleList = function () {
-  // getSampleByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.sampleRecords = res.data.rows
-  // })
-}
-// 获取合同记录 200
-const fetchContractRecords = function () {
-  getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-    dataList.value.contractRecords = res.data.rows
+  getSampleByCustomer(sampleListQuery.value).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+    totalSample.value = res.data.total
   })
 }
-// 获取检定记录 待测试
+// 获取合同记录
+const fetchContractRecords = function () {
+  getContractByCustomer(contractListQuery.value).then((response) => {
+    dataList.value.contractRecords = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        estimateSignDate: item.estimateSignDate ? dayjs(item.estimateSignDate).format('YYYY-MM-DD') : item.estimateSignDate,
+        agreementAmount: calc(Number(item.agreementAmount), 100, '/'),
+      }
+    })
+    totalContract.value = parseInt(response.data.total)
+  })
+}
+// 获取检定记录
 const fetchMeasureRecords = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  getOrderByCustomer(postData).then((res) => {
-    dataList.value.measureRecords = res.data.rows
+  getOrderByCustomer(listQuery.value).then((res) => {
+    dataList.value.measureRecords = res.data.rows.map((item: { orderTime: string; deliverTime: string }) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : '',
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : '',
+      }
+    })
+    totalRecords.value = parseInt(res.data.total)
   })
 }
 // 获取检定证书 待测试
 const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
+  getCertificationByCustomer(listQuery.value).then((res) => {
+    dataList.value.certificationRecords = res.data.rows.map((item: { effectiveDate: string; expirationDate: string }) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : '',
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : '',
+
+      }
+    })
+    totalCertifications.value = parseInt(res.data.total)
+  })
 }
-interface Menu {
-  name: string
-  columns: TableColumn[]
-  pagination: boolean
-  query?: { id: string; limit: number; offset: number }
-  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function | null
-}
+
 // 菜单
 const menu = ref<Menu[]>([
   {
@@ -160,12 +201,12 @@
       offset: 1,
     },
     columns: [
-      { text: '样品编号', value: 'sampleCode', align: 'center' },
+      { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
       { text: '样品名称', value: 'sampleName', align: 'center' },
       { text: '型号', value: 'sampleModel', align: 'center' },
       { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-      { text: '上次检定时间', value: 'mesureTime', align: 'center' },
-      { text: '检定周期', value: 'mesurePeriod', align: 'center' },
+      { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180' },
+      { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
     ],
     pagination: true,
     list: 'sampleRecords',
@@ -174,12 +215,11 @@
   {
     name: '合同记录',
     columns: [
-      { text: '合同编号', value: 'contractCode', align: 'center' },
-      { text: '合同名称', value: 'contractName', align: 'center' },
-      { text: '合同金额', value: 'contractPrice', align: 'center' },
-      { text: '合同状态', value: 'contractStatus', align: 'center' },
-      { text: '合同时间', value: 'contractTime', align: 'center' },
-      { text: '负责人', value: 'aCompanyDutyman', align: 'center' },
+      { text: '合同编号', value: 'agreementNo', align: 'center', width: '160' },
+      { text: '合同名称', value: 'agreementName', align: 'center' },
+      { text: '合同金额', value: 'agreementAmount', align: 'center' },
+      { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '160' },
+      { text: '负责人', value: 'director', align: 'center' },
     ],
     query: {
       id: '',
@@ -193,12 +233,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center' },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     query: {
       id: '',
@@ -217,11 +257,11 @@
       offset: 1,
     },
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -232,6 +272,33 @@
 const currentMenuObj = computed(() => {
   return menu.value.find(item => item.name === currentMenu.value)
 })
+
+watch(currentMenuObj, () => {
+  listQuery.value.offset = 1
+  if (currentMenuObj.value?.searchFunc) {
+    currentMenuObj.value?.searchFunc()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (val.value && currentMenuObj) {
+    listQuery.value.offset = val.value.offset // 检定记录和检定证书
+    listQuery.value.limit = val.value.limit // 检定记录和检定证书
+    contractListQuery.value.offset = val.value.offset // 合同记录
+    contractListQuery.value.limit = val.value.limit // 合同记录
+    sampleListQuery.value.offset = val.value.offset // 样品记录
+    sampleListQuery.value.limit = val.value.limit // 样品记录
+    if (currentMenuObj.value?.searchFunc) {
+      currentMenuObj.value?.searchFunc()
+    }
+  }
+}
+
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
@@ -248,8 +315,8 @@
 const SelectionList: Ref<CustomerPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  customerName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '公司名称必填', trigger: 'blur' }],
+  businessContent: [{ required: true, message: '业务内容必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -447,13 +514,19 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -743,6 +816,7 @@
         </el-button>
       </template>
       <el-table
+        id="form"
         v-loading="loading"
         :data="customerPersonList"
         border
@@ -777,7 +851,7 @@
           </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" />
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :total="currentMenu === '检定记录' ? totalRecords : currentMenu === '检定证书' ? totalCertifications : currentMenu === '合同记录' ? totalContract : totalSample" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2ce3c37..dc0a3c0 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -286,7 +286,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" width="100" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/meter/customer/update')"
diff --git a/src/views/customer/customerInfo/customer_interface.ts b/src/views/customer/customerInfo/customer_interface.ts
index 17bcd47..34b2d0e 100644
--- a/src/views/customer/customerInfo/customer_interface.ts
+++ b/src/views/customer/customerInfo/customer_interface.ts
@@ -1,3 +1,5 @@
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 列表查询条件
 export interface ICustomerQuery {
   businessSize: string // 业务规模
@@ -111,3 +113,18 @@
   effectiveDate: string // 证书出具日期
   expirationDate: string // 证书有效期
 }
+
+export interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  query?: { id: string; limit: number; offset: number }
+  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
+  searchFunc: Function | null
+}
+
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1006f99..e6a9544 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -1,7 +1,7 @@
 <!-- 新建、编辑、详情 -->
 <script lang="ts" setup name="SampleEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
@@ -28,6 +28,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -74,17 +75,17 @@
 
 // 校验规则
 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: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
-  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
-  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
-  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  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: 'change' }],
+  // phone: [{ required: true, message: '委托方电话必填', trigger: 'change' }],
+  // postalCode: [{ required: true, message: '委托方邮编必填', trigger: 'change' }],
+  // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
+  measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+  powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -99,6 +100,10 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
   // 检定方式
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
@@ -110,6 +115,7 @@
 }
 getDict()
 
+// 检定记录、检定证书请求参数
 const listQuery = ref<IRecord>({
   sampleId: infoId.value, // 样品id
   customerId: '', // 客户id
@@ -236,14 +242,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -457,7 +469,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -479,7 +491,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -505,11 +517,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -587,7 +599,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 36f2463..6e41a94 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -32,9 +32,9 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
   {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index f619517..e8ac2bb 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -1,3 +1,4 @@
+<!-- 选择客户 -->
 <script setup lang="ts" name="SelectCustomer">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -35,12 +36,12 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '130', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '90', align: 'center' },
   { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
   { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
   { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
-  { text: '公司地址', value: 'fullAddress', width: '130', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
@@ -143,7 +144,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="选择委托方" @close="cancle">
+  <el-dialog v-model="visible" title="选择委托方" width="65%" @close="cancle">
     <search-area
       :need-clear="true"
       style="padding-left: 0;padding-right: 0;"
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 3f39bbd..a7bd992 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -24,6 +24,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -70,6 +71,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
 }
 getDict()
 
@@ -131,12 +136,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center', width: 120 },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center', width: 120 },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -145,11 +150,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: 120 },
-      { text: '证书有效期', value: 'expirationDate', align: 'center', width: 120 },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -340,7 +345,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -362,7 +367,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -388,11 +393,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -490,7 +495,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index e4ba687..92e4b4a 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -37,7 +37,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index b89f35b..9d316f1 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -60,14 +60,14 @@
 ])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '要求标价不能为空', trigger: ['blur', 'change'] },
+  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
+  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '要求建议折扣不能为空', trigger: ['blur', 'change'] },
+  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
     { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '要求附加费用不能为空', trigger: ['blur', 'change'] },
-    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '附加费用为正数，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明不能为空', trigger: 'blur' }],
+  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
+    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
+  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
 })
 
 // ---------------------------------------路由参数--------------------------------------
@@ -87,6 +87,12 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
+    form.value.priceFront = 0 // 标价
+    // form.value.suggestedDiscount = 95 // 建议折扣
+    form.value.suggestedPrice = 0 // 建议价格
+    form.value.extraCharge = 0// 附加费用-单位分
+    form.value.extraChargeIllustration = '' // 附加费用说明
+    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
@@ -138,7 +144,6 @@
   console.log('折扣改变')
   if (form.value.priceFront) {
     form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    console.log('0000', form.value.suggestedPrice, typeof form.value.suggestedPrice, form.value.suggestedPrice.toFixed(2))
     form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
   }
 }
@@ -428,7 +433,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="附加费用" prop="extraCharge">
+              <el-form-item label="附加费用(元)" prop="extraCharge">
                 <el-input
                   v-model="form.extraCharge"
                   :placeholder="pageType === 'detail' ? '' : '附加费用'"

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index fcf9853..a637219 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -2,10 +2,11 @@
 /**
  * 添加/编辑/详情客户
  */
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
+import type { CustomerPerson, ICustomer, Menu, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample, dictType } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -13,7 +14,9 @@
 import { validatePhone } from '@/utils/validate'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { calc } from '@/utils/useCalc'
+import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -23,11 +26,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -90,54 +89,96 @@
   { text: '联系方式', value: 'phone', required: true, reg: validatePhone, align: 'center' },
 ])
 
+// -----------------------------------表格----------------------------------------------
 // 其他关联数据列表
 const dataList = ref({
   personList: [] as CustomerPerson[],
   sampleRecords: [] as SimpleSample[],
   contractRecords: [] as SimpleContract[],
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
+  measureRecords: [] as SimpleMeasureRecord[], // 检定记录
+  certificationRecords: [] as SimpleCertification[], // 检定证书
 })
-// 获取样品列表 500
+// 检测记录和检定证书查询条件
+const listQuery = ref<IRecord>({
+  sampleId: '', // 样品id
+  customerId: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+// 合同记录请求参数
+const contractListQuery = ref({
+  agreementKind: '1', // 合同种类-收入合同1
+  agreementName: '', // 合同名字
+  agreementNo: '', // 合同编号
+  agreementType: '', // 合同类型-采购合同/业务合同等-字典code
+  customerId: infoId.value, // 单位id（客户id）（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  estimateSignEndDate: '', // 预计签订/实际签订结束日期
+  estimateSignStartDate: '', // 预计签订/实际签订开始日期
+  firstParty: '', // 单位名字（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  formId: SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE, // 表单id
+  ids: [], // 导出ids
+  status: '', // 合同完成状态-字典code
+  offset: 1,
+  limit: 10,
+})
+// 样品记录查询条件
+const sampleListQuery = ref({
+  id: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+const totalRecords = ref(0) // 检定记录
+const totalCertifications = ref(0) // 检定证书
+const totalContract = ref(0) // 合同记录
+const totalSample = ref(0) // 样品记录
+// 获取样品列表
 const fetchSampleList = function () {
-  // getSampleByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.sampleRecords = res.data.rows
-  // })
-}
-// 获取合同记录 200
-const fetchContractRecords = function () {
-  getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-    dataList.value.contractRecords = res.data.rows
+  getSampleByCustomer(sampleListQuery.value).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+    totalSample.value = res.data.total
   })
 }
-// 获取检定记录 待测试
+// 获取合同记录
+const fetchContractRecords = function () {
+  getContractByCustomer(contractListQuery.value).then((response) => {
+    dataList.value.contractRecords = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        estimateSignDate: item.estimateSignDate ? dayjs(item.estimateSignDate).format('YYYY-MM-DD') : item.estimateSignDate,
+        agreementAmount: calc(Number(item.agreementAmount), 100, '/'),
+      }
+    })
+    totalContract.value = parseInt(response.data.total)
+  })
+}
+// 获取检定记录
 const fetchMeasureRecords = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  getOrderByCustomer(postData).then((res) => {
-    dataList.value.measureRecords = res.data.rows
+  getOrderByCustomer(listQuery.value).then((res) => {
+    dataList.value.measureRecords = res.data.rows.map((item: { orderTime: string; deliverTime: string }) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : '',
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : '',
+      }
+    })
+    totalRecords.value = parseInt(res.data.total)
   })
 }
 // 获取检定证书 待测试
 const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
+  getCertificationByCustomer(listQuery.value).then((res) => {
+    dataList.value.certificationRecords = res.data.rows.map((item: { effectiveDate: string; expirationDate: string }) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : '',
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : '',
+
+      }
+    })
+    totalCertifications.value = parseInt(res.data.total)
+  })
 }
-interface Menu {
-  name: string
-  columns: TableColumn[]
-  pagination: boolean
-  query?: { id: string; limit: number; offset: number }
-  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function | null
-}
+
 // 菜单
 const menu = ref<Menu[]>([
   {
@@ -160,12 +201,12 @@
       offset: 1,
     },
     columns: [
-      { text: '样品编号', value: 'sampleCode', align: 'center' },
+      { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
       { text: '样品名称', value: 'sampleName', align: 'center' },
       { text: '型号', value: 'sampleModel', align: 'center' },
       { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-      { text: '上次检定时间', value: 'mesureTime', align: 'center' },
-      { text: '检定周期', value: 'mesurePeriod', align: 'center' },
+      { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180' },
+      { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
     ],
     pagination: true,
     list: 'sampleRecords',
@@ -174,12 +215,11 @@
   {
     name: '合同记录',
     columns: [
-      { text: '合同编号', value: 'contractCode', align: 'center' },
-      { text: '合同名称', value: 'contractName', align: 'center' },
-      { text: '合同金额', value: 'contractPrice', align: 'center' },
-      { text: '合同状态', value: 'contractStatus', align: 'center' },
-      { text: '合同时间', value: 'contractTime', align: 'center' },
-      { text: '负责人', value: 'aCompanyDutyman', align: 'center' },
+      { text: '合同编号', value: 'agreementNo', align: 'center', width: '160' },
+      { text: '合同名称', value: 'agreementName', align: 'center' },
+      { text: '合同金额', value: 'agreementAmount', align: 'center' },
+      { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '160' },
+      { text: '负责人', value: 'director', align: 'center' },
     ],
     query: {
       id: '',
@@ -193,12 +233,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center' },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     query: {
       id: '',
@@ -217,11 +257,11 @@
       offset: 1,
     },
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -232,6 +272,33 @@
 const currentMenuObj = computed(() => {
   return menu.value.find(item => item.name === currentMenu.value)
 })
+
+watch(currentMenuObj, () => {
+  listQuery.value.offset = 1
+  if (currentMenuObj.value?.searchFunc) {
+    currentMenuObj.value?.searchFunc()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (val.value && currentMenuObj) {
+    listQuery.value.offset = val.value.offset // 检定记录和检定证书
+    listQuery.value.limit = val.value.limit // 检定记录和检定证书
+    contractListQuery.value.offset = val.value.offset // 合同记录
+    contractListQuery.value.limit = val.value.limit // 合同记录
+    sampleListQuery.value.offset = val.value.offset // 样品记录
+    sampleListQuery.value.limit = val.value.limit // 样品记录
+    if (currentMenuObj.value?.searchFunc) {
+      currentMenuObj.value?.searchFunc()
+    }
+  }
+}
+
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
@@ -248,8 +315,8 @@
 const SelectionList: Ref<CustomerPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  customerName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '公司名称必填', trigger: 'blur' }],
+  businessContent: [{ required: true, message: '业务内容必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -447,13 +514,19 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -743,6 +816,7 @@
         </el-button>
       </template>
       <el-table
+        id="form"
         v-loading="loading"
         :data="customerPersonList"
         border
@@ -777,7 +851,7 @@
           </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" />
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :total="currentMenu === '检定记录' ? totalRecords : currentMenu === '检定证书' ? totalCertifications : currentMenu === '合同记录' ? totalContract : totalSample" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2ce3c37..dc0a3c0 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -286,7 +286,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" width="100" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/meter/customer/update')"
diff --git a/src/views/customer/customerInfo/customer_interface.ts b/src/views/customer/customerInfo/customer_interface.ts
index 17bcd47..34b2d0e 100644
--- a/src/views/customer/customerInfo/customer_interface.ts
+++ b/src/views/customer/customerInfo/customer_interface.ts
@@ -1,3 +1,5 @@
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 列表查询条件
 export interface ICustomerQuery {
   businessSize: string // 业务规模
@@ -111,3 +113,18 @@
   effectiveDate: string // 证书出具日期
   expirationDate: string // 证书有效期
 }
+
+export interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  query?: { id: string; limit: number; offset: number }
+  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
+  searchFunc: Function | null
+}
+
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1006f99..e6a9544 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -1,7 +1,7 @@
 <!-- 新建、编辑、详情 -->
 <script lang="ts" setup name="SampleEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
@@ -28,6 +28,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -74,17 +75,17 @@
 
 // 校验规则
 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: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
-  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
-  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
-  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  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: 'change' }],
+  // phone: [{ required: true, message: '委托方电话必填', trigger: 'change' }],
+  // postalCode: [{ required: true, message: '委托方邮编必填', trigger: 'change' }],
+  // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
+  measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+  powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -99,6 +100,10 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
   // 检定方式
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
@@ -110,6 +115,7 @@
 }
 getDict()
 
+// 检定记录、检定证书请求参数
 const listQuery = ref<IRecord>({
   sampleId: infoId.value, // 样品id
   customerId: '', // 客户id
@@ -236,14 +242,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -457,7 +469,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -479,7 +491,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -505,11 +517,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -587,7 +599,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 36f2463..6e41a94 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -32,9 +32,9 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
   {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index f619517..e8ac2bb 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -1,3 +1,4 @@
+<!-- 选择客户 -->
 <script setup lang="ts" name="SelectCustomer">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -35,12 +36,12 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '130', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '90', align: 'center' },
   { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
   { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
   { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
-  { text: '公司地址', value: 'fullAddress', width: '130', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
@@ -143,7 +144,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="选择委托方" @close="cancle">
+  <el-dialog v-model="visible" title="选择委托方" width="65%" @close="cancle">
     <search-area
       :need-clear="true"
       style="padding-left: 0;padding-right: 0;"
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 3f39bbd..a7bd992 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -24,6 +24,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -70,6 +71,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
 }
 getDict()
 
@@ -131,12 +136,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center', width: 120 },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center', width: 120 },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -145,11 +150,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: 120 },
-      { text: '证书有效期', value: 'expirationDate', align: 'center', width: 120 },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -340,7 +345,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -362,7 +367,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -388,11 +393,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -490,7 +495,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index e4ba687..92e4b4a 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -37,7 +37,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index b89f35b..9d316f1 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -60,14 +60,14 @@
 ])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '要求标价不能为空', trigger: ['blur', 'change'] },
+  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
+  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '要求建议折扣不能为空', trigger: ['blur', 'change'] },
+  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
     { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '要求附加费用不能为空', trigger: ['blur', 'change'] },
-    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '附加费用为正数，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明不能为空', trigger: 'blur' }],
+  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
+    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
+  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
 })
 
 // ---------------------------------------路由参数--------------------------------------
@@ -87,6 +87,12 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
+    form.value.priceFront = 0 // 标价
+    // form.value.suggestedDiscount = 95 // 建议折扣
+    form.value.suggestedPrice = 0 // 建议价格
+    form.value.extraCharge = 0// 附加费用-单位分
+    form.value.extraChargeIllustration = '' // 附加费用说明
+    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
@@ -138,7 +144,6 @@
   console.log('折扣改变')
   if (form.value.priceFront) {
     form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    console.log('0000', form.value.suggestedPrice, typeof form.value.suggestedPrice, form.value.suggestedPrice.toFixed(2))
     form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
   }
 }
@@ -428,7 +433,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="附加费用" prop="extraCharge">
+              <el-form-item label="附加费用(元)" prop="extraCharge">
                 <el-input
                   v-model="form.extraCharge"
                   :placeholder="pageType === 'detail' ? '' : '附加费用'"
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index d1e83b5..e942abb 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -31,14 +31,14 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'delivererTel', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '1' ? 'color: red' : '' } },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '标价', value: 'postedPrice', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '是' ? 'color: red' : '' } },
+  { text: '委托单创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '标价(元)', value: 'postedPrice', align: 'center' },
   { text: '建议折扣(%)', value: 'suggestedDiscount', align: 'center' },
-  { text: '建议价格', value: 'suggestedPrice', align: 'center' },
-  { text: '附加费用', value: 'extraCharge', align: 'center' },
+  { text: '建议价格(元)', value: 'suggestedPrice', align: 'center' },
+  { text: '附加费用(元)', value: 'extraCharge', align: 'center' },
   { text: '附加费用说明', value: 'extraChargeIllustration', align: 'center' },
-  { text: '总计结算费用', value: 'totalSettlement', align: 'center' },
+  { text: '总计结算费用(元)', value: 'totalSettlement', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
@@ -54,7 +54,6 @@
     list.value = response.data.rows.map((item: IList) => {
       return {
         ...item,
-        isUrgentName: item.isUrgent === '1' ? '是' : '否',
         suggestedPrice: item.suggestedPrice ? (item.suggestedPrice / 100).toFixed(2) : `${item.suggestedPrice}`,
         totalSettlement: item.totalSettlement ? (item.totalSettlement / 100).toFixed(2) : `${item.totalSettlement}`,
         extraCharge: item.extraCharge ? (item.extraCharge / 100).toFixed(2) : `${item.extraCharge}`,

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index fcf9853..a637219 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -2,10 +2,11 @@
 /**
  * 添加/编辑/详情客户
  */
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
+import type { CustomerPerson, ICustomer, Menu, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample, dictType } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -13,7 +14,9 @@
 import { validatePhone } from '@/utils/validate'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { calc } from '@/utils/useCalc'
+import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -23,11 +26,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -90,54 +89,96 @@
   { text: '联系方式', value: 'phone', required: true, reg: validatePhone, align: 'center' },
 ])
 
+// -----------------------------------表格----------------------------------------------
 // 其他关联数据列表
 const dataList = ref({
   personList: [] as CustomerPerson[],
   sampleRecords: [] as SimpleSample[],
   contractRecords: [] as SimpleContract[],
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
+  measureRecords: [] as SimpleMeasureRecord[], // 检定记录
+  certificationRecords: [] as SimpleCertification[], // 检定证书
 })
-// 获取样品列表 500
+// 检测记录和检定证书查询条件
+const listQuery = ref<IRecord>({
+  sampleId: '', // 样品id
+  customerId: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+// 合同记录请求参数
+const contractListQuery = ref({
+  agreementKind: '1', // 合同种类-收入合同1
+  agreementName: '', // 合同名字
+  agreementNo: '', // 合同编号
+  agreementType: '', // 合同类型-采购合同/业务合同等-字典code
+  customerId: infoId.value, // 单位id（客户id）（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  estimateSignEndDate: '', // 预计签订/实际签订结束日期
+  estimateSignStartDate: '', // 预计签订/实际签订开始日期
+  firstParty: '', // 单位名字（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  formId: SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE, // 表单id
+  ids: [], // 导出ids
+  status: '', // 合同完成状态-字典code
+  offset: 1,
+  limit: 10,
+})
+// 样品记录查询条件
+const sampleListQuery = ref({
+  id: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+const totalRecords = ref(0) // 检定记录
+const totalCertifications = ref(0) // 检定证书
+const totalContract = ref(0) // 合同记录
+const totalSample = ref(0) // 样品记录
+// 获取样品列表
 const fetchSampleList = function () {
-  // getSampleByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.sampleRecords = res.data.rows
-  // })
-}
-// 获取合同记录 200
-const fetchContractRecords = function () {
-  getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-    dataList.value.contractRecords = res.data.rows
+  getSampleByCustomer(sampleListQuery.value).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+    totalSample.value = res.data.total
   })
 }
-// 获取检定记录 待测试
+// 获取合同记录
+const fetchContractRecords = function () {
+  getContractByCustomer(contractListQuery.value).then((response) => {
+    dataList.value.contractRecords = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        estimateSignDate: item.estimateSignDate ? dayjs(item.estimateSignDate).format('YYYY-MM-DD') : item.estimateSignDate,
+        agreementAmount: calc(Number(item.agreementAmount), 100, '/'),
+      }
+    })
+    totalContract.value = parseInt(response.data.total)
+  })
+}
+// 获取检定记录
 const fetchMeasureRecords = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  getOrderByCustomer(postData).then((res) => {
-    dataList.value.measureRecords = res.data.rows
+  getOrderByCustomer(listQuery.value).then((res) => {
+    dataList.value.measureRecords = res.data.rows.map((item: { orderTime: string; deliverTime: string }) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : '',
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : '',
+      }
+    })
+    totalRecords.value = parseInt(res.data.total)
   })
 }
 // 获取检定证书 待测试
 const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
+  getCertificationByCustomer(listQuery.value).then((res) => {
+    dataList.value.certificationRecords = res.data.rows.map((item: { effectiveDate: string; expirationDate: string }) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : '',
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : '',
+
+      }
+    })
+    totalCertifications.value = parseInt(res.data.total)
+  })
 }
-interface Menu {
-  name: string
-  columns: TableColumn[]
-  pagination: boolean
-  query?: { id: string; limit: number; offset: number }
-  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function | null
-}
+
 // 菜单
 const menu = ref<Menu[]>([
   {
@@ -160,12 +201,12 @@
       offset: 1,
     },
     columns: [
-      { text: '样品编号', value: 'sampleCode', align: 'center' },
+      { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
       { text: '样品名称', value: 'sampleName', align: 'center' },
       { text: '型号', value: 'sampleModel', align: 'center' },
       { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-      { text: '上次检定时间', value: 'mesureTime', align: 'center' },
-      { text: '检定周期', value: 'mesurePeriod', align: 'center' },
+      { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180' },
+      { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
     ],
     pagination: true,
     list: 'sampleRecords',
@@ -174,12 +215,11 @@
   {
     name: '合同记录',
     columns: [
-      { text: '合同编号', value: 'contractCode', align: 'center' },
-      { text: '合同名称', value: 'contractName', align: 'center' },
-      { text: '合同金额', value: 'contractPrice', align: 'center' },
-      { text: '合同状态', value: 'contractStatus', align: 'center' },
-      { text: '合同时间', value: 'contractTime', align: 'center' },
-      { text: '负责人', value: 'aCompanyDutyman', align: 'center' },
+      { text: '合同编号', value: 'agreementNo', align: 'center', width: '160' },
+      { text: '合同名称', value: 'agreementName', align: 'center' },
+      { text: '合同金额', value: 'agreementAmount', align: 'center' },
+      { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '160' },
+      { text: '负责人', value: 'director', align: 'center' },
     ],
     query: {
       id: '',
@@ -193,12 +233,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center' },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     query: {
       id: '',
@@ -217,11 +257,11 @@
       offset: 1,
     },
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -232,6 +272,33 @@
 const currentMenuObj = computed(() => {
   return menu.value.find(item => item.name === currentMenu.value)
 })
+
+watch(currentMenuObj, () => {
+  listQuery.value.offset = 1
+  if (currentMenuObj.value?.searchFunc) {
+    currentMenuObj.value?.searchFunc()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (val.value && currentMenuObj) {
+    listQuery.value.offset = val.value.offset // 检定记录和检定证书
+    listQuery.value.limit = val.value.limit // 检定记录和检定证书
+    contractListQuery.value.offset = val.value.offset // 合同记录
+    contractListQuery.value.limit = val.value.limit // 合同记录
+    sampleListQuery.value.offset = val.value.offset // 样品记录
+    sampleListQuery.value.limit = val.value.limit // 样品记录
+    if (currentMenuObj.value?.searchFunc) {
+      currentMenuObj.value?.searchFunc()
+    }
+  }
+}
+
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
@@ -248,8 +315,8 @@
 const SelectionList: Ref<CustomerPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  customerName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '公司名称必填', trigger: 'blur' }],
+  businessContent: [{ required: true, message: '业务内容必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -447,13 +514,19 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -743,6 +816,7 @@
         </el-button>
       </template>
       <el-table
+        id="form"
         v-loading="loading"
         :data="customerPersonList"
         border
@@ -777,7 +851,7 @@
           </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" />
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :total="currentMenu === '检定记录' ? totalRecords : currentMenu === '检定证书' ? totalCertifications : currentMenu === '合同记录' ? totalContract : totalSample" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2ce3c37..dc0a3c0 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -286,7 +286,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" width="100" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/meter/customer/update')"
diff --git a/src/views/customer/customerInfo/customer_interface.ts b/src/views/customer/customerInfo/customer_interface.ts
index 17bcd47..34b2d0e 100644
--- a/src/views/customer/customerInfo/customer_interface.ts
+++ b/src/views/customer/customerInfo/customer_interface.ts
@@ -1,3 +1,5 @@
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 列表查询条件
 export interface ICustomerQuery {
   businessSize: string // 业务规模
@@ -111,3 +113,18 @@
   effectiveDate: string // 证书出具日期
   expirationDate: string // 证书有效期
 }
+
+export interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  query?: { id: string; limit: number; offset: number }
+  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
+  searchFunc: Function | null
+}
+
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1006f99..e6a9544 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -1,7 +1,7 @@
 <!-- 新建、编辑、详情 -->
 <script lang="ts" setup name="SampleEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
@@ -28,6 +28,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -74,17 +75,17 @@
 
 // 校验规则
 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: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
-  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
-  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
-  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  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: 'change' }],
+  // phone: [{ required: true, message: '委托方电话必填', trigger: 'change' }],
+  // postalCode: [{ required: true, message: '委托方邮编必填', trigger: 'change' }],
+  // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
+  measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+  powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -99,6 +100,10 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
   // 检定方式
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
@@ -110,6 +115,7 @@
 }
 getDict()
 
+// 检定记录、检定证书请求参数
 const listQuery = ref<IRecord>({
   sampleId: infoId.value, // 样品id
   customerId: '', // 客户id
@@ -236,14 +242,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -457,7 +469,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -479,7 +491,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -505,11 +517,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -587,7 +599,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 36f2463..6e41a94 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -32,9 +32,9 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
   {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index f619517..e8ac2bb 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -1,3 +1,4 @@
+<!-- 选择客户 -->
 <script setup lang="ts" name="SelectCustomer">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -35,12 +36,12 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '130', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '90', align: 'center' },
   { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
   { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
   { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
-  { text: '公司地址', value: 'fullAddress', width: '130', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
@@ -143,7 +144,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="选择委托方" @close="cancle">
+  <el-dialog v-model="visible" title="选择委托方" width="65%" @close="cancle">
     <search-area
       :need-clear="true"
       style="padding-left: 0;padding-right: 0;"
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 3f39bbd..a7bd992 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -24,6 +24,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -70,6 +71,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
 }
 getDict()
 
@@ -131,12 +136,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center', width: 120 },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center', width: 120 },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -145,11 +150,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: 120 },
-      { text: '证书有效期', value: 'expirationDate', align: 'center', width: 120 },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -340,7 +345,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -362,7 +367,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -388,11 +393,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -490,7 +495,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index e4ba687..92e4b4a 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -37,7 +37,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index b89f35b..9d316f1 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -60,14 +60,14 @@
 ])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '要求标价不能为空', trigger: ['blur', 'change'] },
+  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
+  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '要求建议折扣不能为空', trigger: ['blur', 'change'] },
+  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
     { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '要求附加费用不能为空', trigger: ['blur', 'change'] },
-    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '附加费用为正数，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明不能为空', trigger: 'blur' }],
+  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
+    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
+  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
 })
 
 // ---------------------------------------路由参数--------------------------------------
@@ -87,6 +87,12 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
+    form.value.priceFront = 0 // 标价
+    // form.value.suggestedDiscount = 95 // 建议折扣
+    form.value.suggestedPrice = 0 // 建议价格
+    form.value.extraCharge = 0// 附加费用-单位分
+    form.value.extraChargeIllustration = '' // 附加费用说明
+    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
@@ -138,7 +144,6 @@
   console.log('折扣改变')
   if (form.value.priceFront) {
     form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    console.log('0000', form.value.suggestedPrice, typeof form.value.suggestedPrice, form.value.suggestedPrice.toFixed(2))
     form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
   }
 }
@@ -428,7 +433,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="附加费用" prop="extraCharge">
+              <el-form-item label="附加费用(元)" prop="extraCharge">
                 <el-input
                   v-model="form.extraCharge"
                   :placeholder="pageType === 'detail' ? '' : '附加费用'"
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index d1e83b5..e942abb 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -31,14 +31,14 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'delivererTel', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '1' ? 'color: red' : '' } },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '标价', value: 'postedPrice', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '是' ? 'color: red' : '' } },
+  { text: '委托单创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '标价(元)', value: 'postedPrice', align: 'center' },
   { text: '建议折扣(%)', value: 'suggestedDiscount', align: 'center' },
-  { text: '建议价格', value: 'suggestedPrice', align: 'center' },
-  { text: '附加费用', value: 'extraCharge', align: 'center' },
+  { text: '建议价格(元)', value: 'suggestedPrice', align: 'center' },
+  { text: '附加费用(元)', value: 'extraCharge', align: 'center' },
   { text: '附加费用说明', value: 'extraChargeIllustration', align: 'center' },
-  { text: '总计结算费用', value: 'totalSettlement', align: 'center' },
+  { text: '总计结算费用(元)', value: 'totalSettlement', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
@@ -54,7 +54,6 @@
     list.value = response.data.rows.map((item: IList) => {
       return {
         ...item,
-        isUrgentName: item.isUrgent === '1' ? '是' : '否',
         suggestedPrice: item.suggestedPrice ? (item.suggestedPrice / 100).toFixed(2) : `${item.suggestedPrice}`,
         totalSettlement: item.totalSettlement ? (item.totalSettlement / 100).toFixed(2) : `${item.totalSettlement}`,
         extraCharge: item.extraCharge ? (item.extraCharge / 100).toFixed(2) : `${item.extraCharge}`,
diff --git a/src/views/finance/contract/contract-interface.ts b/src/views/finance/contract/contract-interface.ts
index 8f8eb44..5c76348 100644
--- a/src/views/finance/contract/contract-interface.ts
+++ b/src/views/finance/contract/contract-interface.ts
@@ -30,6 +30,9 @@
   createTime: string // 创建时间
   statusName: string // 合同完成状态
   approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id
+  decisionItem: number | string // 控制同意、驳回、取消按钮
 }
 
 // 字典
@@ -51,7 +54,7 @@
   deptId: string // 创建人所在部门
   deptName: string // 创建人所在部门名称
   estimateSignDate: string // 预计签订日期
-  agreementAmount: string // 合同金额
+  agreementAmount: number | string // 合同金额
   agreementSource: string // 	合同采购来源-字典code
   agreementSourceName: string // 合同采购来源-字典value
   agreementStartDate: string // 合同开始日期
@@ -73,4 +76,5 @@
   estimatePaymentDate: string // 预计收款时间
   actualPaymentAmount: string // 实际收款金额（单位分）
   actualPaymentDate: string 	// 实际收款时间
+  [key: string]: any
 }

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index fcf9853..a637219 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -2,10 +2,11 @@
 /**
  * 添加/编辑/详情客户
  */
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
+import type { CustomerPerson, ICustomer, Menu, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample, dictType } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -13,7 +14,9 @@
 import { validatePhone } from '@/utils/validate'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { calc } from '@/utils/useCalc'
+import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -23,11 +26,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -90,54 +89,96 @@
   { text: '联系方式', value: 'phone', required: true, reg: validatePhone, align: 'center' },
 ])
 
+// -----------------------------------表格----------------------------------------------
 // 其他关联数据列表
 const dataList = ref({
   personList: [] as CustomerPerson[],
   sampleRecords: [] as SimpleSample[],
   contractRecords: [] as SimpleContract[],
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
+  measureRecords: [] as SimpleMeasureRecord[], // 检定记录
+  certificationRecords: [] as SimpleCertification[], // 检定证书
 })
-// 获取样品列表 500
+// 检测记录和检定证书查询条件
+const listQuery = ref<IRecord>({
+  sampleId: '', // 样品id
+  customerId: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+// 合同记录请求参数
+const contractListQuery = ref({
+  agreementKind: '1', // 合同种类-收入合同1
+  agreementName: '', // 合同名字
+  agreementNo: '', // 合同编号
+  agreementType: '', // 合同类型-采购合同/业务合同等-字典code
+  customerId: infoId.value, // 单位id（客户id）（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  estimateSignEndDate: '', // 预计签订/实际签订结束日期
+  estimateSignStartDate: '', // 预计签订/实际签订开始日期
+  firstParty: '', // 单位名字（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  formId: SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE, // 表单id
+  ids: [], // 导出ids
+  status: '', // 合同完成状态-字典code
+  offset: 1,
+  limit: 10,
+})
+// 样品记录查询条件
+const sampleListQuery = ref({
+  id: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+const totalRecords = ref(0) // 检定记录
+const totalCertifications = ref(0) // 检定证书
+const totalContract = ref(0) // 合同记录
+const totalSample = ref(0) // 样品记录
+// 获取样品列表
 const fetchSampleList = function () {
-  // getSampleByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.sampleRecords = res.data.rows
-  // })
-}
-// 获取合同记录 200
-const fetchContractRecords = function () {
-  getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-    dataList.value.contractRecords = res.data.rows
+  getSampleByCustomer(sampleListQuery.value).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+    totalSample.value = res.data.total
   })
 }
-// 获取检定记录 待测试
+// 获取合同记录
+const fetchContractRecords = function () {
+  getContractByCustomer(contractListQuery.value).then((response) => {
+    dataList.value.contractRecords = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        estimateSignDate: item.estimateSignDate ? dayjs(item.estimateSignDate).format('YYYY-MM-DD') : item.estimateSignDate,
+        agreementAmount: calc(Number(item.agreementAmount), 100, '/'),
+      }
+    })
+    totalContract.value = parseInt(response.data.total)
+  })
+}
+// 获取检定记录
 const fetchMeasureRecords = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  getOrderByCustomer(postData).then((res) => {
-    dataList.value.measureRecords = res.data.rows
+  getOrderByCustomer(listQuery.value).then((res) => {
+    dataList.value.measureRecords = res.data.rows.map((item: { orderTime: string; deliverTime: string }) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : '',
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : '',
+      }
+    })
+    totalRecords.value = parseInt(res.data.total)
   })
 }
 // 获取检定证书 待测试
 const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
+  getCertificationByCustomer(listQuery.value).then((res) => {
+    dataList.value.certificationRecords = res.data.rows.map((item: { effectiveDate: string; expirationDate: string }) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : '',
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : '',
+
+      }
+    })
+    totalCertifications.value = parseInt(res.data.total)
+  })
 }
-interface Menu {
-  name: string
-  columns: TableColumn[]
-  pagination: boolean
-  query?: { id: string; limit: number; offset: number }
-  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function | null
-}
+
 // 菜单
 const menu = ref<Menu[]>([
   {
@@ -160,12 +201,12 @@
       offset: 1,
     },
     columns: [
-      { text: '样品编号', value: 'sampleCode', align: 'center' },
+      { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
       { text: '样品名称', value: 'sampleName', align: 'center' },
       { text: '型号', value: 'sampleModel', align: 'center' },
       { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-      { text: '上次检定时间', value: 'mesureTime', align: 'center' },
-      { text: '检定周期', value: 'mesurePeriod', align: 'center' },
+      { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180' },
+      { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
     ],
     pagination: true,
     list: 'sampleRecords',
@@ -174,12 +215,11 @@
   {
     name: '合同记录',
     columns: [
-      { text: '合同编号', value: 'contractCode', align: 'center' },
-      { text: '合同名称', value: 'contractName', align: 'center' },
-      { text: '合同金额', value: 'contractPrice', align: 'center' },
-      { text: '合同状态', value: 'contractStatus', align: 'center' },
-      { text: '合同时间', value: 'contractTime', align: 'center' },
-      { text: '负责人', value: 'aCompanyDutyman', align: 'center' },
+      { text: '合同编号', value: 'agreementNo', align: 'center', width: '160' },
+      { text: '合同名称', value: 'agreementName', align: 'center' },
+      { text: '合同金额', value: 'agreementAmount', align: 'center' },
+      { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '160' },
+      { text: '负责人', value: 'director', align: 'center' },
     ],
     query: {
       id: '',
@@ -193,12 +233,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center' },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     query: {
       id: '',
@@ -217,11 +257,11 @@
       offset: 1,
     },
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -232,6 +272,33 @@
 const currentMenuObj = computed(() => {
   return menu.value.find(item => item.name === currentMenu.value)
 })
+
+watch(currentMenuObj, () => {
+  listQuery.value.offset = 1
+  if (currentMenuObj.value?.searchFunc) {
+    currentMenuObj.value?.searchFunc()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (val.value && currentMenuObj) {
+    listQuery.value.offset = val.value.offset // 检定记录和检定证书
+    listQuery.value.limit = val.value.limit // 检定记录和检定证书
+    contractListQuery.value.offset = val.value.offset // 合同记录
+    contractListQuery.value.limit = val.value.limit // 合同记录
+    sampleListQuery.value.offset = val.value.offset // 样品记录
+    sampleListQuery.value.limit = val.value.limit // 样品记录
+    if (currentMenuObj.value?.searchFunc) {
+      currentMenuObj.value?.searchFunc()
+    }
+  }
+}
+
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
@@ -248,8 +315,8 @@
 const SelectionList: Ref<CustomerPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  customerName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '公司名称必填', trigger: 'blur' }],
+  businessContent: [{ required: true, message: '业务内容必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -447,13 +514,19 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -743,6 +816,7 @@
         </el-button>
       </template>
       <el-table
+        id="form"
         v-loading="loading"
         :data="customerPersonList"
         border
@@ -777,7 +851,7 @@
           </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" />
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :total="currentMenu === '检定记录' ? totalRecords : currentMenu === '检定证书' ? totalCertifications : currentMenu === '合同记录' ? totalContract : totalSample" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2ce3c37..dc0a3c0 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -286,7 +286,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" width="100" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/meter/customer/update')"
diff --git a/src/views/customer/customerInfo/customer_interface.ts b/src/views/customer/customerInfo/customer_interface.ts
index 17bcd47..34b2d0e 100644
--- a/src/views/customer/customerInfo/customer_interface.ts
+++ b/src/views/customer/customerInfo/customer_interface.ts
@@ -1,3 +1,5 @@
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 列表查询条件
 export interface ICustomerQuery {
   businessSize: string // 业务规模
@@ -111,3 +113,18 @@
   effectiveDate: string // 证书出具日期
   expirationDate: string // 证书有效期
 }
+
+export interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  query?: { id: string; limit: number; offset: number }
+  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
+  searchFunc: Function | null
+}
+
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1006f99..e6a9544 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -1,7 +1,7 @@
 <!-- 新建、编辑、详情 -->
 <script lang="ts" setup name="SampleEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
@@ -28,6 +28,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -74,17 +75,17 @@
 
 // 校验规则
 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: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
-  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
-  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
-  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  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: 'change' }],
+  // phone: [{ required: true, message: '委托方电话必填', trigger: 'change' }],
+  // postalCode: [{ required: true, message: '委托方邮编必填', trigger: 'change' }],
+  // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
+  measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+  powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -99,6 +100,10 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
   // 检定方式
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
@@ -110,6 +115,7 @@
 }
 getDict()
 
+// 检定记录、检定证书请求参数
 const listQuery = ref<IRecord>({
   sampleId: infoId.value, // 样品id
   customerId: '', // 客户id
@@ -236,14 +242,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -457,7 +469,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -479,7 +491,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -505,11 +517,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -587,7 +599,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 36f2463..6e41a94 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -32,9 +32,9 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
   {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index f619517..e8ac2bb 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -1,3 +1,4 @@
+<!-- 选择客户 -->
 <script setup lang="ts" name="SelectCustomer">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -35,12 +36,12 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '130', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '90', align: 'center' },
   { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
   { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
   { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
-  { text: '公司地址', value: 'fullAddress', width: '130', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
@@ -143,7 +144,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="选择委托方" @close="cancle">
+  <el-dialog v-model="visible" title="选择委托方" width="65%" @close="cancle">
     <search-area
       :need-clear="true"
       style="padding-left: 0;padding-right: 0;"
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 3f39bbd..a7bd992 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -24,6 +24,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -70,6 +71,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
 }
 getDict()
 
@@ -131,12 +136,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center', width: 120 },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center', width: 120 },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -145,11 +150,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: 120 },
-      { text: '证书有效期', value: 'expirationDate', align: 'center', width: 120 },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -340,7 +345,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -362,7 +367,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -388,11 +393,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -490,7 +495,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index e4ba687..92e4b4a 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -37,7 +37,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index b89f35b..9d316f1 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -60,14 +60,14 @@
 ])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '要求标价不能为空', trigger: ['blur', 'change'] },
+  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
+  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '要求建议折扣不能为空', trigger: ['blur', 'change'] },
+  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
     { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '要求附加费用不能为空', trigger: ['blur', 'change'] },
-    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '附加费用为正数，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明不能为空', trigger: 'blur' }],
+  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
+    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
+  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
 })
 
 // ---------------------------------------路由参数--------------------------------------
@@ -87,6 +87,12 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
+    form.value.priceFront = 0 // 标价
+    // form.value.suggestedDiscount = 95 // 建议折扣
+    form.value.suggestedPrice = 0 // 建议价格
+    form.value.extraCharge = 0// 附加费用-单位分
+    form.value.extraChargeIllustration = '' // 附加费用说明
+    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
@@ -138,7 +144,6 @@
   console.log('折扣改变')
   if (form.value.priceFront) {
     form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    console.log('0000', form.value.suggestedPrice, typeof form.value.suggestedPrice, form.value.suggestedPrice.toFixed(2))
     form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
   }
 }
@@ -428,7 +433,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="附加费用" prop="extraCharge">
+              <el-form-item label="附加费用(元)" prop="extraCharge">
                 <el-input
                   v-model="form.extraCharge"
                   :placeholder="pageType === 'detail' ? '' : '附加费用'"
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index d1e83b5..e942abb 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -31,14 +31,14 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'delivererTel', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '1' ? 'color: red' : '' } },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '标价', value: 'postedPrice', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '是' ? 'color: red' : '' } },
+  { text: '委托单创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '标价(元)', value: 'postedPrice', align: 'center' },
   { text: '建议折扣(%)', value: 'suggestedDiscount', align: 'center' },
-  { text: '建议价格', value: 'suggestedPrice', align: 'center' },
-  { text: '附加费用', value: 'extraCharge', align: 'center' },
+  { text: '建议价格(元)', value: 'suggestedPrice', align: 'center' },
+  { text: '附加费用(元)', value: 'extraCharge', align: 'center' },
   { text: '附加费用说明', value: 'extraChargeIllustration', align: 'center' },
-  { text: '总计结算费用', value: 'totalSettlement', align: 'center' },
+  { text: '总计结算费用(元)', value: 'totalSettlement', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
@@ -54,7 +54,6 @@
     list.value = response.data.rows.map((item: IList) => {
       return {
         ...item,
-        isUrgentName: item.isUrgent === '1' ? '是' : '否',
         suggestedPrice: item.suggestedPrice ? (item.suggestedPrice / 100).toFixed(2) : `${item.suggestedPrice}`,
         totalSettlement: item.totalSettlement ? (item.totalSettlement / 100).toFixed(2) : `${item.totalSettlement}`,
         extraCharge: item.extraCharge ? (item.extraCharge / 100).toFixed(2) : `${item.extraCharge}`,
diff --git a/src/views/finance/contract/contract-interface.ts b/src/views/finance/contract/contract-interface.ts
index 8f8eb44..5c76348 100644
--- a/src/views/finance/contract/contract-interface.ts
+++ b/src/views/finance/contract/contract-interface.ts
@@ -30,6 +30,9 @@
   createTime: string // 创建时间
   statusName: string // 合同完成状态
   approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id
+  decisionItem: number | string // 控制同意、驳回、取消按钮
 }
 
 // 字典
@@ -51,7 +54,7 @@
   deptId: string // 创建人所在部门
   deptName: string // 创建人所在部门名称
   estimateSignDate: string // 预计签订日期
-  agreementAmount: string // 合同金额
+  agreementAmount: number | string // 合同金额
   agreementSource: string // 	合同采购来源-字典code
   agreementSourceName: string // 合同采购来源-字典value
   agreementStartDate: string // 合同开始日期
@@ -73,4 +76,5 @@
   estimatePaymentDate: string // 预计收款时间
   actualPaymentAmount: string // 实际收款金额（单位分）
   actualPaymentDate: string 	// 实际收款时间
+  [key: string]: any
 }
diff --git a/src/views/finance/contract/edit.vue b/src/views/finance/contract/edit.vue
index 443a729..21e36fc 100644
--- a/src/views/finance/contract/edit.vue
+++ b/src/views/finance/contract/edit.vue
@@ -9,7 +9,7 @@
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
 import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -19,7 +19,9 @@
 import { addContractList, failUpdateContractList, getContractDetail, submitContractList, updateContractList } from '@/api/finance/contract'
 import { calc } from '@/utils/useCalc'
 import useUserStore from '@/store/modules/user'
-
+import { getUid } from '@/utils/getUid'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const customerVisible = ref(false) // 控制选择客户（甲方单位）对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -28,6 +30,8 @@
 const pageType = ref('add') // 页面类型: add, edit, detail
 const submitId = ref('') // 提交使用的id
 const approvalStatusName = ref('') // 审批状态名字
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const $route = useRoute()
 const query = $route.query
 const textMap: { [key: string]: string } = {
@@ -84,7 +88,7 @@
 const ruleFormRef = ref<FormInstance>() // 表单ref
 const paymentList = ref<IPaymentList[]>([]) // 收款信息
 const checkoutPaymentList = ref<string[]>([]) // 多选收款信息
-const paymentColumn = ref<TableColumn[]>([
+const paymentColumn = ref([
   { text: '收款次数', value: 'paymentNum', align: 'center', width: '100' },
   { text: '预计收款金额(元)', value: 'estimatePaymentAmount', align: 'center', reg: validateMoney, required: true },
   { text: '预计收款时间', value: 'estimatePaymentDate', align: 'center', required: true },
@@ -106,18 +110,18 @@
 }
 // 校验规则
 const rules = ref<FormRules>({
-  agreementName: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }],
-  agreementType: [{ required: true, message: '合同类型不能为空', trigger: 'blur' }],
-  estimateSignDate: [{ required: true, message: '预计签订日期不能为空', trigger: 'blur' }],
+  agreementName: [{ required: true, message: '合同名称必填', trigger: 'blur' }],
+  agreementType: [{ required: true, message: '合同类型必填', trigger: 'blur' }],
+  estimateSignDate: [{ required: true, message: '预计签订日期必填', trigger: 'blur' }],
   // agreementStartDate: [{ required: true, message: '合同开始日期', trigger: 'blur' }],
   agreementEndDate: [{ required: false, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
-  agreementAmount: [{ required: true, message: '合同金额不能为空', trigger: ['blur', 'change'] },
-    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '合同金额为正数，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  agreementSource: [{ required: true, message: '合同采购来源不能为空', trigger: 'blur' }],
-  firstParty: [{ required: true, message: '甲方单位不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '甲方负责人不能为空', trigger: 'blur' }],
-  secondParty: [{ required: true, message: '乙方负责人不能为空', trigger: 'blur' }],
-  secondDirector: [{ required: true, message: '乙方负责人不能为空', trigger: 'blur' }],
+  agreementAmount: [{ required: true, message: '合同金额必填', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求为正数，且最多保留两位小数', trigger: ['blur', 'change'] }],
+  agreementSource: [{ required: true, message: '合同采购来源必填', trigger: 'blur' }],
+  firstParty: [{ required: true, message: '甲方单位必填', trigger: 'blur' }],
+  director: [{ required: true, message: '甲方负责人必填', trigger: 'blur' }],
+  secondParty: [{ required: true, message: '乙方负责人必填', trigger: 'blur' }],
+  secondDirector: [{ required: true, message: '乙方负责人必填', trigger: 'blur' }],
 
 }) // 表单验证规则
 // 初始化router
@@ -199,9 +203,6 @@
   }
 }
 // -------------------------------------------收款信息-------------------------------------------------
-const rowClassName = ({ row, rowIndex }) => {
-  row.xh = rowIndex + 1
-}
 // 检查收款信息行
 function checkPaymentList() {
   for (let index = 0; index < paymentList.value.length; index++) {
@@ -242,6 +243,8 @@
     estimatePaymentDate: '', // 预计收款时间
     actualPaymentAmount: '', // 实际收款金额（单位分）
     actualPaymentDate: '', 	// 实际收款时间
+    paymentNum: '',
+    idFront: getUid(), // 生成唯一id
     isEdit: true,
   })
 }
@@ -255,12 +258,16 @@
   }
   else {
     checkoutPaymentList.value.forEach((item: any) => {
-      paymentList.value.splice(item.xh, 1)
+      paymentList.value.forEach((element, index) => {
+        if (element.idFront === item.idFront) {
+          paymentList.value.splice(index, 1)
+        }
+      })
     })
   }
 }
 // 多选选中
-const handlePaymentSelectionChange = (e) => {
+const handlePaymentSelectionChange = (e: any) => {
   checkoutPaymentList.value = e
 }
 // ----------------------------------------------选择客户（甲方单位）-----------------------------------
@@ -312,7 +319,7 @@
 const upload = () => {
   fileRef.value.click()
 }
-// -------------------------------------------审批流程----------------------------------------
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -327,15 +334,58 @@
     }
   }
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 操作
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
 // -------------------------------------------------------------------------------------
 // 获取详情
 const getInfo = () => {
-  // loading.value = true
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getContractDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
     form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
     // 委托书
-    orderList.value = res.data.orderList.map((item) => {
+    orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
       return {
         ...item,
         isUrgentName: item.isUrgent == 1 ? '是' : '否',
@@ -343,13 +393,14 @@
       }
     })
     // 收款信息
-    paymentList.value = res.data.paymentList.map((item) => {
+    paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
       return {
         ...item,
         estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
         actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
       }
     })
+    loading.close()
   })
 }
 
@@ -359,7 +410,7 @@
     ElMessage.warning('委托单信息不能为空')
     return false
   }
-  if (!paymentColumn.value.length) {
+  if (!paymentList.value.length) {
     ElMessage.warning('收款信息不能为空')
     return false
   }
@@ -375,13 +426,13 @@
       })
       const param = {
         ...form.value,
-        agreementAmount: calc(form.value.agreementAmount, 100, '*'),
+        agreementAmount: calc(Number(form.value.agreementAmount), 100, '*'),
         orderIdList: orderList.value.map(item => item.id),
         paymentList: paymentList.value.map((item) => {
           return {
             ...item,
-            estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '*') : item.estimatePaymentAmount,
-            actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '*') : item.actualPaymentAmount,
+            estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(Number(item.estimatePaymentAmount), 100, '*') : item.estimatePaymentAmount,
+            actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(Number(item.actualPaymentAmount), 100, '*') : item.actualPaymentAmount,
             paymentNum: item.xh,
           }
         }),
@@ -451,6 +502,8 @@
   await getDict()
   approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
   form.value.processId = query.processId as string // 流程实例id
+  decisionItem.value = query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = query.taskId as string // 流程实例id
   form.value.deptId = user.deptId // 申请单位
   form.value.deptName = user.deptName // 申请单位名称
   form.value.createUser = user.id // 申请人
@@ -469,9 +522,18 @@
   <app-container>
     <detail-page v-loading="loading" :title="`收入合同管理-${textMap[pageType]}`">
       <template #btns>
-        <!-- <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
-        </el-button> -->
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="primary" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="primary" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
           提交
         </el-button>
@@ -560,7 +622,7 @@
                 <el-date-picker
                   v-model="form.agreementStartDate"
                   type="date"
-                  placeholder="请选择"
+                  :placeholder="pageType === 'detail' ? '' : '请选择'"
                   format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD"
                   :disabled="pageType === 'detail'"
@@ -572,7 +634,7 @@
                 <el-date-picker
                   v-model="form.agreementEndDate"
                   type="date"
-                  placeholder="请选择"
+                  :placeholder="pageType === 'detail' ? '' : '请选择'"
                   format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD"
                   :disabled="pageType === 'detail'"
@@ -715,7 +777,6 @@
         border
         style="width: 100%;"
         max-height="600"
-        :row-class-name="rowClassName"
         @selection-change="handlePaymentSelectionChange"
       >
         <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
@@ -741,7 +802,6 @@
               :placeholder="pageType === 'detail' ? '' : `请输入${item.text}`"
               :disabled="pageType === 'detail'"
               class="input"
-              @change="changePrice"
             />
             <!-- 预计收款时间、实际收款时间 -->
             <el-date-picker
@@ -765,6 +825,8 @@
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" :is-multi="true" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 

diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index c7bf1be..dfae297 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -68,36 +68,36 @@
 }
 
 // 根据客户查样品id
-export function getSampleByCustomer(data: { id: string }) {
+export function getSampleByCustomer(data: { id: string ; offset: number; limit: number }) {
   return request({
-    url: '/customer/sampleRecords',
-    method: 'post',
-    data,
-  })
-}
-
-// 根据客户查合同记录
-export function getContractByCustomer(data: { id: string }) {
-  return request({
-    url: '/customer/contractRecords',
+    url: `/customer/sampleRecords?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 根据客户查检定记录
-export function getOrderByCustomer(data: { sampleId: string; customeId: string }) {
+export function getOrderByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 // 检定证书
-export function getCertificationByCustomer(data: { sampleId: string; customeId: string }) {
+export function getCertificationByCustomer(data: { customerId?: string; sampleId?: string; offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
+// 合同列表
+export function getContractByCustomer(data: { offset: number; limit: number }) {
+  return request({
+    url: `/finance/agreement/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 3bb9312..51b68aa 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -33,11 +33,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.push({
-      id: '',
-      name: '全部',
-      value: 2, // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.push({
+    //   id: '',
+    //   name: '全部',
+    //   value: 2, // 是否加急全部后端定为2
+    // })
   })
   // 接收状态
   getDictByCode('orderStatus').then((response) => {
@@ -64,7 +64,7 @@
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   deliverer: '', // 送样人
-  isUrgent: 2, // 是否加急 2全部 1是 0否
+  isUrgent: '', // 是否加急 2全部 1是 0否
   status: 2, // 接收状态 2已接收
   offset: 1,
   limit: 5,
@@ -120,7 +120,7 @@
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     deliverer: '', // 送样人
-    isUrgent: 2, // 是否加急
+    isUrgent: '', // 是否加急
     status: 2, // 接收状态 2已接收
     offset: 1,
     limit: 5,
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index d7033d8..2d92da9 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -5,7 +5,7 @@
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送样人
-  isUrgent: number // 是否加急
+  isUrgent: number | string // 是否加急
   status: number // 接收状态
   offset: number
   limit: number
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index d0fabb0..98f4a39 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -23,9 +23,9 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
   { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
   { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
@@ -121,28 +121,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  // todo: 校验文件类型，调用上传接口
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      // const fd = new FormData()
-      // fd.append('multipartFile', event.target.files[0])
-      // uploadApi(fd).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage.success('上传成功')
-      //   }
-      //   else {
-      //     ElMessage.error(res.message)
-      //   }
-      // })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -262,7 +240,6 @@
         <icon-button v-if="proxy.hasPerm('/meter/advice/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/meter/advice/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index fcf9853..a637219 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -2,10 +2,11 @@
 /**
  * 添加/编辑/详情客户
  */
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
+import type { CustomerPerson, ICustomer, Menu, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample, dictType } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -13,7 +14,9 @@
 import { validatePhone } from '@/utils/validate'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { calc } from '@/utils/useCalc'
+import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -23,11 +26,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -90,54 +89,96 @@
   { text: '联系方式', value: 'phone', required: true, reg: validatePhone, align: 'center' },
 ])
 
+// -----------------------------------表格----------------------------------------------
 // 其他关联数据列表
 const dataList = ref({
   personList: [] as CustomerPerson[],
   sampleRecords: [] as SimpleSample[],
   contractRecords: [] as SimpleContract[],
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
+  measureRecords: [] as SimpleMeasureRecord[], // 检定记录
+  certificationRecords: [] as SimpleCertification[], // 检定证书
 })
-// 获取样品列表 500
+// 检测记录和检定证书查询条件
+const listQuery = ref<IRecord>({
+  sampleId: '', // 样品id
+  customerId: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+// 合同记录请求参数
+const contractListQuery = ref({
+  agreementKind: '1', // 合同种类-收入合同1
+  agreementName: '', // 合同名字
+  agreementNo: '', // 合同编号
+  agreementType: '', // 合同类型-采购合同/业务合同等-字典code
+  customerId: infoId.value, // 单位id（客户id）（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  estimateSignEndDate: '', // 预计签订/实际签订结束日期
+  estimateSignStartDate: '', // 预计签订/实际签订开始日期
+  firstParty: '', // 单位名字（收入合同该字段为甲方单位，支出合同该字段为乙方单位）
+  formId: SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE, // 表单id
+  ids: [], // 导出ids
+  status: '', // 合同完成状态-字典code
+  offset: 1,
+  limit: 10,
+})
+// 样品记录查询条件
+const sampleListQuery = ref({
+  id: infoId.value, // 客户id
+  offset: 1,
+  limit: 10,
+})
+const totalRecords = ref(0) // 检定记录
+const totalCertifications = ref(0) // 检定证书
+const totalContract = ref(0) // 合同记录
+const totalSample = ref(0) // 样品记录
+// 获取样品列表
 const fetchSampleList = function () {
-  // getSampleByCustomer({ id: dataForm.value.id }).then((res) => {
-  //   dataList.value.sampleRecords = res.data.rows
-  // })
-}
-// 获取合同记录 200
-const fetchContractRecords = function () {
-  getContractByCustomer({ id: dataForm.value.id }).then((res) => {
-    dataList.value.contractRecords = res.data.rows
+  getSampleByCustomer(sampleListQuery.value).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+    totalSample.value = res.data.total
   })
 }
-// 获取检定记录 待测试
+// 获取合同记录
+const fetchContractRecords = function () {
+  getContractByCustomer(contractListQuery.value).then((response) => {
+    dataList.value.contractRecords = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        estimateSignDate: item.estimateSignDate ? dayjs(item.estimateSignDate).format('YYYY-MM-DD') : item.estimateSignDate,
+        agreementAmount: calc(Number(item.agreementAmount), 100, '/'),
+      }
+    })
+    totalContract.value = parseInt(response.data.total)
+  })
+}
+// 获取检定记录
 const fetchMeasureRecords = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  getOrderByCustomer(postData).then((res) => {
-    dataList.value.measureRecords = res.data.rows
+  getOrderByCustomer(listQuery.value).then((res) => {
+    dataList.value.measureRecords = res.data.rows.map((item: { orderTime: string; deliverTime: string }) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : '',
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : '',
+      }
+    })
+    totalRecords.value = parseInt(res.data.total)
   })
 }
 // 获取检定证书 待测试
 const fetchCertifications = function () {
-  const postData = {
-    sampleId: '',
-    customeId: dataForm.value.id,
-  }
-  // getCertificationByCustomer(postData).then((res) => {
-  //   dataList.value.certificationRecords = res.data.rows
-  // })
+  getCertificationByCustomer(listQuery.value).then((res) => {
+    dataList.value.certificationRecords = res.data.rows.map((item: { effectiveDate: string; expirationDate: string }) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : '',
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : '',
+
+      }
+    })
+    totalCertifications.value = parseInt(res.data.total)
+  })
 }
-interface Menu {
-  name: string
-  columns: TableColumn[]
-  pagination: boolean
-  query?: { id: string; limit: number; offset: number }
-  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function | null
-}
+
 // 菜单
 const menu = ref<Menu[]>([
   {
@@ -160,12 +201,12 @@
       offset: 1,
     },
     columns: [
-      { text: '样品编号', value: 'sampleCode', align: 'center' },
+      { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
       { text: '样品名称', value: 'sampleName', align: 'center' },
       { text: '型号', value: 'sampleModel', align: 'center' },
       { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-      { text: '上次检定时间', value: 'mesureTime', align: 'center' },
-      { text: '检定周期', value: 'mesurePeriod', align: 'center' },
+      { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180' },
+      { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
     ],
     pagination: true,
     list: 'sampleRecords',
@@ -174,12 +215,11 @@
   {
     name: '合同记录',
     columns: [
-      { text: '合同编号', value: 'contractCode', align: 'center' },
-      { text: '合同名称', value: 'contractName', align: 'center' },
-      { text: '合同金额', value: 'contractPrice', align: 'center' },
-      { text: '合同状态', value: 'contractStatus', align: 'center' },
-      { text: '合同时间', value: 'contractTime', align: 'center' },
-      { text: '负责人', value: 'aCompanyDutyman', align: 'center' },
+      { text: '合同编号', value: 'agreementNo', align: 'center', width: '160' },
+      { text: '合同名称', value: 'agreementName', align: 'center' },
+      { text: '合同金额', value: 'agreementAmount', align: 'center' },
+      { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '160' },
+      { text: '负责人', value: 'director', align: 'center' },
     ],
     query: {
       id: '',
@@ -193,12 +233,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center' },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     query: {
       id: '',
@@ -217,11 +257,11 @@
       offset: 1,
     },
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -232,6 +272,33 @@
 const currentMenuObj = computed(() => {
   return menu.value.find(item => item.name === currentMenu.value)
 })
+
+watch(currentMenuObj, () => {
+  listQuery.value.offset = 1
+  if (currentMenuObj.value?.searchFunc) {
+    currentMenuObj.value?.searchFunc()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+
+// 监听页数变化
+const changePage = (val: any) => {
+  if (val.value && currentMenuObj) {
+    listQuery.value.offset = val.value.offset // 检定记录和检定证书
+    listQuery.value.limit = val.value.limit // 检定记录和检定证书
+    contractListQuery.value.offset = val.value.offset // 合同记录
+    contractListQuery.value.limit = val.value.limit // 合同记录
+    sampleListQuery.value.offset = val.value.offset // 样品记录
+    sampleListQuery.value.limit = val.value.limit // 样品记录
+    if (currentMenuObj.value?.searchFunc) {
+      currentMenuObj.value?.searchFunc()
+    }
+  }
+}
+
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
@@ -248,8 +315,8 @@
 const SelectionList: Ref<CustomerPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  customerName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '公司名称必填', trigger: 'blur' }],
+  businessContent: [{ required: true, message: '业务内容必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -447,13 +514,19 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -743,6 +816,7 @@
         </el-button>
       </template>
       <el-table
+        id="form"
         v-loading="loading"
         :data="customerPersonList"
         border
@@ -777,7 +851,7 @@
           </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" />
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :total="currentMenu === '检定记录' ? totalRecords : currentMenu === '检定证书' ? totalCertifications : currentMenu === '合同记录' ? totalContract : totalSample" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="changePage" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2ce3c37..dc0a3c0 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -286,7 +286,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" width="100" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/meter/customer/update')"
diff --git a/src/views/customer/customerInfo/customer_interface.ts b/src/views/customer/customerInfo/customer_interface.ts
index 17bcd47..34b2d0e 100644
--- a/src/views/customer/customerInfo/customer_interface.ts
+++ b/src/views/customer/customerInfo/customer_interface.ts
@@ -1,3 +1,5 @@
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 列表查询条件
 export interface ICustomerQuery {
   businessSize: string // 业务规模
@@ -111,3 +113,18 @@
   effectiveDate: string // 证书出具日期
   expirationDate: string // 证书有效期
 }
+
+export interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  query?: { id: string; limit: number; offset: number }
+  list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
+  searchFunc: Function | null
+}
+
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1006f99..e6a9544 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -1,7 +1,7 @@
 <!-- 新建、编辑、详情 -->
 <script lang="ts" setup name="SampleEdit">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
@@ -28,6 +28,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
   sampleNo: '', // 样品编号
@@ -74,17 +75,17 @@
 
 // 校验规则
 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: 'change' }],
-  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
-  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
-  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
-  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  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: 'change' }],
+  // phone: [{ required: true, message: '委托方电话必填', trigger: 'change' }],
+  // postalCode: [{ required: true, message: '委托方邮编必填', trigger: 'change' }],
+  // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
+  measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+  powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -99,6 +100,10 @@
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
   // 检定方式
   getDictByCode('measureType').then((response) => {
     measureTypeList.value = response.data
@@ -110,6 +115,7 @@
 }
 getDict()
 
+// 检定记录、检定证书请求参数
 const listQuery = ref<IRecord>({
   sampleId: infoId.value, // 样品id
   customerId: '', // 客户id
@@ -236,14 +242,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -457,7 +469,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -479,7 +491,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -505,11 +517,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -587,7 +599,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index 36f2463..6e41a94 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -32,9 +32,9 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
   {
diff --git a/src/views/customer/sample/list/selectCustomer.vue b/src/views/customer/sample/list/selectCustomer.vue
index f619517..e8ac2bb 100644
--- a/src/views/customer/sample/list/selectCustomer.vue
+++ b/src/views/customer/sample/list/selectCustomer.vue
@@ -1,3 +1,4 @@
+<!-- 选择客户 -->
 <script setup lang="ts" name="SelectCustomer">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -35,12 +36,12 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center', fixed: true },
-  { text: '客户名称', value: 'customerName', width: '130', align: 'center', fixed: true },
-  { text: '公司规模', value: 'companySizeName', width: '110', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center', fixed: true },
+  { text: '公司规模', value: 'companySizeName', width: '90', align: 'center' },
   { text: '业务规模', value: 'businessSizeName', width: '130', align: 'center' },
   { text: '履约评级', value: 'gradeName', width: '90', align: 'center' },
   { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' },
-  { text: '公司地址', value: 'fullAddress', width: '130', align: 'center' },
+  { text: '公司地址', value: 'fullAddress', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
@@ -143,7 +144,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="选择委托方" @close="cancle">
+  <el-dialog v-model="visible" title="选择委托方" width="65%" @close="cancle">
     <search-area
       :need-clear="true"
       style="padding-left: 0;padding-right: 0;"
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 3f39bbd..a7bd992 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -24,6 +24,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const ABCList = ref<dictType[]>([]) // ABC
 
 const dataForm: Ref<ISampleDetail> = ref({
   id: '',
@@ -70,6 +71,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
 }
 getDict()
 
@@ -131,12 +136,12 @@
   {
     name: '检定记录',
     columns: [
-      { text: '委托单编号', value: 'orderCode', align: 'center' },
-      { text: '委托单日期', value: 'orderTime', align: 'center', width: 120 },
-      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+      { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+      { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
       { text: '委托方名称', value: 'customerName', align: 'center' },
       { text: '送检人', value: 'deliverer', align: 'center' },
-      { text: '送检日期', value: 'deliverTime', align: 'center', width: 120 },
+      { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
     ],
     list: 'measureRecords',
     pagination: true,
@@ -145,11 +150,11 @@
   {
     name: '检定证书',
     columns: [
-      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
-      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: 120 },
-      { text: '证书有效期', value: 'expirationDate', align: 'center', width: 120 },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
     ],
     list: 'certificationRecords',
     pagination: true,
@@ -340,7 +345,7 @@
               <el-form-item label="校检类别:">
                 <el-select
                   v-model="dataForm.measureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择校检类别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -362,7 +367,7 @@
               <el-form-item label="厂家国别:">
                 <el-select
                   v-model="dataForm.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择厂家国别'"
                   :disabled="pageType === 'detail'"
                   class="full-width-input"
                 >
@@ -388,11 +393,11 @@
               <el-form-item label="ABC:">
                 <el-select
                   v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择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-option v-for="item of ABCList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -490,7 +495,7 @@
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.measureType"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择检定方式'"
                   disabled
                   class="full-width-input"
                 >
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index e4ba687..92e4b4a 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -37,7 +37,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue
index b89f35b..9d316f1 100644
--- a/src/views/finance/businessSettlement/edit.vue
+++ b/src/views/finance/businessSettlement/edit.vue
@@ -60,14 +60,14 @@
 ])
 // 表单校验规则
 const rules = reactive<FormRules>({
-  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '要求标价不能为空', trigger: ['blur', 'change'] },
+  orderCode: [{ required: true, message: '委托书编号必填', trigger: 'blur' }],
+  price: [{ required: true, message: '标价必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标价只能为数字', trigger: ['blur', 'change'] }],
-  suggestedDiscount: [{ required: true, message: '要求建议折扣不能为空', trigger: ['blur', 'change'] },
+  suggestedDiscount: [{ required: true, message: '建议折扣必填', trigger: ['blur', 'change'] },
     { pattern: /^([0]|[1-9][0-9]*)$/, message: '建议折扣只能为正整数或0', trigger: ['blur', 'change'] }],
-  extraCharge: [{ required: true, message: '要求附加费用不能为空', trigger: ['blur', 'change'] },
-    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '附加费用为正数，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  extraChargeIllustration: [{ required: true, message: '附加费用说明不能为空', trigger: 'blur' }],
+  extraCharge: [{ required: true, message: '附加费用必填', trigger: ['blur', 'change'] },
+    { pattern: /(^[0-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/, message: '要求不小于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
+  extraChargeIllustration: [{ required: true, message: '附加费用说明必填', trigger: 'blur' }],
 })
 
 // ---------------------------------------路由参数--------------------------------------
@@ -87,6 +87,12 @@
 // 选好委托书
 const confirmCheckoutOrder = (val: Array<IOrderList>) => {
   if (val && val.length) {
+    form.value.priceFront = 0 // 标价
+    // form.value.suggestedDiscount = 95 // 建议折扣
+    form.value.suggestedPrice = 0 // 建议价格
+    form.value.extraCharge = 0// 附加费用-单位分
+    form.value.extraChargeIllustration = '' // 附加费用说明
+    form.value.totalSettlement = 0 // 总计结算费用
     getOrderDetail({ id: val[0].id }).then((res) => { // 样品清单
       form.value.orderCode = res.data.orderCode // 委托书编号
       form.value.orderId = res.data.id // 委托书id
@@ -138,7 +144,6 @@
   console.log('折扣改变')
   if (form.value.priceFront) {
     form.value.suggestedPrice = calc(Number(form.value.priceFront), Number(form.value.suggestedDiscount / 100), '*') as number
-    console.log('0000', form.value.suggestedPrice, typeof form.value.suggestedPrice, form.value.suggestedPrice.toFixed(2))
     form.value.suggestedPrice = Number(form.value.suggestedPrice.toFixed(2))
   }
 }
@@ -428,7 +433,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="附加费用" prop="extraCharge">
+              <el-form-item label="附加费用(元)" prop="extraCharge">
                 <el-input
                   v-model="form.extraCharge"
                   :placeholder="pageType === 'detail' ? '' : '附加费用'"
diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue
index d1e83b5..e942abb 100644
--- a/src/views/finance/businessSettlement/list.vue
+++ b/src/views/finance/businessSettlement/list.vue
@@ -31,14 +31,14 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'delivererTel', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '1' ? 'color: red' : '' } },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
-  { text: '标价', value: 'postedPrice', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '是' ? 'color: red' : '' } },
+  { text: '委托单创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '标价(元)', value: 'postedPrice', align: 'center' },
   { text: '建议折扣(%)', value: 'suggestedDiscount', align: 'center' },
-  { text: '建议价格', value: 'suggestedPrice', align: 'center' },
-  { text: '附加费用', value: 'extraCharge', align: 'center' },
+  { text: '建议价格(元)', value: 'suggestedPrice', align: 'center' },
+  { text: '附加费用(元)', value: 'extraCharge', align: 'center' },
   { text: '附加费用说明', value: 'extraChargeIllustration', align: 'center' },
-  { text: '总计结算费用', value: 'totalSettlement', align: 'center' },
+  { text: '总计结算费用(元)', value: 'totalSettlement', align: 'center' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 选中的内容
@@ -54,7 +54,6 @@
     list.value = response.data.rows.map((item: IList) => {
       return {
         ...item,
-        isUrgentName: item.isUrgent === '1' ? '是' : '否',
         suggestedPrice: item.suggestedPrice ? (item.suggestedPrice / 100).toFixed(2) : `${item.suggestedPrice}`,
         totalSettlement: item.totalSettlement ? (item.totalSettlement / 100).toFixed(2) : `${item.totalSettlement}`,
         extraCharge: item.extraCharge ? (item.extraCharge / 100).toFixed(2) : `${item.extraCharge}`,
diff --git a/src/views/finance/contract/contract-interface.ts b/src/views/finance/contract/contract-interface.ts
index 8f8eb44..5c76348 100644
--- a/src/views/finance/contract/contract-interface.ts
+++ b/src/views/finance/contract/contract-interface.ts
@@ -30,6 +30,9 @@
   createTime: string // 创建时间
   statusName: string // 合同完成状态
   approvalStatusName: string // 审批状态
+  processId: string // 流程实例id
+  taskId: string // 任务id
+  decisionItem: number | string // 控制同意、驳回、取消按钮
 }
 
 // 字典
@@ -51,7 +54,7 @@
   deptId: string // 创建人所在部门
   deptName: string // 创建人所在部门名称
   estimateSignDate: string // 预计签订日期
-  agreementAmount: string // 合同金额
+  agreementAmount: number | string // 合同金额
   agreementSource: string // 	合同采购来源-字典code
   agreementSourceName: string // 合同采购来源-字典value
   agreementStartDate: string // 合同开始日期
@@ -73,4 +76,5 @@
   estimatePaymentDate: string // 预计收款时间
   actualPaymentAmount: string // 实际收款金额（单位分）
   actualPaymentDate: string 	// 实际收款时间
+  [key: string]: any
 }
diff --git a/src/views/finance/contract/edit.vue b/src/views/finance/contract/edit.vue
index 443a729..21e36fc 100644
--- a/src/views/finance/contract/edit.vue
+++ b/src/views/finance/contract/edit.vue
@@ -9,7 +9,7 @@
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
 import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
@@ -19,7 +19,9 @@
 import { addContractList, failUpdateContractList, getContractDetail, submitContractList, updateContractList } from '@/api/finance/contract'
 import { calc } from '@/utils/useCalc'
 import useUserStore from '@/store/modules/user'
-
+import { getUid } from '@/utils/getUid'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const customerVisible = ref(false) // 控制选择客户（甲方单位）对话框显隐
 const orderVisible = ref(false) // 控制委托书对话框显隐
@@ -28,6 +30,8 @@
 const pageType = ref('add') // 页面类型: add, edit, detail
 const submitId = ref('') // 提交使用的id
 const approvalStatusName = ref('') // 审批状态名字
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const $route = useRoute()
 const query = $route.query
 const textMap: { [key: string]: string } = {
@@ -84,7 +88,7 @@
 const ruleFormRef = ref<FormInstance>() // 表单ref
 const paymentList = ref<IPaymentList[]>([]) // 收款信息
 const checkoutPaymentList = ref<string[]>([]) // 多选收款信息
-const paymentColumn = ref<TableColumn[]>([
+const paymentColumn = ref([
   { text: '收款次数', value: 'paymentNum', align: 'center', width: '100' },
   { text: '预计收款金额(元)', value: 'estimatePaymentAmount', align: 'center', reg: validateMoney, required: true },
   { text: '预计收款时间', value: 'estimatePaymentDate', align: 'center', required: true },
@@ -106,18 +110,18 @@
 }
 // 校验规则
 const rules = ref<FormRules>({
-  agreementName: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }],
-  agreementType: [{ required: true, message: '合同类型不能为空', trigger: 'blur' }],
-  estimateSignDate: [{ required: true, message: '预计签订日期不能为空', trigger: 'blur' }],
+  agreementName: [{ required: true, message: '合同名称必填', trigger: 'blur' }],
+  agreementType: [{ required: true, message: '合同类型必填', trigger: 'blur' }],
+  estimateSignDate: [{ required: true, message: '预计签订日期必填', trigger: 'blur' }],
   // agreementStartDate: [{ required: true, message: '合同开始日期', trigger: 'blur' }],
   agreementEndDate: [{ required: false, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
-  agreementAmount: [{ required: true, message: '合同金额不能为空', trigger: ['blur', 'change'] },
-    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '合同金额为正数，且最多保留两位小数', trigger: ['blur', 'change'] }],
-  agreementSource: [{ required: true, message: '合同采购来源不能为空', trigger: 'blur' }],
-  firstParty: [{ required: true, message: '甲方单位不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '甲方负责人不能为空', trigger: 'blur' }],
-  secondParty: [{ required: true, message: '乙方负责人不能为空', trigger: 'blur' }],
-  secondDirector: [{ required: true, message: '乙方负责人不能为空', trigger: 'blur' }],
+  agreementAmount: [{ required: true, message: '合同金额必填', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求为正数，且最多保留两位小数', trigger: ['blur', 'change'] }],
+  agreementSource: [{ required: true, message: '合同采购来源必填', trigger: 'blur' }],
+  firstParty: [{ required: true, message: '甲方单位必填', trigger: 'blur' }],
+  director: [{ required: true, message: '甲方负责人必填', trigger: 'blur' }],
+  secondParty: [{ required: true, message: '乙方负责人必填', trigger: 'blur' }],
+  secondDirector: [{ required: true, message: '乙方负责人必填', trigger: 'blur' }],
 
 }) // 表单验证规则
 // 初始化router
@@ -199,9 +203,6 @@
   }
 }
 // -------------------------------------------收款信息-------------------------------------------------
-const rowClassName = ({ row, rowIndex }) => {
-  row.xh = rowIndex + 1
-}
 // 检查收款信息行
 function checkPaymentList() {
   for (let index = 0; index < paymentList.value.length; index++) {
@@ -242,6 +243,8 @@
     estimatePaymentDate: '', // 预计收款时间
     actualPaymentAmount: '', // 实际收款金额（单位分）
     actualPaymentDate: '', 	// 实际收款时间
+    paymentNum: '',
+    idFront: getUid(), // 生成唯一id
     isEdit: true,
   })
 }
@@ -255,12 +258,16 @@
   }
   else {
     checkoutPaymentList.value.forEach((item: any) => {
-      paymentList.value.splice(item.xh, 1)
+      paymentList.value.forEach((element, index) => {
+        if (element.idFront === item.idFront) {
+          paymentList.value.splice(index, 1)
+        }
+      })
     })
   }
 }
 // 多选选中
-const handlePaymentSelectionChange = (e) => {
+const handlePaymentSelectionChange = (e: any) => {
   checkoutPaymentList.value = e
 }
 // ----------------------------------------------选择客户（甲方单位）-----------------------------------
@@ -312,7 +319,7 @@
 const upload = () => {
   fileRef.value.click()
 }
-// -------------------------------------------审批流程----------------------------------------
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -327,15 +334,58 @@
     }
   }
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 操作
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
 // -------------------------------------------------------------------------------------
 // 获取详情
 const getInfo = () => {
-  // loading.value = true
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getContractDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
     form.value.agreementAmount = calc(res.data.agreementAmount, 100, '/')
     // 委托书
-    orderList.value = res.data.orderList.map((item) => {
+    orderList.value = res.data.orderList.map((item: { isUrgent: number | string; statusName: string }) => {
       return {
         ...item,
         isUrgentName: item.isUrgent == 1 ? '是' : '否',
@@ -343,13 +393,14 @@
       }
     })
     // 收款信息
-    paymentList.value = res.data.paymentList.map((item) => {
+    paymentList.value = res.data.paymentList.map((item: { estimatePaymentAmount: number; actualPaymentAmount: number }) => {
       return {
         ...item,
         estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '/') : item.estimatePaymentAmount,
         actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '/') : item.actualPaymentAmount,
       }
     })
+    loading.close()
   })
 }
 
@@ -359,7 +410,7 @@
     ElMessage.warning('委托单信息不能为空')
     return false
   }
-  if (!paymentColumn.value.length) {
+  if (!paymentList.value.length) {
     ElMessage.warning('收款信息不能为空')
     return false
   }
@@ -375,13 +426,13 @@
       })
       const param = {
         ...form.value,
-        agreementAmount: calc(form.value.agreementAmount, 100, '*'),
+        agreementAmount: calc(Number(form.value.agreementAmount), 100, '*'),
         orderIdList: orderList.value.map(item => item.id),
         paymentList: paymentList.value.map((item) => {
           return {
             ...item,
-            estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(item.estimatePaymentAmount, 100, '*') : item.estimatePaymentAmount,
-            actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(item.actualPaymentAmount, 100, '*') : item.actualPaymentAmount,
+            estimatePaymentAmount: `${item.estimatePaymentAmount}` ? calc(Number(item.estimatePaymentAmount), 100, '*') : item.estimatePaymentAmount,
+            actualPaymentAmount: `${item.actualPaymentAmount}` ? calc(Number(item.actualPaymentAmount), 100, '*') : item.actualPaymentAmount,
             paymentNum: item.xh,
           }
         }),
@@ -451,6 +502,8 @@
   await getDict()
   approvalStatusName.value = query.approvalStatusName as string // 审批状态名字
   form.value.processId = query.processId as string // 流程实例id
+  decisionItem.value = query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = query.taskId as string // 流程实例id
   form.value.deptId = user.deptId // 申请单位
   form.value.deptName = user.deptName // 申请单位名称
   form.value.createUser = user.id // 申请人
@@ -469,9 +522,18 @@
   <app-container>
     <detail-page v-loading="loading" :title="`收入合同管理-${textMap[pageType]}`">
       <template #btns>
-        <!-- <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
-        </el-button> -->
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="primary" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="primary" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
           提交
         </el-button>
@@ -560,7 +622,7 @@
                 <el-date-picker
                   v-model="form.agreementStartDate"
                   type="date"
-                  placeholder="请选择"
+                  :placeholder="pageType === 'detail' ? '' : '请选择'"
                   format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD"
                   :disabled="pageType === 'detail'"
@@ -572,7 +634,7 @@
                 <el-date-picker
                   v-model="form.agreementEndDate"
                   type="date"
-                  placeholder="请选择"
+                  :placeholder="pageType === 'detail' ? '' : '请选择'"
                   format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD"
                   :disabled="pageType === 'detail'"
@@ -715,7 +777,6 @@
         border
         style="width: 100%;"
         max-height="600"
-        :row-class-name="rowClassName"
         @selection-change="handlePaymentSelectionChange"
       >
         <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
@@ -741,7 +802,6 @@
               :placeholder="pageType === 'detail' ? '' : `请输入${item.text}`"
               :disabled="pageType === 'detail'"
               class="input"
-              @change="changePrice"
             />
             <!-- 预计收款时间、实际收款时间 -->
             <el-date-picker
@@ -765,6 +825,8 @@
     <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择委托书组件 -->
     <select-order v-model:visible="orderVisible" :is-multi="true" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index cd37d9d..7dcdca5 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -48,11 +48,11 @@
   { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '部门', value: 'deptName', align: 'center' },
   { text: '签订日期', value: 'estimateSignDate', align: 'center', width: '110px' },
-  { text: '合同金额(元)', value: 'agreementAmount', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '1' ? 'color: red' : '' } },
+  { text: '合同金额(元)', value: 'agreementAmount', align: 'center', width: '90px' },
   { text: '甲方单位', value: 'firstParty', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '合同完成状态', value: 'statusName', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 const list = ref<IList[]>([]) // 表格数据
 // 筛选时间段数据
@@ -272,6 +272,8 @@
       query: {
         approvalStatusName: row.approvalStatusName, // 审批状态名称
         processId: row.processId, // 流程实例
+        decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+        taskId: row.taskId,
       },
     })
   }
@@ -351,7 +353,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="(active === '0') ? 150 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 150"
+              :width="(active === '0') ? 150 : (active === '1' || active === '6') ? 150 : (active === '4' || active === '5' || active === '3') ? 100 : 150"
             >
               <template #default="{ row }">
                 <el-button
@@ -363,7 +365,7 @@
                   查看
                 </el-button>
                 <el-button
-                  v-if=" row.approvalStatusName === '待审批'"
+                  v-if="row.approvalStatusName === '待审批'"
                   size="small"
                   link
                   type="primary"
@@ -373,7 +375,7 @@
                   同意
                 </el-button>
                 <el-button
-                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                   size="small"
                   link
                   type="primary"
@@ -383,7 +385,7 @@
                   驳回
                 </el-button>
                 <el-button
-                  v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                   size="small"
                   link
                   type="danger"