diff --git a/src/api/customer/advice.ts b/src/api/customer/advice.ts
index 738dac3..c581a4e 100644
--- a/src/api/customer/advice.ts
+++ b/src/api/customer/advice.ts
@@ -3,12 +3,11 @@
  */
 import request from '../index'
 import type { IAdviceQuery } from '@/views/customer/advice/advice_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getAdviceList(data: IAdviceQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/advice/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 数据删除
 export function deleteAdvice(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/advice/delete',
     method: 'post',
     data,
   })
@@ -26,7 +25,7 @@
 // 查看详情
 export function getAdviceDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/advice/detail',
     method: 'post',
     data,
   })
@@ -35,7 +34,7 @@
 // 新增数据
 export function addAdvice(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/advice/add',
     method: 'post',
     data,
   })
@@ -43,7 +42,7 @@
 // 编辑数据
 export function updateAdvice(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/advice/update',
     method: 'post',
     data,
   })
@@ -52,7 +51,7 @@
 // 导出列表
 export function exportAdviceList(data: Omit<IAdviceQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/advice/export',
     method: 'post',
     responseType: 'blob',
     data,

diff --git a/src/api/customer/advice.ts b/src/api/customer/advice.ts
index 738dac3..c581a4e 100644
--- a/src/api/customer/advice.ts
+++ b/src/api/customer/advice.ts
@@ -3,12 +3,11 @@
  */
 import request from '../index'
 import type { IAdviceQuery } from '@/views/customer/advice/advice_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getAdviceList(data: IAdviceQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/advice/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 数据删除
 export function deleteAdvice(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/advice/delete',
     method: 'post',
     data,
   })
@@ -26,7 +25,7 @@
 // 查看详情
 export function getAdviceDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/advice/detail',
     method: 'post',
     data,
   })
@@ -35,7 +34,7 @@
 // 新增数据
 export function addAdvice(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/advice/add',
     method: 'post',
     data,
   })
@@ -43,7 +42,7 @@
 // 编辑数据
 export function updateAdvice(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/advice/update',
     method: 'post',
     data,
   })
@@ -52,7 +51,7 @@
 // 导出列表
 export function exportAdviceList(data: Omit<IAdviceQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/advice/export',
     method: 'post',
     responseType: 'blob',
     data,
diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index ebdebe6..724da6e 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -3,12 +3,20 @@
  */
 import request from '../index'
 import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getCustomerList(data: ICustomerQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表查询
+export function getCustomerListSimple(data: ICustomerQuery) {
+  return request({
+    url: '/customer/listPage',
     method: 'post',
     data,
   })
@@ -17,7 +25,7 @@
 // 数据删除
 export function deleteCustomer(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/delete',
     method: 'post',
     data,
   })
@@ -26,7 +34,7 @@
 // 查看详情
 export function getCustomerDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/detail',
     method: 'post',
     data,
   })
@@ -35,7 +43,7 @@
 // 新增数据
 export function addCustomer(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/add',
     method: 'post',
     data,
   })
@@ -43,7 +51,7 @@
 // 编辑数据
 export function updateCustomer(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/update',
     method: 'post',
     data,
   })
@@ -52,10 +60,44 @@
 // 导出列表
 export function exportCustomerList(data: Omit<ICustomerQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/export',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
+// 根据客户查样品id
+export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查合同记录
+export function getContractByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查检定记录
+export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 根据客户查检定记录
+export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/customer/advice.ts b/src/api/customer/advice.ts
index 738dac3..c581a4e 100644
--- a/src/api/customer/advice.ts
+++ b/src/api/customer/advice.ts
@@ -3,12 +3,11 @@
  */
 import request from '../index'
 import type { IAdviceQuery } from '@/views/customer/advice/advice_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getAdviceList(data: IAdviceQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/advice/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 数据删除
 export function deleteAdvice(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/advice/delete',
     method: 'post',
     data,
   })
@@ -26,7 +25,7 @@
 // 查看详情
 export function getAdviceDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/advice/detail',
     method: 'post',
     data,
   })
@@ -35,7 +34,7 @@
 // 新增数据
 export function addAdvice(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/advice/add',
     method: 'post',
     data,
   })
@@ -43,7 +42,7 @@
 // 编辑数据
 export function updateAdvice(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/advice/update',
     method: 'post',
     data,
   })
@@ -52,7 +51,7 @@
 // 导出列表
 export function exportAdviceList(data: Omit<IAdviceQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/advice/export',
     method: 'post',
     responseType: 'blob',
     data,
diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index ebdebe6..724da6e 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -3,12 +3,20 @@
  */
 import request from '../index'
 import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getCustomerList(data: ICustomerQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表查询
+export function getCustomerListSimple(data: ICustomerQuery) {
+  return request({
+    url: '/customer/listPage',
     method: 'post',
     data,
   })
@@ -17,7 +25,7 @@
 // 数据删除
 export function deleteCustomer(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/delete',
     method: 'post',
     data,
   })
@@ -26,7 +34,7 @@
 // 查看详情
 export function getCustomerDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/detail',
     method: 'post',
     data,
   })
@@ -35,7 +43,7 @@
 // 新增数据
 export function addCustomer(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/add',
     method: 'post',
     data,
   })
@@ -43,7 +51,7 @@
 // 编辑数据
 export function updateCustomer(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/update',
     method: 'post',
     data,
   })
@@ -52,10 +60,44 @@
 // 导出列表
 export function exportCustomerList(data: Omit<ICustomerQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/export',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
+// 根据客户查样品id
+export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查合同记录
+export function getContractByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查检定记录
+export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 根据客户查检定记录
+export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 60aa04c..9cbd57f 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -172,7 +172,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.provinceName"
       placeholder=""
       class="address-select"
@@ -196,7 +196,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.cityName"
       placeholder=""
       class="address-select"
@@ -220,7 +220,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.areaName"
       placeholder=""
       class="address-select"
@@ -230,7 +230,7 @@
     <!-- 详细地址 -->
     <el-input
       v-model="addressObj.address"
-      placeholder="详细地址"
+      :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"

diff --git a/src/api/customer/advice.ts b/src/api/customer/advice.ts
index 738dac3..c581a4e 100644
--- a/src/api/customer/advice.ts
+++ b/src/api/customer/advice.ts
@@ -3,12 +3,11 @@
  */
 import request from '../index'
 import type { IAdviceQuery } from '@/views/customer/advice/advice_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getAdviceList(data: IAdviceQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/advice/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 数据删除
 export function deleteAdvice(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/advice/delete',
     method: 'post',
     data,
   })
@@ -26,7 +25,7 @@
 // 查看详情
 export function getAdviceDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/advice/detail',
     method: 'post',
     data,
   })
@@ -35,7 +34,7 @@
 // 新增数据
 export function addAdvice(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/advice/add',
     method: 'post',
     data,
   })
@@ -43,7 +42,7 @@
 // 编辑数据
 export function updateAdvice(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/advice/update',
     method: 'post',
     data,
   })
@@ -52,7 +51,7 @@
 // 导出列表
 export function exportAdviceList(data: Omit<IAdviceQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/advice/export',
     method: 'post',
     responseType: 'blob',
     data,
diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index ebdebe6..724da6e 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -3,12 +3,20 @@
  */
 import request from '../index'
 import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getCustomerList(data: ICustomerQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表查询
+export function getCustomerListSimple(data: ICustomerQuery) {
+  return request({
+    url: '/customer/listPage',
     method: 'post',
     data,
   })
@@ -17,7 +25,7 @@
 // 数据删除
 export function deleteCustomer(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/delete',
     method: 'post',
     data,
   })
@@ -26,7 +34,7 @@
 // 查看详情
 export function getCustomerDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/detail',
     method: 'post',
     data,
   })
@@ -35,7 +43,7 @@
 // 新增数据
 export function addCustomer(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/add',
     method: 'post',
     data,
   })
@@ -43,7 +51,7 @@
 // 编辑数据
 export function updateCustomer(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/update',
     method: 'post',
     data,
   })
@@ -52,10 +60,44 @@
 // 导出列表
 export function exportCustomerList(data: Omit<ICustomerQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/export',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
+// 根据客户查样品id
+export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查合同记录
+export function getContractByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查检定记录
+export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 根据客户查检定记录
+export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 60aa04c..9cbd57f 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -172,7 +172,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.provinceName"
       placeholder=""
       class="address-select"
@@ -196,7 +196,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.cityName"
       placeholder=""
       class="address-select"
@@ -220,7 +220,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.areaName"
       placeholder=""
       class="address-select"
@@ -230,7 +230,7 @@
     <!-- 详细地址 -->
     <el-input
       v-model="addressObj.address"
-      placeholder="详细地址"
+      :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index fbe670d..465b2e7 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -10,7 +10,7 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSampleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -198,7 +198,7 @@
 
 // 获取样品详情
 const getInfo = () => {
-  // getSampleDetail({ id: infoId.value }).then((res) => {
+  // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
     orderId: '123',
     ABC: 'A',

diff --git a/src/api/customer/advice.ts b/src/api/customer/advice.ts
index 738dac3..c581a4e 100644
--- a/src/api/customer/advice.ts
+++ b/src/api/customer/advice.ts
@@ -3,12 +3,11 @@
  */
 import request from '../index'
 import type { IAdviceQuery } from '@/views/customer/advice/advice_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getAdviceList(data: IAdviceQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/advice/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 数据删除
 export function deleteAdvice(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/advice/delete',
     method: 'post',
     data,
   })
@@ -26,7 +25,7 @@
 // 查看详情
 export function getAdviceDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/advice/detail',
     method: 'post',
     data,
   })
@@ -35,7 +34,7 @@
 // 新增数据
 export function addAdvice(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/advice/add',
     method: 'post',
     data,
   })
@@ -43,7 +42,7 @@
 // 编辑数据
 export function updateAdvice(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/advice/update',
     method: 'post',
     data,
   })
@@ -52,7 +51,7 @@
 // 导出列表
 export function exportAdviceList(data: Omit<IAdviceQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/advice/export',
     method: 'post',
     responseType: 'blob',
     data,
diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index ebdebe6..724da6e 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -3,12 +3,20 @@
  */
 import request from '../index'
 import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getCustomerList(data: ICustomerQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表查询
+export function getCustomerListSimple(data: ICustomerQuery) {
+  return request({
+    url: '/customer/listPage',
     method: 'post',
     data,
   })
@@ -17,7 +25,7 @@
 // 数据删除
 export function deleteCustomer(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/delete',
     method: 'post',
     data,
   })
@@ -26,7 +34,7 @@
 // 查看详情
 export function getCustomerDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/detail',
     method: 'post',
     data,
   })
@@ -35,7 +43,7 @@
 // 新增数据
 export function addCustomer(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/add',
     method: 'post',
     data,
   })
@@ -43,7 +51,7 @@
 // 编辑数据
 export function updateCustomer(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/update',
     method: 'post',
     data,
   })
@@ -52,10 +60,44 @@
 // 导出列表
 export function exportCustomerList(data: Omit<ICustomerQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/export',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
+// 根据客户查样品id
+export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查合同记录
+export function getContractByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查检定记录
+export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 根据客户查检定记录
+export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 60aa04c..9cbd57f 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -172,7 +172,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.provinceName"
       placeholder=""
       class="address-select"
@@ -196,7 +196,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.cityName"
       placeholder=""
       class="address-select"
@@ -220,7 +220,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.areaName"
       placeholder=""
       class="address-select"
@@ -230,7 +230,7 @@
     <!-- 详细地址 -->
     <el-input
       v-model="addressObj.address"
-      placeholder="详细地址"
+      :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index fbe670d..465b2e7 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -10,7 +10,7 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSampleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -198,7 +198,7 @@
 
 // 获取样品详情
 const getInfo = () => {
-  // getSampleDetail({ id: infoId.value }).then((res) => {
+  // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
     orderId: '123',
     ABC: 'A',
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index a5411c1..629b33c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -9,6 +9,7 @@
 import type { IAdvice, SimpleCompany } from './advice_interface'
 import { addAdvice, getAdviceDetail, updateAdvice } from '@/api/customer/advice'
 import { getDictByCode } from '@/api/system/dict'
+import { getCustomerListSimple } from '@/api/customer/customer'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -93,42 +94,29 @@
 const getInfo = () => {
   loading.value = true
   getAdviceDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      id: '1597579843411234817',
-      adviceNo: 'ts202201022131', // 投诉编号
-      adviceClass: '0', // 投诉类型
-      adviceType: '1', // 投诉类别
-      advicePerson: '张三', // 投诉人-名称
-      personPhone: '87447', // 投诉人联系方式
-      customerName: '特别大公司', // 公司名称
-      adviceTime: '2022-12-25 23:58:00',
-      customerNo: '', //	客户编号
-      customerId: '', // 客户id
-      content: '没人接电话', // 投诉内容
-      handleStatus: '0', // 处置状态-0未处置，1已处置
-      handleMessage: '', // 处置意见
-    }
     dataForm.value = res.data
     loading.value = false
   })
 }
 
-const tempCompanyList = ref<SimpleCompany[]>([
-  { customerId: '111', customerNo: '12312456', customerName: '京东', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '112', customerNo: '12312451', customerName: '阿里', businessSizeName: '0~10万', companySizeName: '大企业', gradeName: '一般', evaluationName: '重点客户' },
-  { customerId: '113', customerNo: '12312452', customerName: '淘宝', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '114', customerNo: '12312453', customerName: '天猫', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '115', customerNo: '12312454', customerName: '203d', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '116', customerNo: '12312456', customerName: '万达', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-])
 // 查询公司列表
 const queryCompany = (queryString: string, cb: any) => {
-  // TODO: 远程查询符合要求的公司列表
-  const results = queryString ? tempCompanyList.value.filter((item) => { item.customerName.includes(queryString) }) : tempCompanyList.value
-  cb(results)
+  const params = {
+    businessSize: '', // 业务规模
+    customerName: queryString, // 公司名称
+    customerNo: '', // 客户编号
+    grade: '', // 履约评级
+    offset: 1,
+    limit: 20,
+  }
+  // 远程查询符合要求的公司列表
+  getCustomerListSimple(params).then((res) => {
+    const result = res.data.rows
+    cb(result)
+  })
 }
 
-// 选中
+// 选中客户
 const handleCompanySelect = (select: Record<string, any>) => {
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
@@ -138,12 +126,12 @@
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
+  dataForm.value.customerNo = item.customerNo
 }
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
   popTitle: '投诉/建议详情', // 打印配置页上方的标题
-  // extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>投诉/建议详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -294,7 +282,7 @@
             <el-col :span="6">
               <el-form-item label="客户编号">
                 <el-input
-                  v-model="companyInfo.customerNo"
+                  v-model="dataForm.customerNo"
                   placeholder=""
                   disabled
                   :class="{ 'detail-input': pageType === 'detail' }"

diff --git a/src/api/customer/advice.ts b/src/api/customer/advice.ts
index 738dac3..c581a4e 100644
--- a/src/api/customer/advice.ts
+++ b/src/api/customer/advice.ts
@@ -3,12 +3,11 @@
  */
 import request from '../index'
 import type { IAdviceQuery } from '@/views/customer/advice/advice_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getAdviceList(data: IAdviceQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/advice/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 数据删除
 export function deleteAdvice(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/advice/delete',
     method: 'post',
     data,
   })
@@ -26,7 +25,7 @@
 // 查看详情
 export function getAdviceDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/advice/detail',
     method: 'post',
     data,
   })
@@ -35,7 +34,7 @@
 // 新增数据
 export function addAdvice(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/advice/add',
     method: 'post',
     data,
   })
@@ -43,7 +42,7 @@
 // 编辑数据
 export function updateAdvice(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/advice/update',
     method: 'post',
     data,
   })
@@ -52,7 +51,7 @@
 // 导出列表
 export function exportAdviceList(data: Omit<IAdviceQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/advice/export',
     method: 'post',
     responseType: 'blob',
     data,
diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index ebdebe6..724da6e 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -3,12 +3,20 @@
  */
 import request from '../index'
 import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getCustomerList(data: ICustomerQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表查询
+export function getCustomerListSimple(data: ICustomerQuery) {
+  return request({
+    url: '/customer/listPage',
     method: 'post',
     data,
   })
@@ -17,7 +25,7 @@
 // 数据删除
 export function deleteCustomer(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/delete',
     method: 'post',
     data,
   })
@@ -26,7 +34,7 @@
 // 查看详情
 export function getCustomerDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/detail',
     method: 'post',
     data,
   })
@@ -35,7 +43,7 @@
 // 新增数据
 export function addCustomer(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/add',
     method: 'post',
     data,
   })
@@ -43,7 +51,7 @@
 // 编辑数据
 export function updateCustomer(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/update',
     method: 'post',
     data,
   })
@@ -52,10 +60,44 @@
 // 导出列表
 export function exportCustomerList(data: Omit<ICustomerQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/export',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
+// 根据客户查样品id
+export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查合同记录
+export function getContractByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查检定记录
+export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 根据客户查检定记录
+export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 60aa04c..9cbd57f 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -172,7 +172,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.provinceName"
       placeholder=""
       class="address-select"
@@ -196,7 +196,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.cityName"
       placeholder=""
       class="address-select"
@@ -220,7 +220,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.areaName"
       placeholder=""
       class="address-select"
@@ -230,7 +230,7 @@
     <!-- 详细地址 -->
     <el-input
       v-model="addressObj.address"
-      placeholder="详细地址"
+      :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index fbe670d..465b2e7 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -10,7 +10,7 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSampleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -198,7 +198,7 @@
 
 // 获取样品详情
 const getInfo = () => {
-  // getSampleDetail({ id: infoId.value }).then((res) => {
+  // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
     orderId: '123',
     ABC: 'A',
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index a5411c1..629b33c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -9,6 +9,7 @@
 import type { IAdvice, SimpleCompany } from './advice_interface'
 import { addAdvice, getAdviceDetail, updateAdvice } from '@/api/customer/advice'
 import { getDictByCode } from '@/api/system/dict'
+import { getCustomerListSimple } from '@/api/customer/customer'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -93,42 +94,29 @@
 const getInfo = () => {
   loading.value = true
   getAdviceDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      id: '1597579843411234817',
-      adviceNo: 'ts202201022131', // 投诉编号
-      adviceClass: '0', // 投诉类型
-      adviceType: '1', // 投诉类别
-      advicePerson: '张三', // 投诉人-名称
-      personPhone: '87447', // 投诉人联系方式
-      customerName: '特别大公司', // 公司名称
-      adviceTime: '2022-12-25 23:58:00',
-      customerNo: '', //	客户编号
-      customerId: '', // 客户id
-      content: '没人接电话', // 投诉内容
-      handleStatus: '0', // 处置状态-0未处置，1已处置
-      handleMessage: '', // 处置意见
-    }
     dataForm.value = res.data
     loading.value = false
   })
 }
 
-const tempCompanyList = ref<SimpleCompany[]>([
-  { customerId: '111', customerNo: '12312456', customerName: '京东', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '112', customerNo: '12312451', customerName: '阿里', businessSizeName: '0~10万', companySizeName: '大企业', gradeName: '一般', evaluationName: '重点客户' },
-  { customerId: '113', customerNo: '12312452', customerName: '淘宝', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '114', customerNo: '12312453', customerName: '天猫', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '115', customerNo: '12312454', customerName: '203d', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '116', customerNo: '12312456', customerName: '万达', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-])
 // 查询公司列表
 const queryCompany = (queryString: string, cb: any) => {
-  // TODO: 远程查询符合要求的公司列表
-  const results = queryString ? tempCompanyList.value.filter((item) => { item.customerName.includes(queryString) }) : tempCompanyList.value
-  cb(results)
+  const params = {
+    businessSize: '', // 业务规模
+    customerName: queryString, // 公司名称
+    customerNo: '', // 客户编号
+    grade: '', // 履约评级
+    offset: 1,
+    limit: 20,
+  }
+  // 远程查询符合要求的公司列表
+  getCustomerListSimple(params).then((res) => {
+    const result = res.data.rows
+    cb(result)
+  })
 }
 
-// 选中
+// 选中客户
 const handleCompanySelect = (select: Record<string, any>) => {
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
@@ -138,12 +126,12 @@
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
+  dataForm.value.customerNo = item.customerNo
 }
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
   popTitle: '投诉/建议详情', // 打印配置页上方的标题
-  // extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>投诉/建议详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -294,7 +282,7 @@
             <el-col :span="6">
               <el-form-item label="客户编号">
                 <el-input
-                  v-model="companyInfo.customerNo"
+                  v-model="dataForm.customerNo"
                   placeholder=""
                   disabled
                   :class="{ 'detail-input': pageType === 'detail' }"
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 63aef59..0517076 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -17,21 +17,20 @@
   customerNo: '', // 客户编号
   startTime: '', // 投诉开始时间
   endTime: '', // 投诉结束时间
-  formId: 'jlglsygfsp',
   offset: 1,
   limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '120', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center' },
-  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
-  { text: '投诉人', value: 'advicePerson', align: 'center' },
-  { text: '联系方式', value: 'personPhone', align: 'center' },
-  { text: '投诉时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
+  { text: '联系方式', value: 'personPhone', align: 'center', width: '120' },
+  { text: '投诉时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
 const list = ref<IAdvice[]>([])
@@ -54,7 +53,7 @@
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getAdviceList(listQuery.value).then((response) => {
     // 模拟数据
-    response.data.rows = [{ id: '1597579843411234817', advicePerson: '张三', personPhone: '87447', createTime: '2023-01-02 08:25:35', adviceNo: '111111', content: '服务态度不好', businessScope: 'test1', evaluation: '1', evaluationName: '优质', customerName: '京东集团', customerNo: 'sygf202211290001', updateTime: '2023-01-10 09:56:57' }]
+    // response.data.rows = [{ id: '1597579843411234817', advicePerson: '张三', personPhone: '87447', createTime: '2023-01-02 08:25:35', adviceNo: '111111', content: '服务态度不好', businessScope: 'test1', evaluation: '1', evaluationName: '优质', customerName: '京东集团', customerNo: 'sygf202211290001', updateTime: '2023-01-10 09:56:57' }]
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false

diff --git a/src/api/customer/advice.ts b/src/api/customer/advice.ts
index 738dac3..c581a4e 100644
--- a/src/api/customer/advice.ts
+++ b/src/api/customer/advice.ts
@@ -3,12 +3,11 @@
  */
 import request from '../index'
 import type { IAdviceQuery } from '@/views/customer/advice/advice_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getAdviceList(data: IAdviceQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/advice/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 数据删除
 export function deleteAdvice(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/advice/delete',
     method: 'post',
     data,
   })
@@ -26,7 +25,7 @@
 // 查看详情
 export function getAdviceDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/advice/detail',
     method: 'post',
     data,
   })
@@ -35,7 +34,7 @@
 // 新增数据
 export function addAdvice(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/advice/add',
     method: 'post',
     data,
   })
@@ -43,7 +42,7 @@
 // 编辑数据
 export function updateAdvice(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/advice/update',
     method: 'post',
     data,
   })
@@ -52,7 +51,7 @@
 // 导出列表
 export function exportAdviceList(data: Omit<IAdviceQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/advice/export',
     method: 'post',
     responseType: 'blob',
     data,
diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index ebdebe6..724da6e 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -3,12 +3,20 @@
  */
 import request from '../index'
 import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getCustomerList(data: ICustomerQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表查询
+export function getCustomerListSimple(data: ICustomerQuery) {
+  return request({
+    url: '/customer/listPage',
     method: 'post',
     data,
   })
@@ -17,7 +25,7 @@
 // 数据删除
 export function deleteCustomer(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/delete',
     method: 'post',
     data,
   })
@@ -26,7 +34,7 @@
 // 查看详情
 export function getCustomerDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/detail',
     method: 'post',
     data,
   })
@@ -35,7 +43,7 @@
 // 新增数据
 export function addCustomer(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/add',
     method: 'post',
     data,
   })
@@ -43,7 +51,7 @@
 // 编辑数据
 export function updateCustomer(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/update',
     method: 'post',
     data,
   })
@@ -52,10 +60,44 @@
 // 导出列表
 export function exportCustomerList(data: Omit<ICustomerQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/export',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
+// 根据客户查样品id
+export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查合同记录
+export function getContractByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查检定记录
+export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 根据客户查检定记录
+export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 60aa04c..9cbd57f 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -172,7 +172,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.provinceName"
       placeholder=""
       class="address-select"
@@ -196,7 +196,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.cityName"
       placeholder=""
       class="address-select"
@@ -220,7 +220,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.areaName"
       placeholder=""
       class="address-select"
@@ -230,7 +230,7 @@
     <!-- 详细地址 -->
     <el-input
       v-model="addressObj.address"
-      placeholder="详细地址"
+      :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index fbe670d..465b2e7 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -10,7 +10,7 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSampleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -198,7 +198,7 @@
 
 // 获取样品详情
 const getInfo = () => {
-  // getSampleDetail({ id: infoId.value }).then((res) => {
+  // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
     orderId: '123',
     ABC: 'A',
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index a5411c1..629b33c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -9,6 +9,7 @@
 import type { IAdvice, SimpleCompany } from './advice_interface'
 import { addAdvice, getAdviceDetail, updateAdvice } from '@/api/customer/advice'
 import { getDictByCode } from '@/api/system/dict'
+import { getCustomerListSimple } from '@/api/customer/customer'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -93,42 +94,29 @@
 const getInfo = () => {
   loading.value = true
   getAdviceDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      id: '1597579843411234817',
-      adviceNo: 'ts202201022131', // 投诉编号
-      adviceClass: '0', // 投诉类型
-      adviceType: '1', // 投诉类别
-      advicePerson: '张三', // 投诉人-名称
-      personPhone: '87447', // 投诉人联系方式
-      customerName: '特别大公司', // 公司名称
-      adviceTime: '2022-12-25 23:58:00',
-      customerNo: '', //	客户编号
-      customerId: '', // 客户id
-      content: '没人接电话', // 投诉内容
-      handleStatus: '0', // 处置状态-0未处置，1已处置
-      handleMessage: '', // 处置意见
-    }
     dataForm.value = res.data
     loading.value = false
   })
 }
 
-const tempCompanyList = ref<SimpleCompany[]>([
-  { customerId: '111', customerNo: '12312456', customerName: '京东', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '112', customerNo: '12312451', customerName: '阿里', businessSizeName: '0~10万', companySizeName: '大企业', gradeName: '一般', evaluationName: '重点客户' },
-  { customerId: '113', customerNo: '12312452', customerName: '淘宝', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '114', customerNo: '12312453', customerName: '天猫', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '115', customerNo: '12312454', customerName: '203d', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '116', customerNo: '12312456', customerName: '万达', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-])
 // 查询公司列表
 const queryCompany = (queryString: string, cb: any) => {
-  // TODO: 远程查询符合要求的公司列表
-  const results = queryString ? tempCompanyList.value.filter((item) => { item.customerName.includes(queryString) }) : tempCompanyList.value
-  cb(results)
+  const params = {
+    businessSize: '', // 业务规模
+    customerName: queryString, // 公司名称
+    customerNo: '', // 客户编号
+    grade: '', // 履约评级
+    offset: 1,
+    limit: 20,
+  }
+  // 远程查询符合要求的公司列表
+  getCustomerListSimple(params).then((res) => {
+    const result = res.data.rows
+    cb(result)
+  })
 }
 
-// 选中
+// 选中客户
 const handleCompanySelect = (select: Record<string, any>) => {
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
@@ -138,12 +126,12 @@
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
+  dataForm.value.customerNo = item.customerNo
 }
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
   popTitle: '投诉/建议详情', // 打印配置页上方的标题
-  // extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>投诉/建议详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -294,7 +282,7 @@
             <el-col :span="6">
               <el-form-item label="客户编号">
                 <el-input
-                  v-model="companyInfo.customerNo"
+                  v-model="dataForm.customerNo"
                   placeholder=""
                   disabled
                   :class="{ 'detail-input': pageType === 'detail' }"
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 63aef59..0517076 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -17,21 +17,20 @@
   customerNo: '', // 客户编号
   startTime: '', // 投诉开始时间
   endTime: '', // 投诉结束时间
-  formId: 'jlglsygfsp',
   offset: 1,
   limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '120', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center' },
-  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
-  { text: '投诉人', value: 'advicePerson', align: 'center' },
-  { text: '联系方式', value: 'personPhone', align: 'center' },
-  { text: '投诉时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
+  { text: '联系方式', value: 'personPhone', align: 'center', width: '120' },
+  { text: '投诉时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
 const list = ref<IAdvice[]>([])
@@ -54,7 +53,7 @@
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getAdviceList(listQuery.value).then((response) => {
     // 模拟数据
-    response.data.rows = [{ id: '1597579843411234817', advicePerson: '张三', personPhone: '87447', createTime: '2023-01-02 08:25:35', adviceNo: '111111', content: '服务态度不好', businessScope: 'test1', evaluation: '1', evaluationName: '优质', customerName: '京东集团', customerNo: 'sygf202211290001', updateTime: '2023-01-10 09:56:57' }]
+    // response.data.rows = [{ id: '1597579843411234817', advicePerson: '张三', personPhone: '87447', createTime: '2023-01-02 08:25:35', adviceNo: '111111', content: '服务态度不好', businessScope: 'test1', evaluation: '1', evaluationName: '优质', customerName: '京东集团', customerNo: 'sygf202211290001', updateTime: '2023-01-10 09:56:57' }]
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 23c294a..5e9b72c 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -1,17 +1,16 @@
-<script lang="ts" setup name="ListSourceAdd">
+<script lang="ts" setup name="CustomerEdit">
 /**
  * 添加/编辑/详情客户
  */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { addCustomer, getCustomerDetail, updateCustomer } from '@/api/customer/customer'
+import { addCustomer, getCertificationByCustomer, getContractByCustomer, getCustomerDetail, getOrderByCustomer, getSampleByCustomer, updateCustomer } from '@/api/customer/customer'
 import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -51,18 +50,18 @@
   companySize: '', // 公司规模
   businessSize: '', // 业务规模
   evaluation: '', // 整体评价
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
+  fullAddress: '',
+  addressArea: '',
+  addressCity: '',
+  addressCountry: '',
+  addressProvince: '',
+  addressAreaName: '',
+  addressCityName: '',
+  addressCountryName: '',
+  addressProvinceName: '',
   director: '',
   fax: '',
-  invoiceAddress: '',
+  invoiceFullAddress: '',
   invoiceArea: '',
   invoiceCity: '',
   invoiceCountry: '',
@@ -71,7 +70,7 @@
   invoiceCityName: '',
   invoiceCountryName: '',
   invoiceProvinceName: '',
-  mailbox: '',
+  email: '',
   minioFileName: '',
   mobile: '',
   phone: '',
@@ -79,11 +78,11 @@
   remark: '',
   taxNumber: '',
   website: '',
-  customerPersonList: [],
+  customerUserList: [],
 })
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
-const CustomerPersonList: Ref<CustomerPerson[]> = ref([]) // 人员列表
+const fullAddress = ref<string[]>([]) // 公司地址
+const invoiceFullAddress = ref<string[]>([]) // 开票地址
+const customerPersonList: Ref<CustomerPerson[]> = ref([]) // 人员列表
 const columns = ref([
   { text: '姓名', value: 'name', required: true },
   { text: '工作部门', value: 'department', required: false },
@@ -99,36 +98,44 @@
   measureRecords: [] as SimpleMeasureRecord[],
   certificationRecords: [] as SimpleCertification[],
 })
-// 获取人员列表
-const fetchPerson = function (query = null) {
-  dataList.value.personList = dataForm.value.customerPersonList
-  dataList.value.personList = [{ name: '张三', department: '', job: '总经理', phone: '68387447' }, { name: '李四', department: '营销', job: '销售', phone: '68387447' }]
-}
 // 获取样品列表
-const fetchSampleList = function (query = null) {
-  dataList.value.sampleRecords = [{ sampleCode: 'abc123', sampleName: '血压计', sampleModel: 'xxxx', manufacturingNo: '111', mesureTime: '2022-12-25 00:00:00', mesurePeriod: '6个月' }]
+const fetchSampleList = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getSampleByCustomer(query).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+  })
 }
 // 获取合同记录
-const fetchContractRecords = function (query = null) {
-  dataList.value.contractRecords = []
+const fetchContractRecords = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getContractByCustomer(query).then((res) => {
+    dataList.value.contractRecords = res.data.rows
+  })
 }
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getOrderByCustomer(query).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getCertificationByCustomer(query).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 interface Menu {
   name: string
   columns: TableColumn[]
   pagination: boolean
+  query?: { id: string; limit: number; offset: number }
   list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function
+  searchFunc: Function | null
 }
 // 菜单
-const menu: Menu[] = [
+const menu = ref<Menu[]>([
   {
     name: '客户人员',
     columns: [
@@ -139,10 +146,15 @@
     ],
     pagination: false,
     list: 'personList',
-    searchFunc: fetchPerson,
+    searchFunc: null,
   },
   {
     name: '样品记录',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     columns: [
       { text: '样品编号', value: 'sampleCode' },
       { text: '样品名称', value: 'sampleName' },
@@ -165,6 +177,11 @@
       { text: '合同时间', value: 'contractTime' },
       { text: '负责人', value: 'aCompanyDutyman' },
     ],
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     list: 'contractRecords',
     pagination: true,
     searchFunc: fetchContractRecords,
@@ -179,12 +196,22 @@
       { text: '送检人', value: 'deliverer' },
       { text: '送检日期', value: 'deliverTime' },
     ],
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     list: 'measureRecords',
     pagination: true,
     searchFunc: fetchMeasureRecords,
   },
   {
     name: '检定证书',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     columns: [
       { text: '证书编号', value: 'certificationCode' },
       { text: '证书名称', value: 'certificationName' },
@@ -196,16 +223,17 @@
     pagination: true,
     searchFunc: fetchCertifications,
   },
-]
+])
 const currentMenu = ref('客户人员')
 const currentMenuObj = computed(() => {
-  return menu.find(item => item.name === currentMenu.value)
+  return menu.value.find(item => item.name === currentMenu.value)
 })
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
   id: '',
-  personNo: '',
+  customerId: '',
+  userNo: '',
   name: '',
   department: '',
   job: '',
@@ -250,19 +278,37 @@
 getDict()
 
 const getInfo = () => {
+  loading.value = true
   getCustomerDetail({ id: infoId.value }).then((res) => {
-    res.data = { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: '优质', companySize: '1', companySizeName: '优质', businessSize: '1', businessSizeName: '小微企业', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110107', companyCity: '110100', companyCountry: 'CN', companyProvince: '110000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110107', invoiceCity: '110100', invoiceCountry: 'CN', invoiceProvince: '110000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }
+    loading.value = false
+    // res.data = { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: '优质', companySize: '1', companySizeName: '优质', businessSize: '1', businessSizeName: '小微企业', evaluation: '1', evaluationName: '优质', fullAddress: '五棵松', addressAreaName: '海淀区', addressCityName: '北京市', addressCountryName: '中国', addressProvinceName: '北京', addressArea: '110107', addressCity: '110100', addressCountry: 'CN', addressProvince: '110000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceFullAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110107', invoiceCity: '110100', invoiceCountry: 'CN', invoiceProvince: '110000', email: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }
     dataForm.value = res.data
     if (pageType.value == 'detail') {
-      companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
-      invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
-      for (const item of menu) {
-        item.searchFunc()
+      fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+      // 人员列表
+      dataList.value.personList = res.data.customerUserList
+      // 其他查询菜单
+      for (const item of menu.value) {
+        if (item.searchFunc) { item.searchFunc(item.query) }
       }
     }
     else {
-      companyAddress.value = [dataForm.value.companyCountry, dataForm.value.companyProvince, dataForm.value.companyCity, dataForm.value.companyArea, dataForm.value.companyAddress]
-      invoiceAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceAddress]
+      fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+      // 人员列表
+      customerPersonList.value = res.data.customerUserList.map((item: CustomerPerson) => {
+        return {
+          id: '',
+          customerId: '',
+          userNo: item.userNo,
+          name: item.name,
+          department: item.department,
+          job: item.job,
+          phone: item.phone,
+          editable: true,
+        }
+      })
     }
   })
 }
@@ -273,24 +319,24 @@
 }
 
 // 公司地址变化后给对象赋值
-function companyAddressChange(addressObj: IAddress) {
-  dataForm.value.companyCountry = addressObj.country
-  dataForm.value.companyProvince = addressObj.province
-  dataForm.value.companyCity = addressObj.city
-  dataForm.value.companyArea = addressObj.area
-  dataForm.value.companyAddress = addressObj.address
-  dataForm.value.companyCountryName = addressObj.countryName
-  dataForm.value.companyProvinceName = addressObj.provinceName
-  dataForm.value.companyCityName = addressObj.cityName
-  dataForm.value.companyAreaName = addressObj.areaName
+function fullAddressChange(addressObj: IAddress) {
+  dataForm.value.addressCountry = addressObj.country
+  dataForm.value.addressProvince = addressObj.province
+  dataForm.value.addressCity = addressObj.city
+  dataForm.value.addressArea = addressObj.area
+  dataForm.value.fullAddress = addressObj.address
+  dataForm.value.addressCountryName = addressObj.countryName
+  dataForm.value.addressProvinceName = addressObj.provinceName
+  dataForm.value.addressCityName = addressObj.cityName
+  dataForm.value.addressAreaName = addressObj.areaName
 }
-
-function invoiceAddressChange(addressObj: IAddress) {
+// 开票地址发生变化
+function invoiceFullAddressChange(addressObj: IAddress) {
   dataForm.value.invoiceCountry = addressObj.country
   dataForm.value.invoiceProvince = addressObj.province
   dataForm.value.invoiceCity = addressObj.city
   dataForm.value.invoiceArea = addressObj.area
-  dataForm.value.invoiceAddress = addressObj.address
+  dataForm.value.invoiceFullAddress = addressObj.address
   dataForm.value.invoiceCountryName = addressObj.countryName
   dataForm.value.invoiceProvinceName = addressObj.provinceName
   dataForm.value.invoiceCityName = addressObj.cityName
@@ -301,13 +347,13 @@
   // 检查上一行必填项
   if (checkPersonList()) {
     setAllRowReadable()
-    CustomerPersonList.value.push({ ...addPersonObj })
+    customerPersonList.value.push({ ...addPersonObj })
   }
 }
 // 检查人员列表
 function checkPersonList() {
-  for (let index = 0; index < CustomerPersonList.value.length; index++) {
-    const item = CustomerPersonList.value[index]
+  for (let index = 0; index < customerPersonList.value.length; index++) {
+    const item = customerPersonList.value[index]
     for (const prop of columns.value) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
@@ -328,7 +374,7 @@
 
 // 删除行
 const deleteList = () => {
-  CustomerPersonList.value = CustomerPersonList.value.filter((item: CustomerPerson) => {
+  customerPersonList.value = customerPersonList.value.filter((item: CustomerPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -347,48 +393,49 @@
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (dataForm.value.id) {
-          updateCustomer(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-        else {
-          addCustomer(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
+      if (checkPersonList()) { // 检查人员列表
+        setAllRowReadable()
+        // 校验人员列表
+        dataForm.value.customerUserList = customerPersonList.value.map((item) => {
+          const value = { ...item }
+          delete value.editable
+          return value
+        })
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (dataForm.value.id) {
+            updateCustomer(dataForm.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('已保存')
+                $router.go(-1)
+              }
+            })
+          }
+          else {
+            addCustomer(dataForm.value).then((res) => {
+              if (res.code === 200) {
+              // dataForm.value.id = res.data.id
+              // dataForm.value.customerNo = res.data.customerNo
+                ElMessage.success('已保存')
+                $router.go(-1)
+              }
+            })
+          }
+        })
+      }
     }
   })
 }
 
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
@@ -415,7 +462,7 @@
 }
 // 将所有人员信息列表置为不可编辑状态
 function setAllRowReadable() {
-  for (const item of CustomerPersonList.value) {
+  for (const item of customerPersonList.value) {
     item.editable = false
   }
 }
@@ -427,7 +474,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`客户-${textMap[pageType]}`">
+    <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -489,28 +536,28 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="公司规模" prop="companySize">
-                <el-select v-model="dataForm.companySize" :placeholder="pageType === 'detail' ? '' : '请选择公司规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.companySize" :placeholder="pageType === 'detail' ? ' ' : '请选择公司规模'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in companySizeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="业务规模" prop="businessSize">
-                <el-select v-model="dataForm.businessSize" :placeholder="pageType === 'detail' ? '' : '请选择业务规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.businessSize" :placeholder="pageType === 'detail' ? ' ' : '请选择业务规模'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="履约评级" prop="grade">
-                <el-select v-model="dataForm.grade" :placeholder="pageType === 'detail' ? '' : '请选择履约评级'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.grade" :placeholder="pageType === 'detail' ? ' ' : '请选择履约评级'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="整体评价" prop="evaluation">
-                <el-select v-model="dataForm.evaluation" :placeholder="pageType === 'detail' ? '' : '请选择整体评价'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.evaluation" :placeholder="pageType === 'detail' ? ' ' : '请选择整体评价'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in evaluationList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
@@ -608,7 +655,7 @@
             <el-col :span="6">
               <el-form-item label="邮箱:">
                 <el-input
-                  v-model="dataForm.mailbox"
+                  v-model="dataForm.email"
                   :placeholder="pageType === 'detail' ? '' : '请输入邮箱'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
@@ -628,12 +675,12 @@
           </el-row>
           <el-row :gutter="5">
             <el-form-item label="公司地址:">
-              <address-select :data="companyAddress" :detail="pageType === 'detail'" @on-change="companyAddressChange" />
+              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
             </el-form-item>
           </el-row>
           <el-row :gutter="5">
             <el-form-item label="开票地址:">
-              <address-select :data="invoiceAddress" :detail="pageType === 'detail'" @on-change="invoiceAddressChange" />
+              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
             </el-form-item>
           </el-row>
           <el-row :gutter="24">
@@ -685,7 +732,8 @@
         </el-button>
       </template>
       <el-table
-        :data="CustomerPersonList"
+        v-loading="loading"
+        :data="customerPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"

diff --git a/src/api/customer/advice.ts b/src/api/customer/advice.ts
index 738dac3..c581a4e 100644
--- a/src/api/customer/advice.ts
+++ b/src/api/customer/advice.ts
@@ -3,12 +3,11 @@
  */
 import request from '../index'
 import type { IAdviceQuery } from '@/views/customer/advice/advice_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getAdviceList(data: IAdviceQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/advice/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 数据删除
 export function deleteAdvice(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/advice/delete',
     method: 'post',
     data,
   })
@@ -26,7 +25,7 @@
 // 查看详情
 export function getAdviceDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/advice/detail',
     method: 'post',
     data,
   })
@@ -35,7 +34,7 @@
 // 新增数据
 export function addAdvice(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/advice/add',
     method: 'post',
     data,
   })
@@ -43,7 +42,7 @@
 // 编辑数据
 export function updateAdvice(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/advice/update',
     method: 'post',
     data,
   })
@@ -52,7 +51,7 @@
 // 导出列表
 export function exportAdviceList(data: Omit<IAdviceQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/advice/export',
     method: 'post',
     responseType: 'blob',
     data,
diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index ebdebe6..724da6e 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -3,12 +3,20 @@
  */
 import request from '../index'
 import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getCustomerList(data: ICustomerQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表查询
+export function getCustomerListSimple(data: ICustomerQuery) {
+  return request({
+    url: '/customer/listPage',
     method: 'post',
     data,
   })
@@ -17,7 +25,7 @@
 // 数据删除
 export function deleteCustomer(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/delete',
     method: 'post',
     data,
   })
@@ -26,7 +34,7 @@
 // 查看详情
 export function getCustomerDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/detail',
     method: 'post',
     data,
   })
@@ -35,7 +43,7 @@
 // 新增数据
 export function addCustomer(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/add',
     method: 'post',
     data,
   })
@@ -43,7 +51,7 @@
 // 编辑数据
 export function updateCustomer(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/update',
     method: 'post',
     data,
   })
@@ -52,10 +60,44 @@
 // 导出列表
 export function exportCustomerList(data: Omit<ICustomerQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/export',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
+// 根据客户查样品id
+export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查合同记录
+export function getContractByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查检定记录
+export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 根据客户查检定记录
+export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 60aa04c..9cbd57f 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -172,7 +172,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.provinceName"
       placeholder=""
       class="address-select"
@@ -196,7 +196,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.cityName"
       placeholder=""
       class="address-select"
@@ -220,7 +220,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.areaName"
       placeholder=""
       class="address-select"
@@ -230,7 +230,7 @@
     <!-- 详细地址 -->
     <el-input
       v-model="addressObj.address"
-      placeholder="详细地址"
+      :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index fbe670d..465b2e7 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -10,7 +10,7 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSampleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -198,7 +198,7 @@
 
 // 获取样品详情
 const getInfo = () => {
-  // getSampleDetail({ id: infoId.value }).then((res) => {
+  // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
     orderId: '123',
     ABC: 'A',
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index a5411c1..629b33c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -9,6 +9,7 @@
 import type { IAdvice, SimpleCompany } from './advice_interface'
 import { addAdvice, getAdviceDetail, updateAdvice } from '@/api/customer/advice'
 import { getDictByCode } from '@/api/system/dict'
+import { getCustomerListSimple } from '@/api/customer/customer'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -93,42 +94,29 @@
 const getInfo = () => {
   loading.value = true
   getAdviceDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      id: '1597579843411234817',
-      adviceNo: 'ts202201022131', // 投诉编号
-      adviceClass: '0', // 投诉类型
-      adviceType: '1', // 投诉类别
-      advicePerson: '张三', // 投诉人-名称
-      personPhone: '87447', // 投诉人联系方式
-      customerName: '特别大公司', // 公司名称
-      adviceTime: '2022-12-25 23:58:00',
-      customerNo: '', //	客户编号
-      customerId: '', // 客户id
-      content: '没人接电话', // 投诉内容
-      handleStatus: '0', // 处置状态-0未处置，1已处置
-      handleMessage: '', // 处置意见
-    }
     dataForm.value = res.data
     loading.value = false
   })
 }
 
-const tempCompanyList = ref<SimpleCompany[]>([
-  { customerId: '111', customerNo: '12312456', customerName: '京东', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '112', customerNo: '12312451', customerName: '阿里', businessSizeName: '0~10万', companySizeName: '大企业', gradeName: '一般', evaluationName: '重点客户' },
-  { customerId: '113', customerNo: '12312452', customerName: '淘宝', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '114', customerNo: '12312453', customerName: '天猫', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '115', customerNo: '12312454', customerName: '203d', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '116', customerNo: '12312456', customerName: '万达', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-])
 // 查询公司列表
 const queryCompany = (queryString: string, cb: any) => {
-  // TODO: 远程查询符合要求的公司列表
-  const results = queryString ? tempCompanyList.value.filter((item) => { item.customerName.includes(queryString) }) : tempCompanyList.value
-  cb(results)
+  const params = {
+    businessSize: '', // 业务规模
+    customerName: queryString, // 公司名称
+    customerNo: '', // 客户编号
+    grade: '', // 履约评级
+    offset: 1,
+    limit: 20,
+  }
+  // 远程查询符合要求的公司列表
+  getCustomerListSimple(params).then((res) => {
+    const result = res.data.rows
+    cb(result)
+  })
 }
 
-// 选中
+// 选中客户
 const handleCompanySelect = (select: Record<string, any>) => {
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
@@ -138,12 +126,12 @@
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
+  dataForm.value.customerNo = item.customerNo
 }
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
   popTitle: '投诉/建议详情', // 打印配置页上方的标题
-  // extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>投诉/建议详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -294,7 +282,7 @@
             <el-col :span="6">
               <el-form-item label="客户编号">
                 <el-input
-                  v-model="companyInfo.customerNo"
+                  v-model="dataForm.customerNo"
                   placeholder=""
                   disabled
                   :class="{ 'detail-input': pageType === 'detail' }"
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 63aef59..0517076 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -17,21 +17,20 @@
   customerNo: '', // 客户编号
   startTime: '', // 投诉开始时间
   endTime: '', // 投诉结束时间
-  formId: 'jlglsygfsp',
   offset: 1,
   limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '120', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center' },
-  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
-  { text: '投诉人', value: 'advicePerson', align: 'center' },
-  { text: '联系方式', value: 'personPhone', align: 'center' },
-  { text: '投诉时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
+  { text: '联系方式', value: 'personPhone', align: 'center', width: '120' },
+  { text: '投诉时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
 const list = ref<IAdvice[]>([])
@@ -54,7 +53,7 @@
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getAdviceList(listQuery.value).then((response) => {
     // 模拟数据
-    response.data.rows = [{ id: '1597579843411234817', advicePerson: '张三', personPhone: '87447', createTime: '2023-01-02 08:25:35', adviceNo: '111111', content: '服务态度不好', businessScope: 'test1', evaluation: '1', evaluationName: '优质', customerName: '京东集团', customerNo: 'sygf202211290001', updateTime: '2023-01-10 09:56:57' }]
+    // response.data.rows = [{ id: '1597579843411234817', advicePerson: '张三', personPhone: '87447', createTime: '2023-01-02 08:25:35', adviceNo: '111111', content: '服务态度不好', businessScope: 'test1', evaluation: '1', evaluationName: '优质', customerName: '京东集团', customerNo: 'sygf202211290001', updateTime: '2023-01-10 09:56:57' }]
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 23c294a..5e9b72c 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -1,17 +1,16 @@
-<script lang="ts" setup name="ListSourceAdd">
+<script lang="ts" setup name="CustomerEdit">
 /**
  * 添加/编辑/详情客户
  */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { addCustomer, getCustomerDetail, updateCustomer } from '@/api/customer/customer'
+import { addCustomer, getCertificationByCustomer, getContractByCustomer, getCustomerDetail, getOrderByCustomer, getSampleByCustomer, updateCustomer } from '@/api/customer/customer'
 import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -51,18 +50,18 @@
   companySize: '', // 公司规模
   businessSize: '', // 业务规模
   evaluation: '', // 整体评价
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
+  fullAddress: '',
+  addressArea: '',
+  addressCity: '',
+  addressCountry: '',
+  addressProvince: '',
+  addressAreaName: '',
+  addressCityName: '',
+  addressCountryName: '',
+  addressProvinceName: '',
   director: '',
   fax: '',
-  invoiceAddress: '',
+  invoiceFullAddress: '',
   invoiceArea: '',
   invoiceCity: '',
   invoiceCountry: '',
@@ -71,7 +70,7 @@
   invoiceCityName: '',
   invoiceCountryName: '',
   invoiceProvinceName: '',
-  mailbox: '',
+  email: '',
   minioFileName: '',
   mobile: '',
   phone: '',
@@ -79,11 +78,11 @@
   remark: '',
   taxNumber: '',
   website: '',
-  customerPersonList: [],
+  customerUserList: [],
 })
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
-const CustomerPersonList: Ref<CustomerPerson[]> = ref([]) // 人员列表
+const fullAddress = ref<string[]>([]) // 公司地址
+const invoiceFullAddress = ref<string[]>([]) // 开票地址
+const customerPersonList: Ref<CustomerPerson[]> = ref([]) // 人员列表
 const columns = ref([
   { text: '姓名', value: 'name', required: true },
   { text: '工作部门', value: 'department', required: false },
@@ -99,36 +98,44 @@
   measureRecords: [] as SimpleMeasureRecord[],
   certificationRecords: [] as SimpleCertification[],
 })
-// 获取人员列表
-const fetchPerson = function (query = null) {
-  dataList.value.personList = dataForm.value.customerPersonList
-  dataList.value.personList = [{ name: '张三', department: '', job: '总经理', phone: '68387447' }, { name: '李四', department: '营销', job: '销售', phone: '68387447' }]
-}
 // 获取样品列表
-const fetchSampleList = function (query = null) {
-  dataList.value.sampleRecords = [{ sampleCode: 'abc123', sampleName: '血压计', sampleModel: 'xxxx', manufacturingNo: '111', mesureTime: '2022-12-25 00:00:00', mesurePeriod: '6个月' }]
+const fetchSampleList = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getSampleByCustomer(query).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+  })
 }
 // 获取合同记录
-const fetchContractRecords = function (query = null) {
-  dataList.value.contractRecords = []
+const fetchContractRecords = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getContractByCustomer(query).then((res) => {
+    dataList.value.contractRecords = res.data.rows
+  })
 }
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getOrderByCustomer(query).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getCertificationByCustomer(query).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 interface Menu {
   name: string
   columns: TableColumn[]
   pagination: boolean
+  query?: { id: string; limit: number; offset: number }
   list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function
+  searchFunc: Function | null
 }
 // 菜单
-const menu: Menu[] = [
+const menu = ref<Menu[]>([
   {
     name: '客户人员',
     columns: [
@@ -139,10 +146,15 @@
     ],
     pagination: false,
     list: 'personList',
-    searchFunc: fetchPerson,
+    searchFunc: null,
   },
   {
     name: '样品记录',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     columns: [
       { text: '样品编号', value: 'sampleCode' },
       { text: '样品名称', value: 'sampleName' },
@@ -165,6 +177,11 @@
       { text: '合同时间', value: 'contractTime' },
       { text: '负责人', value: 'aCompanyDutyman' },
     ],
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     list: 'contractRecords',
     pagination: true,
     searchFunc: fetchContractRecords,
@@ -179,12 +196,22 @@
       { text: '送检人', value: 'deliverer' },
       { text: '送检日期', value: 'deliverTime' },
     ],
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     list: 'measureRecords',
     pagination: true,
     searchFunc: fetchMeasureRecords,
   },
   {
     name: '检定证书',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     columns: [
       { text: '证书编号', value: 'certificationCode' },
       { text: '证书名称', value: 'certificationName' },
@@ -196,16 +223,17 @@
     pagination: true,
     searchFunc: fetchCertifications,
   },
-]
+])
 const currentMenu = ref('客户人员')
 const currentMenuObj = computed(() => {
-  return menu.find(item => item.name === currentMenu.value)
+  return menu.value.find(item => item.name === currentMenu.value)
 })
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
   id: '',
-  personNo: '',
+  customerId: '',
+  userNo: '',
   name: '',
   department: '',
   job: '',
@@ -250,19 +278,37 @@
 getDict()
 
 const getInfo = () => {
+  loading.value = true
   getCustomerDetail({ id: infoId.value }).then((res) => {
-    res.data = { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: '优质', companySize: '1', companySizeName: '优质', businessSize: '1', businessSizeName: '小微企业', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110107', companyCity: '110100', companyCountry: 'CN', companyProvince: '110000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110107', invoiceCity: '110100', invoiceCountry: 'CN', invoiceProvince: '110000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }
+    loading.value = false
+    // res.data = { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: '优质', companySize: '1', companySizeName: '优质', businessSize: '1', businessSizeName: '小微企业', evaluation: '1', evaluationName: '优质', fullAddress: '五棵松', addressAreaName: '海淀区', addressCityName: '北京市', addressCountryName: '中国', addressProvinceName: '北京', addressArea: '110107', addressCity: '110100', addressCountry: 'CN', addressProvince: '110000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceFullAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110107', invoiceCity: '110100', invoiceCountry: 'CN', invoiceProvince: '110000', email: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }
     dataForm.value = res.data
     if (pageType.value == 'detail') {
-      companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
-      invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
-      for (const item of menu) {
-        item.searchFunc()
+      fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+      // 人员列表
+      dataList.value.personList = res.data.customerUserList
+      // 其他查询菜单
+      for (const item of menu.value) {
+        if (item.searchFunc) { item.searchFunc(item.query) }
       }
     }
     else {
-      companyAddress.value = [dataForm.value.companyCountry, dataForm.value.companyProvince, dataForm.value.companyCity, dataForm.value.companyArea, dataForm.value.companyAddress]
-      invoiceAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceAddress]
+      fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+      // 人员列表
+      customerPersonList.value = res.data.customerUserList.map((item: CustomerPerson) => {
+        return {
+          id: '',
+          customerId: '',
+          userNo: item.userNo,
+          name: item.name,
+          department: item.department,
+          job: item.job,
+          phone: item.phone,
+          editable: true,
+        }
+      })
     }
   })
 }
@@ -273,24 +319,24 @@
 }
 
 // 公司地址变化后给对象赋值
-function companyAddressChange(addressObj: IAddress) {
-  dataForm.value.companyCountry = addressObj.country
-  dataForm.value.companyProvince = addressObj.province
-  dataForm.value.companyCity = addressObj.city
-  dataForm.value.companyArea = addressObj.area
-  dataForm.value.companyAddress = addressObj.address
-  dataForm.value.companyCountryName = addressObj.countryName
-  dataForm.value.companyProvinceName = addressObj.provinceName
-  dataForm.value.companyCityName = addressObj.cityName
-  dataForm.value.companyAreaName = addressObj.areaName
+function fullAddressChange(addressObj: IAddress) {
+  dataForm.value.addressCountry = addressObj.country
+  dataForm.value.addressProvince = addressObj.province
+  dataForm.value.addressCity = addressObj.city
+  dataForm.value.addressArea = addressObj.area
+  dataForm.value.fullAddress = addressObj.address
+  dataForm.value.addressCountryName = addressObj.countryName
+  dataForm.value.addressProvinceName = addressObj.provinceName
+  dataForm.value.addressCityName = addressObj.cityName
+  dataForm.value.addressAreaName = addressObj.areaName
 }
-
-function invoiceAddressChange(addressObj: IAddress) {
+// 开票地址发生变化
+function invoiceFullAddressChange(addressObj: IAddress) {
   dataForm.value.invoiceCountry = addressObj.country
   dataForm.value.invoiceProvince = addressObj.province
   dataForm.value.invoiceCity = addressObj.city
   dataForm.value.invoiceArea = addressObj.area
-  dataForm.value.invoiceAddress = addressObj.address
+  dataForm.value.invoiceFullAddress = addressObj.address
   dataForm.value.invoiceCountryName = addressObj.countryName
   dataForm.value.invoiceProvinceName = addressObj.provinceName
   dataForm.value.invoiceCityName = addressObj.cityName
@@ -301,13 +347,13 @@
   // 检查上一行必填项
   if (checkPersonList()) {
     setAllRowReadable()
-    CustomerPersonList.value.push({ ...addPersonObj })
+    customerPersonList.value.push({ ...addPersonObj })
   }
 }
 // 检查人员列表
 function checkPersonList() {
-  for (let index = 0; index < CustomerPersonList.value.length; index++) {
-    const item = CustomerPersonList.value[index]
+  for (let index = 0; index < customerPersonList.value.length; index++) {
+    const item = customerPersonList.value[index]
     for (const prop of columns.value) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
@@ -328,7 +374,7 @@
 
 // 删除行
 const deleteList = () => {
-  CustomerPersonList.value = CustomerPersonList.value.filter((item: CustomerPerson) => {
+  customerPersonList.value = customerPersonList.value.filter((item: CustomerPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -347,48 +393,49 @@
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (dataForm.value.id) {
-          updateCustomer(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-        else {
-          addCustomer(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
+      if (checkPersonList()) { // 检查人员列表
+        setAllRowReadable()
+        // 校验人员列表
+        dataForm.value.customerUserList = customerPersonList.value.map((item) => {
+          const value = { ...item }
+          delete value.editable
+          return value
+        })
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (dataForm.value.id) {
+            updateCustomer(dataForm.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('已保存')
+                $router.go(-1)
+              }
+            })
+          }
+          else {
+            addCustomer(dataForm.value).then((res) => {
+              if (res.code === 200) {
+              // dataForm.value.id = res.data.id
+              // dataForm.value.customerNo = res.data.customerNo
+                ElMessage.success('已保存')
+                $router.go(-1)
+              }
+            })
+          }
+        })
+      }
     }
   })
 }
 
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
@@ -415,7 +462,7 @@
 }
 // 将所有人员信息列表置为不可编辑状态
 function setAllRowReadable() {
-  for (const item of CustomerPersonList.value) {
+  for (const item of customerPersonList.value) {
     item.editable = false
   }
 }
@@ -427,7 +474,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`客户-${textMap[pageType]}`">
+    <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -489,28 +536,28 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="公司规模" prop="companySize">
-                <el-select v-model="dataForm.companySize" :placeholder="pageType === 'detail' ? '' : '请选择公司规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.companySize" :placeholder="pageType === 'detail' ? ' ' : '请选择公司规模'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in companySizeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="业务规模" prop="businessSize">
-                <el-select v-model="dataForm.businessSize" :placeholder="pageType === 'detail' ? '' : '请选择业务规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.businessSize" :placeholder="pageType === 'detail' ? ' ' : '请选择业务规模'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="履约评级" prop="grade">
-                <el-select v-model="dataForm.grade" :placeholder="pageType === 'detail' ? '' : '请选择履约评级'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.grade" :placeholder="pageType === 'detail' ? ' ' : '请选择履约评级'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="整体评价" prop="evaluation">
-                <el-select v-model="dataForm.evaluation" :placeholder="pageType === 'detail' ? '' : '请选择整体评价'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.evaluation" :placeholder="pageType === 'detail' ? ' ' : '请选择整体评价'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in evaluationList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
@@ -608,7 +655,7 @@
             <el-col :span="6">
               <el-form-item label="邮箱:">
                 <el-input
-                  v-model="dataForm.mailbox"
+                  v-model="dataForm.email"
                   :placeholder="pageType === 'detail' ? '' : '请输入邮箱'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
@@ -628,12 +675,12 @@
           </el-row>
           <el-row :gutter="5">
             <el-form-item label="公司地址:">
-              <address-select :data="companyAddress" :detail="pageType === 'detail'" @on-change="companyAddressChange" />
+              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
             </el-form-item>
           </el-row>
           <el-row :gutter="5">
             <el-form-item label="开票地址:">
-              <address-select :data="invoiceAddress" :detail="pageType === 'detail'" @on-change="invoiceAddressChange" />
+              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
             </el-form-item>
           </el-row>
           <el-row :gutter="24">
@@ -685,7 +732,8 @@
         </el-button>
       </template>
       <el-table
-        :data="CustomerPersonList"
+        v-loading="loading"
+        :data="customerPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2d67d55..6150a05 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -12,11 +12,10 @@
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
-  formId: 'jlglsygfsp',
   offset: 1,
   limit: 20,
 })
@@ -51,12 +50,12 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center' },
-  { text: '公司规模', value: 'companySizeName', align: 'center' },
-  { text: '业务规模', value: 'businessSizeName', align: 'center' },
-  { text: '履约评级', value: 'gradeName', align: 'center' },
-  { text: '整体评价', value: 'evaluationName', align: 'center' },
-  { text: '公司地址', value: 'briefName', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
+  { text: '公司规模', value: 'companySizeName', width: '110', 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', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
@@ -79,17 +78,20 @@
   }
   getCustomerList(listQuery.value).then((response) => {
     // 模拟数据
-    response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
+    // response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
     list.value = response.data.rows.map((item: ICustomer) => {
-      if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
       }
-      else {
-        item.briefName = item.companyProvinceName || item.companyCityName
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
       }
       return item
     })
-    total.value = parseInt(response.data.total)
+    total.value = response.data.total
     loadingTable.value = false
   })
 }
@@ -132,7 +134,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -191,7 +193,7 @@
   })
   if (list.value.length > 0) {
     const params = {
-      bussinessSize: listQuery.value.bussinessSize, // 业务规模
+      businessSize: listQuery.value.businessSize, // 业务规模
       customerName: listQuery.value.customerName, // 公司名称
       customerNo: listQuery.value.customerNo, // 客户编号
       grade: listQuery.value.grade, // 履约评级
@@ -253,12 +255,12 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+        <el-select v-model="listQuery.businessSize" placeholder="业务规模" clearable>
           <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.grade" placeholder="履约评级">
+        <el-select v-model="listQuery.grade" placeholder="履约评级" clearable>
           <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -274,7 +276,7 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="120">

diff --git a/src/api/customer/advice.ts b/src/api/customer/advice.ts
index 738dac3..c581a4e 100644
--- a/src/api/customer/advice.ts
+++ b/src/api/customer/advice.ts
@@ -3,12 +3,11 @@
  */
 import request from '../index'
 import type { IAdviceQuery } from '@/views/customer/advice/advice_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getAdviceList(data: IAdviceQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/advice/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 数据删除
 export function deleteAdvice(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/advice/delete',
     method: 'post',
     data,
   })
@@ -26,7 +25,7 @@
 // 查看详情
 export function getAdviceDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/advice/detail',
     method: 'post',
     data,
   })
@@ -35,7 +34,7 @@
 // 新增数据
 export function addAdvice(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/advice/add',
     method: 'post',
     data,
   })
@@ -43,7 +42,7 @@
 // 编辑数据
 export function updateAdvice(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/advice/update',
     method: 'post',
     data,
   })
@@ -52,7 +51,7 @@
 // 导出列表
 export function exportAdviceList(data: Omit<IAdviceQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/advice/export',
     method: 'post',
     responseType: 'blob',
     data,
diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index ebdebe6..724da6e 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -3,12 +3,20 @@
  */
 import request from '../index'
 import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getCustomerList(data: ICustomerQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表查询
+export function getCustomerListSimple(data: ICustomerQuery) {
+  return request({
+    url: '/customer/listPage',
     method: 'post',
     data,
   })
@@ -17,7 +25,7 @@
 // 数据删除
 export function deleteCustomer(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/delete',
     method: 'post',
     data,
   })
@@ -26,7 +34,7 @@
 // 查看详情
 export function getCustomerDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/detail',
     method: 'post',
     data,
   })
@@ -35,7 +43,7 @@
 // 新增数据
 export function addCustomer(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/add',
     method: 'post',
     data,
   })
@@ -43,7 +51,7 @@
 // 编辑数据
 export function updateCustomer(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/update',
     method: 'post',
     data,
   })
@@ -52,10 +60,44 @@
 // 导出列表
 export function exportCustomerList(data: Omit<ICustomerQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/export',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
+// 根据客户查样品id
+export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查合同记录
+export function getContractByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查检定记录
+export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 根据客户查检定记录
+export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 60aa04c..9cbd57f 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -172,7 +172,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.provinceName"
       placeholder=""
       class="address-select"
@@ -196,7 +196,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.cityName"
       placeholder=""
       class="address-select"
@@ -220,7 +220,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.areaName"
       placeholder=""
       class="address-select"
@@ -230,7 +230,7 @@
     <!-- 详细地址 -->
     <el-input
       v-model="addressObj.address"
-      placeholder="详细地址"
+      :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index fbe670d..465b2e7 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -10,7 +10,7 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSampleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -198,7 +198,7 @@
 
 // 获取样品详情
 const getInfo = () => {
-  // getSampleDetail({ id: infoId.value }).then((res) => {
+  // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
     orderId: '123',
     ABC: 'A',
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index a5411c1..629b33c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -9,6 +9,7 @@
 import type { IAdvice, SimpleCompany } from './advice_interface'
 import { addAdvice, getAdviceDetail, updateAdvice } from '@/api/customer/advice'
 import { getDictByCode } from '@/api/system/dict'
+import { getCustomerListSimple } from '@/api/customer/customer'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -93,42 +94,29 @@
 const getInfo = () => {
   loading.value = true
   getAdviceDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      id: '1597579843411234817',
-      adviceNo: 'ts202201022131', // 投诉编号
-      adviceClass: '0', // 投诉类型
-      adviceType: '1', // 投诉类别
-      advicePerson: '张三', // 投诉人-名称
-      personPhone: '87447', // 投诉人联系方式
-      customerName: '特别大公司', // 公司名称
-      adviceTime: '2022-12-25 23:58:00',
-      customerNo: '', //	客户编号
-      customerId: '', // 客户id
-      content: '没人接电话', // 投诉内容
-      handleStatus: '0', // 处置状态-0未处置，1已处置
-      handleMessage: '', // 处置意见
-    }
     dataForm.value = res.data
     loading.value = false
   })
 }
 
-const tempCompanyList = ref<SimpleCompany[]>([
-  { customerId: '111', customerNo: '12312456', customerName: '京东', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '112', customerNo: '12312451', customerName: '阿里', businessSizeName: '0~10万', companySizeName: '大企业', gradeName: '一般', evaluationName: '重点客户' },
-  { customerId: '113', customerNo: '12312452', customerName: '淘宝', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '114', customerNo: '12312453', customerName: '天猫', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '115', customerNo: '12312454', customerName: '203d', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '116', customerNo: '12312456', customerName: '万达', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-])
 // 查询公司列表
 const queryCompany = (queryString: string, cb: any) => {
-  // TODO: 远程查询符合要求的公司列表
-  const results = queryString ? tempCompanyList.value.filter((item) => { item.customerName.includes(queryString) }) : tempCompanyList.value
-  cb(results)
+  const params = {
+    businessSize: '', // 业务规模
+    customerName: queryString, // 公司名称
+    customerNo: '', // 客户编号
+    grade: '', // 履约评级
+    offset: 1,
+    limit: 20,
+  }
+  // 远程查询符合要求的公司列表
+  getCustomerListSimple(params).then((res) => {
+    const result = res.data.rows
+    cb(result)
+  })
 }
 
-// 选中
+// 选中客户
 const handleCompanySelect = (select: Record<string, any>) => {
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
@@ -138,12 +126,12 @@
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
+  dataForm.value.customerNo = item.customerNo
 }
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
   popTitle: '投诉/建议详情', // 打印配置页上方的标题
-  // extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>投诉/建议详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -294,7 +282,7 @@
             <el-col :span="6">
               <el-form-item label="客户编号">
                 <el-input
-                  v-model="companyInfo.customerNo"
+                  v-model="dataForm.customerNo"
                   placeholder=""
                   disabled
                   :class="{ 'detail-input': pageType === 'detail' }"
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 63aef59..0517076 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -17,21 +17,20 @@
   customerNo: '', // 客户编号
   startTime: '', // 投诉开始时间
   endTime: '', // 投诉结束时间
-  formId: 'jlglsygfsp',
   offset: 1,
   limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '120', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center' },
-  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
-  { text: '投诉人', value: 'advicePerson', align: 'center' },
-  { text: '联系方式', value: 'personPhone', align: 'center' },
-  { text: '投诉时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
+  { text: '联系方式', value: 'personPhone', align: 'center', width: '120' },
+  { text: '投诉时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
 const list = ref<IAdvice[]>([])
@@ -54,7 +53,7 @@
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getAdviceList(listQuery.value).then((response) => {
     // 模拟数据
-    response.data.rows = [{ id: '1597579843411234817', advicePerson: '张三', personPhone: '87447', createTime: '2023-01-02 08:25:35', adviceNo: '111111', content: '服务态度不好', businessScope: 'test1', evaluation: '1', evaluationName: '优质', customerName: '京东集团', customerNo: 'sygf202211290001', updateTime: '2023-01-10 09:56:57' }]
+    // response.data.rows = [{ id: '1597579843411234817', advicePerson: '张三', personPhone: '87447', createTime: '2023-01-02 08:25:35', adviceNo: '111111', content: '服务态度不好', businessScope: 'test1', evaluation: '1', evaluationName: '优质', customerName: '京东集团', customerNo: 'sygf202211290001', updateTime: '2023-01-10 09:56:57' }]
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 23c294a..5e9b72c 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -1,17 +1,16 @@
-<script lang="ts" setup name="ListSourceAdd">
+<script lang="ts" setup name="CustomerEdit">
 /**
  * 添加/编辑/详情客户
  */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { addCustomer, getCustomerDetail, updateCustomer } from '@/api/customer/customer'
+import { addCustomer, getCertificationByCustomer, getContractByCustomer, getCustomerDetail, getOrderByCustomer, getSampleByCustomer, updateCustomer } from '@/api/customer/customer'
 import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -51,18 +50,18 @@
   companySize: '', // 公司规模
   businessSize: '', // 业务规模
   evaluation: '', // 整体评价
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
+  fullAddress: '',
+  addressArea: '',
+  addressCity: '',
+  addressCountry: '',
+  addressProvince: '',
+  addressAreaName: '',
+  addressCityName: '',
+  addressCountryName: '',
+  addressProvinceName: '',
   director: '',
   fax: '',
-  invoiceAddress: '',
+  invoiceFullAddress: '',
   invoiceArea: '',
   invoiceCity: '',
   invoiceCountry: '',
@@ -71,7 +70,7 @@
   invoiceCityName: '',
   invoiceCountryName: '',
   invoiceProvinceName: '',
-  mailbox: '',
+  email: '',
   minioFileName: '',
   mobile: '',
   phone: '',
@@ -79,11 +78,11 @@
   remark: '',
   taxNumber: '',
   website: '',
-  customerPersonList: [],
+  customerUserList: [],
 })
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
-const CustomerPersonList: Ref<CustomerPerson[]> = ref([]) // 人员列表
+const fullAddress = ref<string[]>([]) // 公司地址
+const invoiceFullAddress = ref<string[]>([]) // 开票地址
+const customerPersonList: Ref<CustomerPerson[]> = ref([]) // 人员列表
 const columns = ref([
   { text: '姓名', value: 'name', required: true },
   { text: '工作部门', value: 'department', required: false },
@@ -99,36 +98,44 @@
   measureRecords: [] as SimpleMeasureRecord[],
   certificationRecords: [] as SimpleCertification[],
 })
-// 获取人员列表
-const fetchPerson = function (query = null) {
-  dataList.value.personList = dataForm.value.customerPersonList
-  dataList.value.personList = [{ name: '张三', department: '', job: '总经理', phone: '68387447' }, { name: '李四', department: '营销', job: '销售', phone: '68387447' }]
-}
 // 获取样品列表
-const fetchSampleList = function (query = null) {
-  dataList.value.sampleRecords = [{ sampleCode: 'abc123', sampleName: '血压计', sampleModel: 'xxxx', manufacturingNo: '111', mesureTime: '2022-12-25 00:00:00', mesurePeriod: '6个月' }]
+const fetchSampleList = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getSampleByCustomer(query).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+  })
 }
 // 获取合同记录
-const fetchContractRecords = function (query = null) {
-  dataList.value.contractRecords = []
+const fetchContractRecords = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getContractByCustomer(query).then((res) => {
+    dataList.value.contractRecords = res.data.rows
+  })
 }
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getOrderByCustomer(query).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getCertificationByCustomer(query).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 interface Menu {
   name: string
   columns: TableColumn[]
   pagination: boolean
+  query?: { id: string; limit: number; offset: number }
   list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function
+  searchFunc: Function | null
 }
 // 菜单
-const menu: Menu[] = [
+const menu = ref<Menu[]>([
   {
     name: '客户人员',
     columns: [
@@ -139,10 +146,15 @@
     ],
     pagination: false,
     list: 'personList',
-    searchFunc: fetchPerson,
+    searchFunc: null,
   },
   {
     name: '样品记录',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     columns: [
       { text: '样品编号', value: 'sampleCode' },
       { text: '样品名称', value: 'sampleName' },
@@ -165,6 +177,11 @@
       { text: '合同时间', value: 'contractTime' },
       { text: '负责人', value: 'aCompanyDutyman' },
     ],
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     list: 'contractRecords',
     pagination: true,
     searchFunc: fetchContractRecords,
@@ -179,12 +196,22 @@
       { text: '送检人', value: 'deliverer' },
       { text: '送检日期', value: 'deliverTime' },
     ],
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     list: 'measureRecords',
     pagination: true,
     searchFunc: fetchMeasureRecords,
   },
   {
     name: '检定证书',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     columns: [
       { text: '证书编号', value: 'certificationCode' },
       { text: '证书名称', value: 'certificationName' },
@@ -196,16 +223,17 @@
     pagination: true,
     searchFunc: fetchCertifications,
   },
-]
+])
 const currentMenu = ref('客户人员')
 const currentMenuObj = computed(() => {
-  return menu.find(item => item.name === currentMenu.value)
+  return menu.value.find(item => item.name === currentMenu.value)
 })
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
   id: '',
-  personNo: '',
+  customerId: '',
+  userNo: '',
   name: '',
   department: '',
   job: '',
@@ -250,19 +278,37 @@
 getDict()
 
 const getInfo = () => {
+  loading.value = true
   getCustomerDetail({ id: infoId.value }).then((res) => {
-    res.data = { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: '优质', companySize: '1', companySizeName: '优质', businessSize: '1', businessSizeName: '小微企业', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110107', companyCity: '110100', companyCountry: 'CN', companyProvince: '110000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110107', invoiceCity: '110100', invoiceCountry: 'CN', invoiceProvince: '110000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }
+    loading.value = false
+    // res.data = { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: '优质', companySize: '1', companySizeName: '优质', businessSize: '1', businessSizeName: '小微企业', evaluation: '1', evaluationName: '优质', fullAddress: '五棵松', addressAreaName: '海淀区', addressCityName: '北京市', addressCountryName: '中国', addressProvinceName: '北京', addressArea: '110107', addressCity: '110100', addressCountry: 'CN', addressProvince: '110000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceFullAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110107', invoiceCity: '110100', invoiceCountry: 'CN', invoiceProvince: '110000', email: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }
     dataForm.value = res.data
     if (pageType.value == 'detail') {
-      companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
-      invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
-      for (const item of menu) {
-        item.searchFunc()
+      fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+      // 人员列表
+      dataList.value.personList = res.data.customerUserList
+      // 其他查询菜单
+      for (const item of menu.value) {
+        if (item.searchFunc) { item.searchFunc(item.query) }
       }
     }
     else {
-      companyAddress.value = [dataForm.value.companyCountry, dataForm.value.companyProvince, dataForm.value.companyCity, dataForm.value.companyArea, dataForm.value.companyAddress]
-      invoiceAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceAddress]
+      fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+      // 人员列表
+      customerPersonList.value = res.data.customerUserList.map((item: CustomerPerson) => {
+        return {
+          id: '',
+          customerId: '',
+          userNo: item.userNo,
+          name: item.name,
+          department: item.department,
+          job: item.job,
+          phone: item.phone,
+          editable: true,
+        }
+      })
     }
   })
 }
@@ -273,24 +319,24 @@
 }
 
 // 公司地址变化后给对象赋值
-function companyAddressChange(addressObj: IAddress) {
-  dataForm.value.companyCountry = addressObj.country
-  dataForm.value.companyProvince = addressObj.province
-  dataForm.value.companyCity = addressObj.city
-  dataForm.value.companyArea = addressObj.area
-  dataForm.value.companyAddress = addressObj.address
-  dataForm.value.companyCountryName = addressObj.countryName
-  dataForm.value.companyProvinceName = addressObj.provinceName
-  dataForm.value.companyCityName = addressObj.cityName
-  dataForm.value.companyAreaName = addressObj.areaName
+function fullAddressChange(addressObj: IAddress) {
+  dataForm.value.addressCountry = addressObj.country
+  dataForm.value.addressProvince = addressObj.province
+  dataForm.value.addressCity = addressObj.city
+  dataForm.value.addressArea = addressObj.area
+  dataForm.value.fullAddress = addressObj.address
+  dataForm.value.addressCountryName = addressObj.countryName
+  dataForm.value.addressProvinceName = addressObj.provinceName
+  dataForm.value.addressCityName = addressObj.cityName
+  dataForm.value.addressAreaName = addressObj.areaName
 }
-
-function invoiceAddressChange(addressObj: IAddress) {
+// 开票地址发生变化
+function invoiceFullAddressChange(addressObj: IAddress) {
   dataForm.value.invoiceCountry = addressObj.country
   dataForm.value.invoiceProvince = addressObj.province
   dataForm.value.invoiceCity = addressObj.city
   dataForm.value.invoiceArea = addressObj.area
-  dataForm.value.invoiceAddress = addressObj.address
+  dataForm.value.invoiceFullAddress = addressObj.address
   dataForm.value.invoiceCountryName = addressObj.countryName
   dataForm.value.invoiceProvinceName = addressObj.provinceName
   dataForm.value.invoiceCityName = addressObj.cityName
@@ -301,13 +347,13 @@
   // 检查上一行必填项
   if (checkPersonList()) {
     setAllRowReadable()
-    CustomerPersonList.value.push({ ...addPersonObj })
+    customerPersonList.value.push({ ...addPersonObj })
   }
 }
 // 检查人员列表
 function checkPersonList() {
-  for (let index = 0; index < CustomerPersonList.value.length; index++) {
-    const item = CustomerPersonList.value[index]
+  for (let index = 0; index < customerPersonList.value.length; index++) {
+    const item = customerPersonList.value[index]
     for (const prop of columns.value) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
@@ -328,7 +374,7 @@
 
 // 删除行
 const deleteList = () => {
-  CustomerPersonList.value = CustomerPersonList.value.filter((item: CustomerPerson) => {
+  customerPersonList.value = customerPersonList.value.filter((item: CustomerPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -347,48 +393,49 @@
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (dataForm.value.id) {
-          updateCustomer(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-        else {
-          addCustomer(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
+      if (checkPersonList()) { // 检查人员列表
+        setAllRowReadable()
+        // 校验人员列表
+        dataForm.value.customerUserList = customerPersonList.value.map((item) => {
+          const value = { ...item }
+          delete value.editable
+          return value
+        })
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (dataForm.value.id) {
+            updateCustomer(dataForm.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('已保存')
+                $router.go(-1)
+              }
+            })
+          }
+          else {
+            addCustomer(dataForm.value).then((res) => {
+              if (res.code === 200) {
+              // dataForm.value.id = res.data.id
+              // dataForm.value.customerNo = res.data.customerNo
+                ElMessage.success('已保存')
+                $router.go(-1)
+              }
+            })
+          }
+        })
+      }
     }
   })
 }
 
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
@@ -415,7 +462,7 @@
 }
 // 将所有人员信息列表置为不可编辑状态
 function setAllRowReadable() {
-  for (const item of CustomerPersonList.value) {
+  for (const item of customerPersonList.value) {
     item.editable = false
   }
 }
@@ -427,7 +474,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`客户-${textMap[pageType]}`">
+    <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -489,28 +536,28 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="公司规模" prop="companySize">
-                <el-select v-model="dataForm.companySize" :placeholder="pageType === 'detail' ? '' : '请选择公司规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.companySize" :placeholder="pageType === 'detail' ? ' ' : '请选择公司规模'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in companySizeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="业务规模" prop="businessSize">
-                <el-select v-model="dataForm.businessSize" :placeholder="pageType === 'detail' ? '' : '请选择业务规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.businessSize" :placeholder="pageType === 'detail' ? ' ' : '请选择业务规模'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="履约评级" prop="grade">
-                <el-select v-model="dataForm.grade" :placeholder="pageType === 'detail' ? '' : '请选择履约评级'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.grade" :placeholder="pageType === 'detail' ? ' ' : '请选择履约评级'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="整体评价" prop="evaluation">
-                <el-select v-model="dataForm.evaluation" :placeholder="pageType === 'detail' ? '' : '请选择整体评价'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.evaluation" :placeholder="pageType === 'detail' ? ' ' : '请选择整体评价'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in evaluationList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
@@ -608,7 +655,7 @@
             <el-col :span="6">
               <el-form-item label="邮箱:">
                 <el-input
-                  v-model="dataForm.mailbox"
+                  v-model="dataForm.email"
                   :placeholder="pageType === 'detail' ? '' : '请输入邮箱'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
@@ -628,12 +675,12 @@
           </el-row>
           <el-row :gutter="5">
             <el-form-item label="公司地址:">
-              <address-select :data="companyAddress" :detail="pageType === 'detail'" @on-change="companyAddressChange" />
+              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
             </el-form-item>
           </el-row>
           <el-row :gutter="5">
             <el-form-item label="开票地址:">
-              <address-select :data="invoiceAddress" :detail="pageType === 'detail'" @on-change="invoiceAddressChange" />
+              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
             </el-form-item>
           </el-row>
           <el-row :gutter="24">
@@ -685,7 +732,8 @@
         </el-button>
       </template>
       <el-table
-        :data="CustomerPersonList"
+        v-loading="loading"
+        :data="customerPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2d67d55..6150a05 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -12,11 +12,10 @@
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
-  formId: 'jlglsygfsp',
   offset: 1,
   limit: 20,
 })
@@ -51,12 +50,12 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center' },
-  { text: '公司规模', value: 'companySizeName', align: 'center' },
-  { text: '业务规模', value: 'businessSizeName', align: 'center' },
-  { text: '履约评级', value: 'gradeName', align: 'center' },
-  { text: '整体评价', value: 'evaluationName', align: 'center' },
-  { text: '公司地址', value: 'briefName', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
+  { text: '公司规模', value: 'companySizeName', width: '110', 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', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
@@ -79,17 +78,20 @@
   }
   getCustomerList(listQuery.value).then((response) => {
     // 模拟数据
-    response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
+    // response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
     list.value = response.data.rows.map((item: ICustomer) => {
-      if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
       }
-      else {
-        item.briefName = item.companyProvinceName || item.companyCityName
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
       }
       return item
     })
-    total.value = parseInt(response.data.total)
+    total.value = response.data.total
     loadingTable.value = false
   })
 }
@@ -132,7 +134,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -191,7 +193,7 @@
   })
   if (list.value.length > 0) {
     const params = {
-      bussinessSize: listQuery.value.bussinessSize, // 业务规模
+      businessSize: listQuery.value.businessSize, // 业务规模
       customerName: listQuery.value.customerName, // 公司名称
       customerNo: listQuery.value.customerNo, // 客户编号
       grade: listQuery.value.grade, // 履约评级
@@ -253,12 +255,12 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+        <el-select v-model="listQuery.businessSize" placeholder="业务规模" clearable>
           <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.grade" placeholder="履约评级">
+        <el-select v-model="listQuery.grade" placeholder="履约评级" clearable>
           <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -274,7 +276,7 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
diff --git a/src/views/customer/customerInfo/customer_interface.ts b/src/views/customer/customerInfo/customer_interface.ts
index ebadd14..17bcd47 100644
--- a/src/views/customer/customerInfo/customer_interface.ts
+++ b/src/views/customer/customerInfo/customer_interface.ts
@@ -1,6 +1,6 @@
 // 列表查询条件
 export interface ICustomerQuery {
-  bussinessSize: string // 业务规模
+  businessSize: string // 业务规模
   customerName: string // 公司名称
   customerNo: string // 客户编号
   grade: string // 履约评级
@@ -11,10 +11,12 @@
 // 客户人员
 export interface CustomerPerson {
   id?: number | string // id
+  customerId?: string // 客户登录id
   job: string // 职务
   department: string// 部门
   name: string// 姓名
   phone: string// 联系方式
+  userNo?: string // 人员编号
   editable?: boolean // 是否可编辑
   [key: string]: any
 }
@@ -38,20 +40,20 @@
   evaluation: string // 整体评价
   evaluationName?: string // 整体评价
   companyAddressBref?: string // 公司地址-拼接省市
-  companyAddress: string // 公司地址-详细地址
-  companyArea: string // 公司地址-区
-  companyCity: string //	公司地址-市
-  companyCountry: string // 公司地址-国家
-  companyProvince: string // 公司地址-省
-  companyAreaName: string // 公司地址-区
-  companyCityName: string //	公司地址-市
-  companyCountryName: string // 公司地址-国家
-  companyProvinceName: string // 公司地址-省
+  fullAddress: string // 公司地址-详细地址
+  addressArea: string // 公司地址-区
+  addressCity: string //	公司地址-市
+  addressCountry: string // 公司地址-国家
+  addressProvince: string // 公司地址-省
+  addressAreaName: string // 公司地址-区
+  addressCityName: string //	公司地址-市
+  addressCountryName: string // 公司地址-国家
+  addressProvinceName: string // 公司地址-省
   createTime?: string // 创建时间
   director: string // 负责人
   id: string // 主键id（列表、更新接口参数）
   fax: string // 传真
-  invoiceAddress: string // 开票地址-详细地址
+  invoiceFullAddress: string // 开票地址-详细地址
   invoiceArea: string // 开票地址-区
   invoiceCity: string //	开票地址-市
   invoiceCountry: string // 开票地址-国家
@@ -60,7 +62,7 @@
   invoiceCityName: string //	开票地址-市
   invoiceCountryName: string // 开票地址-国家
   invoiceProvinceName: string // 开票地址-省
-  mailbox: string // 邮箱
+  email: string // 邮箱
   minioFileName: string // 上传文件返回名称
   mobile: string // 手机
   phone: string // 电话
@@ -68,7 +70,7 @@
   remark: string // 备注
   taxNumber: string // 税号
   website: string //	网址
-  customerPersonList: CustomerPerson[] // 客户人员列表
+  customerUserList: CustomerPerson[] // 客户人员列表
 }
 
 // 样品记录列表

diff --git a/src/api/customer/advice.ts b/src/api/customer/advice.ts
index 738dac3..c581a4e 100644
--- a/src/api/customer/advice.ts
+++ b/src/api/customer/advice.ts
@@ -3,12 +3,11 @@
  */
 import request from '../index'
 import type { IAdviceQuery } from '@/views/customer/advice/advice_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getAdviceList(data: IAdviceQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/advice/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 数据删除
 export function deleteAdvice(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/advice/delete',
     method: 'post',
     data,
   })
@@ -26,7 +25,7 @@
 // 查看详情
 export function getAdviceDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/advice/detail',
     method: 'post',
     data,
   })
@@ -35,7 +34,7 @@
 // 新增数据
 export function addAdvice(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/advice/add',
     method: 'post',
     data,
   })
@@ -43,7 +42,7 @@
 // 编辑数据
 export function updateAdvice(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/advice/update',
     method: 'post',
     data,
   })
@@ -52,7 +51,7 @@
 // 导出列表
 export function exportAdviceList(data: Omit<IAdviceQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/advice/export',
     method: 'post',
     responseType: 'blob',
     data,
diff --git a/src/api/customer/customer.ts b/src/api/customer/customer.ts
index ebdebe6..724da6e 100644
--- a/src/api/customer/customer.ts
+++ b/src/api/customer/customer.ts
@@ -3,12 +3,20 @@
  */
 import request from '../index'
 import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getCustomerList(data: ICustomerQuery) {
   return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/customer/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表查询
+export function getCustomerListSimple(data: ICustomerQuery) {
+  return request({
+    url: '/customer/listPage',
     method: 'post',
     data,
   })
@@ -17,7 +25,7 @@
 // 数据删除
 export function deleteCustomer(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/delete`,
+    url: '/customer/delete',
     method: 'post',
     data,
   })
@@ -26,7 +34,7 @@
 // 查看详情
 export function getCustomerDetail(data: { id: string }) {
   return request({
-    url: `${prefix}/supplier/detail`,
+    url: '/customer/detail',
     method: 'post',
     data,
   })
@@ -35,7 +43,7 @@
 // 新增数据
 export function addCustomer(data: object) {
   return request({
-    url: '/meter/supplier/submit',
+    url: '/customer/add',
     method: 'post',
     data,
   })
@@ -43,7 +51,7 @@
 // 编辑数据
 export function updateCustomer(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/customer/update',
     method: 'post',
     data,
   })
@@ -52,10 +60,44 @@
 // 导出列表
 export function exportCustomerList(data: Omit<ICustomerQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/supplier/listExport`,
+    url: '/customer/export',
     method: 'post',
     responseType: 'blob',
     data,
   })
 }
 
+// 根据客户查样品id
+export function getSampleByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查合同记录
+export function getContractByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据客户查检定记录
+export function getOrderByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/contractRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 根据客户查检定记录
+export function getCertificationByCustomer(data: { id: string; offset: number; limit: number }) {
+  return request({
+    url: `/customer/certificateRecords?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 60aa04c..9cbd57f 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -172,7 +172,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.provinceName"
       placeholder=""
       class="address-select"
@@ -196,7 +196,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.cityName"
       placeholder=""
       class="address-select"
@@ -220,7 +220,7 @@
       />
     </el-select>
     <el-input
-      v-else-if="(addressObj.country === '' || addressObj.country === 'CN')"
+      v-else-if="detail && addressObj.countryName === '中国'"
       v-model="addressObj.areaName"
       placeholder=""
       class="address-select"
@@ -230,7 +230,7 @@
     <!-- 详细地址 -->
     <el-input
       v-model="addressObj.address"
-      placeholder="详细地址"
+      :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index fbe670d..465b2e7 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -10,7 +10,7 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { getSampleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -198,7 +198,7 @@
 
 // 获取样品详情
 const getInfo = () => {
-  // getSampleDetail({ id: infoId.value }).then((res) => {
+  // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
     orderId: '123',
     ABC: 'A',
diff --git a/src/views/customer/advice/adviceEdit.vue b/src/views/customer/advice/adviceEdit.vue
index a5411c1..629b33c 100644
--- a/src/views/customer/advice/adviceEdit.vue
+++ b/src/views/customer/advice/adviceEdit.vue
@@ -9,6 +9,7 @@
 import type { IAdvice, SimpleCompany } from './advice_interface'
 import { addAdvice, getAdviceDetail, updateAdvice } from '@/api/customer/advice'
 import { getDictByCode } from '@/api/system/dict'
+import { getCustomerListSimple } from '@/api/customer/customer'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -93,42 +94,29 @@
 const getInfo = () => {
   loading.value = true
   getAdviceDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      id: '1597579843411234817',
-      adviceNo: 'ts202201022131', // 投诉编号
-      adviceClass: '0', // 投诉类型
-      adviceType: '1', // 投诉类别
-      advicePerson: '张三', // 投诉人-名称
-      personPhone: '87447', // 投诉人联系方式
-      customerName: '特别大公司', // 公司名称
-      adviceTime: '2022-12-25 23:58:00',
-      customerNo: '', //	客户编号
-      customerId: '', // 客户id
-      content: '没人接电话', // 投诉内容
-      handleStatus: '0', // 处置状态-0未处置，1已处置
-      handleMessage: '', // 处置意见
-    }
     dataForm.value = res.data
     loading.value = false
   })
 }
 
-const tempCompanyList = ref<SimpleCompany[]>([
-  { customerId: '111', customerNo: '12312456', customerName: '京东', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '112', customerNo: '12312451', customerName: '阿里', businessSizeName: '0~10万', companySizeName: '大企业', gradeName: '一般', evaluationName: '重点客户' },
-  { customerId: '113', customerNo: '12312452', customerName: '淘宝', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '114', customerNo: '12312453', customerName: '天猫', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '115', customerNo: '12312454', customerName: '203d', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-  { customerId: '116', customerNo: '12312456', customerName: '万达', businessSizeName: '0~10万', companySizeName: '小微企业', gradeName: '优质', evaluationName: '重点客户' },
-])
 // 查询公司列表
 const queryCompany = (queryString: string, cb: any) => {
-  // TODO: 远程查询符合要求的公司列表
-  const results = queryString ? tempCompanyList.value.filter((item) => { item.customerName.includes(queryString) }) : tempCompanyList.value
-  cb(results)
+  const params = {
+    businessSize: '', // 业务规模
+    customerName: queryString, // 公司名称
+    customerNo: '', // 客户编号
+    grade: '', // 履约评级
+    offset: 1,
+    limit: 20,
+  }
+  // 远程查询符合要求的公司列表
+  getCustomerListSimple(params).then((res) => {
+    const result = res.data.rows
+    cb(result)
+  })
 }
 
-// 选中
+// 选中客户
 const handleCompanySelect = (select: Record<string, any>) => {
   const item = select as SimpleCompany
   companyInfo.customerName = item.customerName
@@ -138,12 +126,12 @@
   companyInfo.companySizeName = item.companySizeName
   companyInfo.businessSizeName = item.businessSizeName
   companyInfo.evaluationName = item.evaluationName
+  dataForm.value.customerNo = item.customerNo
 }
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
   popTitle: '投诉/建议详情', // 打印配置页上方的标题
-  // extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>投诉/建议详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -294,7 +282,7 @@
             <el-col :span="6">
               <el-form-item label="客户编号">
                 <el-input
-                  v-model="companyInfo.customerNo"
+                  v-model="dataForm.customerNo"
                   placeholder=""
                   disabled
                   :class="{ 'detail-input': pageType === 'detail' }"
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 63aef59..0517076 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -17,21 +17,20 @@
   customerNo: '', // 客户编号
   startTime: '', // 投诉开始时间
   endTime: '', // 投诉结束时间
-  formId: 'jlglsygfsp',
   offset: 1,
   limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '投诉建议编号', value: 'adviceNo', width: '160', align: 'center' },
-  { text: '客户编号', value: 'customerNo', width: '120', align: 'center' },
-  { text: '客户名称', value: 'customerName', align: 'center' },
-  { text: '整体评价', value: 'evaluationName', align: 'center' },
+  { text: '投诉建议编号', value: 'adviceNo', width: '155', align: 'center' },
+  { text: '客户编号', value: 'customerNo', width: '155', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center', width: '180' },
+  { text: '整体评价', value: 'evaluationName', align: 'center', width: '90' },
   { text: '投诉/建议内容', value: 'content', align: 'center' },
-  { text: '投诉人', value: 'advicePerson', align: 'center' },
-  { text: '联系方式', value: 'personPhone', align: 'center' },
-  { text: '投诉时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' },
+  { text: '联系方式', value: 'personPhone', align: 'center', width: '120' },
+  { text: '投诉时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
 const list = ref<IAdvice[]>([])
@@ -54,7 +53,7 @@
   listQuery.value.endTime = timeRange.value[1] as string || ''
   getAdviceList(listQuery.value).then((response) => {
     // 模拟数据
-    response.data.rows = [{ id: '1597579843411234817', advicePerson: '张三', personPhone: '87447', createTime: '2023-01-02 08:25:35', adviceNo: '111111', content: '服务态度不好', businessScope: 'test1', evaluation: '1', evaluationName: '优质', customerName: '京东集团', customerNo: 'sygf202211290001', updateTime: '2023-01-10 09:56:57' }]
+    // response.data.rows = [{ id: '1597579843411234817', advicePerson: '张三', personPhone: '87447', createTime: '2023-01-02 08:25:35', adviceNo: '111111', content: '服务态度不好', businessScope: 'test1', evaluation: '1', evaluationName: '优质', customerName: '京东集团', customerNo: 'sygf202211290001', updateTime: '2023-01-10 09:56:57' }]
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 23c294a..5e9b72c 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -1,17 +1,16 @@
-<script lang="ts" setup name="ListSourceAdd">
+<script lang="ts" setup name="CustomerEdit">
 /**
  * 添加/编辑/详情客户
  */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import type { CustomerPerson, ICustomer, SimpleCertification, SimpleContract, SimpleMeasureRecord, SimpleSample } from './customer_interface'
 import TemplateTable from './templateTable.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { addCustomer, getCustomerDetail, updateCustomer } from '@/api/customer/customer'
+import { addCustomer, getCertificationByCustomer, getContractByCustomer, getCustomerDetail, getOrderByCustomer, getSampleByCustomer, updateCustomer } from '@/api/customer/customer'
 import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import { getDictByCode } from '@/api/system/dict'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -51,18 +50,18 @@
   companySize: '', // 公司规模
   businessSize: '', // 业务规模
   evaluation: '', // 整体评价
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
+  fullAddress: '',
+  addressArea: '',
+  addressCity: '',
+  addressCountry: '',
+  addressProvince: '',
+  addressAreaName: '',
+  addressCityName: '',
+  addressCountryName: '',
+  addressProvinceName: '',
   director: '',
   fax: '',
-  invoiceAddress: '',
+  invoiceFullAddress: '',
   invoiceArea: '',
   invoiceCity: '',
   invoiceCountry: '',
@@ -71,7 +70,7 @@
   invoiceCityName: '',
   invoiceCountryName: '',
   invoiceProvinceName: '',
-  mailbox: '',
+  email: '',
   minioFileName: '',
   mobile: '',
   phone: '',
@@ -79,11 +78,11 @@
   remark: '',
   taxNumber: '',
   website: '',
-  customerPersonList: [],
+  customerUserList: [],
 })
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
-const CustomerPersonList: Ref<CustomerPerson[]> = ref([]) // 人员列表
+const fullAddress = ref<string[]>([]) // 公司地址
+const invoiceFullAddress = ref<string[]>([]) // 开票地址
+const customerPersonList: Ref<CustomerPerson[]> = ref([]) // 人员列表
 const columns = ref([
   { text: '姓名', value: 'name', required: true },
   { text: '工作部门', value: 'department', required: false },
@@ -99,36 +98,44 @@
   measureRecords: [] as SimpleMeasureRecord[],
   certificationRecords: [] as SimpleCertification[],
 })
-// 获取人员列表
-const fetchPerson = function (query = null) {
-  dataList.value.personList = dataForm.value.customerPersonList
-  dataList.value.personList = [{ name: '张三', department: '', job: '总经理', phone: '68387447' }, { name: '李四', department: '营销', job: '销售', phone: '68387447' }]
-}
 // 获取样品列表
-const fetchSampleList = function (query = null) {
-  dataList.value.sampleRecords = [{ sampleCode: 'abc123', sampleName: '血压计', sampleModel: 'xxxx', manufacturingNo: '111', mesureTime: '2022-12-25 00:00:00', mesurePeriod: '6个月' }]
+const fetchSampleList = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getSampleByCustomer(query).then((res) => {
+    dataList.value.sampleRecords = res.data.rows
+  })
 }
 // 获取合同记录
-const fetchContractRecords = function (query = null) {
-  dataList.value.contractRecords = []
+const fetchContractRecords = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getContractByCustomer(query).then((res) => {
+    dataList.value.contractRecords = res.data.rows
+  })
 }
 // 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
+const fetchMeasureRecords = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getOrderByCustomer(query).then((res) => {
+    dataList.value.measureRecords = res.data.rows
+  })
 }
 // 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
+const fetchCertifications = function (query: { id: string; limit: number; offset: number }) {
+  query.id = dataForm.value.id
+  getCertificationByCustomer(query).then((res) => {
+    dataList.value.certificationRecords = res.data.rows
+  })
 }
 interface Menu {
   name: string
   columns: TableColumn[]
   pagination: boolean
+  query?: { id: string; limit: number; offset: number }
   list: 'personList' | 'sampleRecords' | 'contractRecords' | 'measureRecords' | 'certificationRecords'
-  searchFunc: Function
+  searchFunc: Function | null
 }
 // 菜单
-const menu: Menu[] = [
+const menu = ref<Menu[]>([
   {
     name: '客户人员',
     columns: [
@@ -139,10 +146,15 @@
     ],
     pagination: false,
     list: 'personList',
-    searchFunc: fetchPerson,
+    searchFunc: null,
   },
   {
     name: '样品记录',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     columns: [
       { text: '样品编号', value: 'sampleCode' },
       { text: '样品名称', value: 'sampleName' },
@@ -165,6 +177,11 @@
       { text: '合同时间', value: 'contractTime' },
       { text: '负责人', value: 'aCompanyDutyman' },
     ],
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     list: 'contractRecords',
     pagination: true,
     searchFunc: fetchContractRecords,
@@ -179,12 +196,22 @@
       { text: '送检人', value: 'deliverer' },
       { text: '送检日期', value: 'deliverTime' },
     ],
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     list: 'measureRecords',
     pagination: true,
     searchFunc: fetchMeasureRecords,
   },
   {
     name: '检定证书',
+    query: {
+      id: '',
+      limit: 10,
+      offset: 1,
+    },
     columns: [
       { text: '证书编号', value: 'certificationCode' },
       { text: '证书名称', value: 'certificationName' },
@@ -196,16 +223,17 @@
     pagination: true,
     searchFunc: fetchCertifications,
   },
-]
+])
 const currentMenu = ref('客户人员')
 const currentMenuObj = computed(() => {
-  return menu.find(item => item.name === currentMenu.value)
+  return menu.value.find(item => item.name === currentMenu.value)
 })
 const ruleFormRef = ref<FormInstance>()
 // 人员对象
 const addPersonObj: CustomerPerson = {
   id: '',
-  personNo: '',
+  customerId: '',
+  userNo: '',
   name: '',
   department: '',
   job: '',
@@ -250,19 +278,37 @@
 getDict()
 
 const getInfo = () => {
+  loading.value = true
   getCustomerDetail({ id: infoId.value }).then((res) => {
-    res.data = { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: '优质', companySize: '1', companySizeName: '优质', businessSize: '1', businessSizeName: '小微企业', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110107', companyCity: '110100', companyCountry: 'CN', companyProvince: '110000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110107', invoiceCity: '110100', invoiceCountry: 'CN', invoiceProvince: '110000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }
+    loading.value = false
+    // res.data = { bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: '优质', companySize: '1', companySizeName: '优质', businessSize: '1', businessSizeName: '小微企业', evaluation: '1', evaluationName: '优质', fullAddress: '五棵松', addressAreaName: '海淀区', addressCityName: '北京市', addressCountryName: '中国', addressProvinceName: '北京', addressArea: '110107', addressCity: '110100', addressCountry: 'CN', addressProvince: '110000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceFullAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110107', invoiceCity: '110100', invoiceCountry: 'CN', invoiceProvince: '110000', email: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }
     dataForm.value = res.data
     if (pageType.value == 'detail') {
-      companyAddress.value = [dataForm.value.companyCountryName, dataForm.value.companyProvinceName, dataForm.value.companyCityName, dataForm.value.companyAreaName, dataForm.value.companyAddress]
-      invoiceAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceAddress]
-      for (const item of menu) {
-        item.searchFunc()
+      fullAddress.value = [dataForm.value.addressCountryName, dataForm.value.addressProvinceName, dataForm.value.addressCityName, dataForm.value.addressAreaName, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountryName, dataForm.value.invoiceProvinceName, dataForm.value.invoiceCityName, dataForm.value.invoiceAreaName, dataForm.value.invoiceFullAddress]
+      // 人员列表
+      dataList.value.personList = res.data.customerUserList
+      // 其他查询菜单
+      for (const item of menu.value) {
+        if (item.searchFunc) { item.searchFunc(item.query) }
       }
     }
     else {
-      companyAddress.value = [dataForm.value.companyCountry, dataForm.value.companyProvince, dataForm.value.companyCity, dataForm.value.companyArea, dataForm.value.companyAddress]
-      invoiceAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceAddress]
+      fullAddress.value = [dataForm.value.addressCountry, dataForm.value.addressProvince, dataForm.value.addressCity, dataForm.value.addressArea, dataForm.value.fullAddress]
+      invoiceFullAddress.value = [dataForm.value.invoiceCountry, dataForm.value.invoiceProvince, dataForm.value.invoiceCity, dataForm.value.invoiceArea, dataForm.value.invoiceFullAddress]
+      // 人员列表
+      customerPersonList.value = res.data.customerUserList.map((item: CustomerPerson) => {
+        return {
+          id: '',
+          customerId: '',
+          userNo: item.userNo,
+          name: item.name,
+          department: item.department,
+          job: item.job,
+          phone: item.phone,
+          editable: true,
+        }
+      })
     }
   })
 }
@@ -273,24 +319,24 @@
 }
 
 // 公司地址变化后给对象赋值
-function companyAddressChange(addressObj: IAddress) {
-  dataForm.value.companyCountry = addressObj.country
-  dataForm.value.companyProvince = addressObj.province
-  dataForm.value.companyCity = addressObj.city
-  dataForm.value.companyArea = addressObj.area
-  dataForm.value.companyAddress = addressObj.address
-  dataForm.value.companyCountryName = addressObj.countryName
-  dataForm.value.companyProvinceName = addressObj.provinceName
-  dataForm.value.companyCityName = addressObj.cityName
-  dataForm.value.companyAreaName = addressObj.areaName
+function fullAddressChange(addressObj: IAddress) {
+  dataForm.value.addressCountry = addressObj.country
+  dataForm.value.addressProvince = addressObj.province
+  dataForm.value.addressCity = addressObj.city
+  dataForm.value.addressArea = addressObj.area
+  dataForm.value.fullAddress = addressObj.address
+  dataForm.value.addressCountryName = addressObj.countryName
+  dataForm.value.addressProvinceName = addressObj.provinceName
+  dataForm.value.addressCityName = addressObj.cityName
+  dataForm.value.addressAreaName = addressObj.areaName
 }
-
-function invoiceAddressChange(addressObj: IAddress) {
+// 开票地址发生变化
+function invoiceFullAddressChange(addressObj: IAddress) {
   dataForm.value.invoiceCountry = addressObj.country
   dataForm.value.invoiceProvince = addressObj.province
   dataForm.value.invoiceCity = addressObj.city
   dataForm.value.invoiceArea = addressObj.area
-  dataForm.value.invoiceAddress = addressObj.address
+  dataForm.value.invoiceFullAddress = addressObj.address
   dataForm.value.invoiceCountryName = addressObj.countryName
   dataForm.value.invoiceProvinceName = addressObj.provinceName
   dataForm.value.invoiceCityName = addressObj.cityName
@@ -301,13 +347,13 @@
   // 检查上一行必填项
   if (checkPersonList()) {
     setAllRowReadable()
-    CustomerPersonList.value.push({ ...addPersonObj })
+    customerPersonList.value.push({ ...addPersonObj })
   }
 }
 // 检查人员列表
 function checkPersonList() {
-  for (let index = 0; index < CustomerPersonList.value.length; index++) {
-    const item = CustomerPersonList.value[index]
+  for (let index = 0; index < customerPersonList.value.length; index++) {
+    const item = customerPersonList.value[index]
     for (const prop of columns.value) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
@@ -328,7 +374,7 @@
 
 // 删除行
 const deleteList = () => {
-  CustomerPersonList.value = CustomerPersonList.value.filter((item: CustomerPerson) => {
+  customerPersonList.value = customerPersonList.value.filter((item: CustomerPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -347,48 +393,49 @@
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        if (dataForm.value.id) {
-          updateCustomer(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-        else {
-          addCustomer(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
-      })
+      if (checkPersonList()) { // 检查人员列表
+        setAllRowReadable()
+        // 校验人员列表
+        dataForm.value.customerUserList = customerPersonList.value.map((item) => {
+          const value = { ...item }
+          delete value.editable
+          return value
+        })
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (dataForm.value.id) {
+            updateCustomer(dataForm.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('已保存')
+                $router.go(-1)
+              }
+            })
+          }
+          else {
+            addCustomer(dataForm.value).then((res) => {
+              if (res.code === 200) {
+              // dataForm.value.id = res.data.id
+              // dataForm.value.customerNo = res.data.customerNo
+                ElMessage.success('已保存')
+                $router.go(-1)
+              }
+            })
+          }
+        })
+      }
     }
   })
 }
 
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
@@ -415,7 +462,7 @@
 }
 // 将所有人员信息列表置为不可编辑状态
 function setAllRowReadable() {
-  for (const item of CustomerPersonList.value) {
+  for (const item of customerPersonList.value) {
     item.editable = false
   }
 }
@@ -427,7 +474,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`客户-${textMap[pageType]}`">
+    <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -489,28 +536,28 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="公司规模" prop="companySize">
-                <el-select v-model="dataForm.companySize" :placeholder="pageType === 'detail' ? '' : '请选择公司规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.companySize" :placeholder="pageType === 'detail' ? ' ' : '请选择公司规模'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in companySizeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="业务规模" prop="businessSize">
-                <el-select v-model="dataForm.businessSize" :placeholder="pageType === 'detail' ? '' : '请选择业务规模'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.businessSize" :placeholder="pageType === 'detail' ? ' ' : '请选择业务规模'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="履约评级" prop="grade">
-                <el-select v-model="dataForm.grade" :placeholder="pageType === 'detail' ? '' : '请选择履约评级'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.grade" :placeholder="pageType === 'detail' ? ' ' : '请选择履约评级'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="整体评价" prop="evaluation">
-                <el-select v-model="dataForm.evaluation" :placeholder="pageType === 'detail' ? '' : '请选择整体评价'" :disabled="pageType === 'detail'" class="full-width-input">
+                <el-select v-model="dataForm.evaluation" :placeholder="pageType === 'detail' ? ' ' : '请选择整体评价'" :disabled="pageType === 'detail'" class="full-width-input">
                   <el-option v-for="item in evaluationList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
@@ -608,7 +655,7 @@
             <el-col :span="6">
               <el-form-item label="邮箱:">
                 <el-input
-                  v-model="dataForm.mailbox"
+                  v-model="dataForm.email"
                   :placeholder="pageType === 'detail' ? '' : '请输入邮箱'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
@@ -628,12 +675,12 @@
           </el-row>
           <el-row :gutter="5">
             <el-form-item label="公司地址:">
-              <address-select :data="companyAddress" :detail="pageType === 'detail'" @on-change="companyAddressChange" />
+              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
             </el-form-item>
           </el-row>
           <el-row :gutter="5">
             <el-form-item label="开票地址:">
-              <address-select :data="invoiceAddress" :detail="pageType === 'detail'" @on-change="invoiceAddressChange" />
+              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
             </el-form-item>
           </el-row>
           <el-row :gutter="24">
@@ -685,7 +732,8 @@
         </el-button>
       </template>
       <el-table
-        :data="CustomerPersonList"
+        v-loading="loading"
+        :data="customerPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index 2d67d55..6150a05 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -12,11 +12,10 @@
 const $router = useRouter()
 // 查询条件
 const listQuery: Ref<ICustomerQuery> = ref({
-  bussinessSize: '', // 业务规模
+  businessSize: '', // 业务规模
   customerName: '', // 公司名称
   customerNo: '', // 客户编号
   grade: '', // 履约评级
-  formId: 'jlglsygfsp',
   offset: 1,
   limit: 20,
 })
@@ -51,12 +50,12 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户编号', value: 'customerNo', width: '160', align: 'center' },
-  { text: '客户名称', value: 'customerName', width: '120', align: 'center' },
-  { text: '公司规模', value: 'companySizeName', align: 'center' },
-  { text: '业务规模', value: 'businessSizeName', align: 'center' },
-  { text: '履约评级', value: 'gradeName', align: 'center' },
-  { text: '整体评价', value: 'evaluationName', align: 'center' },
-  { text: '公司地址', value: 'briefName', align: 'center' },
+  { text: '客户名称', value: 'customerName', align: 'center' },
+  { text: '公司规模', value: 'companySizeName', width: '110', 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', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
@@ -79,17 +78,20 @@
   }
   getCustomerList(listQuery.value).then((response) => {
     // 模拟数据
-    response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
+    // response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
     list.value = response.data.rows.map((item: ICustomer) => {
-      if (item.companyProvinceName && item.companyCityName) {
-        item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
+      if (item.addressProvinceName && item.addressCityName) {
+        item.fullAddress = `${item.addressProvinceName}/${item.addressCityName}`
       }
-      else {
-        item.briefName = item.companyProvinceName || item.companyCityName
+      else if (item.addressProvinceName || item.addressCityName) {
+        item.fullAddress = item.addressProvinceName || item.addressCityName
+      }
+      else if (item.addressCountryName) {
+        item.fullAddress = item.addressCountryName
       }
       return item
     })
-    total.value = parseInt(response.data.total)
+    total.value = response.data.total
     loadingTable.value = false
   })
 }
@@ -132,7 +134,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    bussinessSize: '', // 业务规模
+    businessSize: '', // 业务规模
     customerName: '', // 公司名称
     customerNo: '', // 客户编号
     grade: '', // 履约评级
@@ -191,7 +193,7 @@
   })
   if (list.value.length > 0) {
     const params = {
-      bussinessSize: listQuery.value.bussinessSize, // 业务规模
+      businessSize: listQuery.value.businessSize, // 业务规模
       customerName: listQuery.value.customerName, // 公司名称
       customerNo: listQuery.value.customerNo, // 客户编号
       grade: listQuery.value.grade, // 履约评级
@@ -253,12 +255,12 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.bussinessSize" placeholder="业务规模">
+        <el-select v-model="listQuery.businessSize" placeholder="业务规模" clearable>
           <el-option v-for="item in businessSizeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.grade" placeholder="履约评级">
+        <el-select v-model="listQuery.grade" placeholder="履约评级" clearable>
           <el-option v-for="item in gradeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -274,7 +276,7 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
diff --git a/src/views/customer/customerInfo/customer_interface.ts b/src/views/customer/customerInfo/customer_interface.ts
index ebadd14..17bcd47 100644
--- a/src/views/customer/customerInfo/customer_interface.ts
+++ b/src/views/customer/customerInfo/customer_interface.ts
@@ -1,6 +1,6 @@
 // 列表查询条件
 export interface ICustomerQuery {
-  bussinessSize: string // 业务规模
+  businessSize: string // 业务规模
   customerName: string // 公司名称
   customerNo: string // 客户编号
   grade: string // 履约评级
@@ -11,10 +11,12 @@
 // 客户人员
 export interface CustomerPerson {
   id?: number | string // id
+  customerId?: string // 客户登录id
   job: string // 职务
   department: string// 部门
   name: string// 姓名
   phone: string// 联系方式
+  userNo?: string // 人员编号
   editable?: boolean // 是否可编辑
   [key: string]: any
 }
@@ -38,20 +40,20 @@
   evaluation: string // 整体评价
   evaluationName?: string // 整体评价
   companyAddressBref?: string // 公司地址-拼接省市
-  companyAddress: string // 公司地址-详细地址
-  companyArea: string // 公司地址-区
-  companyCity: string //	公司地址-市
-  companyCountry: string // 公司地址-国家
-  companyProvince: string // 公司地址-省
-  companyAreaName: string // 公司地址-区
-  companyCityName: string //	公司地址-市
-  companyCountryName: string // 公司地址-国家
-  companyProvinceName: string // 公司地址-省
+  fullAddress: string // 公司地址-详细地址
+  addressArea: string // 公司地址-区
+  addressCity: string //	公司地址-市
+  addressCountry: string // 公司地址-国家
+  addressProvince: string // 公司地址-省
+  addressAreaName: string // 公司地址-区
+  addressCityName: string //	公司地址-市
+  addressCountryName: string // 公司地址-国家
+  addressProvinceName: string // 公司地址-省
   createTime?: string // 创建时间
   director: string // 负责人
   id: string // 主键id（列表、更新接口参数）
   fax: string // 传真
-  invoiceAddress: string // 开票地址-详细地址
+  invoiceFullAddress: string // 开票地址-详细地址
   invoiceArea: string // 开票地址-区
   invoiceCity: string //	开票地址-市
   invoiceCountry: string // 开票地址-国家
@@ -60,7 +62,7 @@
   invoiceCityName: string //	开票地址-市
   invoiceCountryName: string // 开票地址-国家
   invoiceProvinceName: string // 开票地址-省
-  mailbox: string // 邮箱
+  email: string // 邮箱
   minioFileName: string // 上传文件返回名称
   mobile: string // 手机
   phone: string // 电话
@@ -68,7 +70,7 @@
   remark: string // 备注
   taxNumber: string // 税号
   website: string //	网址
-  customerPersonList: CustomerPerson[] // 客户人员列表
+  customerUserList: CustomerPerson[] // 客户人员列表
 }
 
 // 样品记录列表
diff --git a/src/views/customer/customerInfo/templateTable.vue b/src/views/customer/customerInfo/templateTable.vue
index 2ce17ba..d89e12d 100644
--- a/src/views/customer/customerInfo/templateTable.vue
+++ b/src/views/customer/customerInfo/templateTable.vue
@@ -1,5 +1,5 @@
 <!-- 表格记录 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CustomerTemplateTable">
 import type { PropType } from 'vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'