diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 37ac73f..6b87bfd 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -61,17 +61,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center', width: '100' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' },
-  { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' },
-  { text: '委托方名称', value: 'customerName', align: 'center', width: '100' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
-  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, 'dispatch', true)
 }
 // 点击标签绑定
 const barCodeBind = ref()

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 37ac73f..6b87bfd 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -61,17 +61,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center', width: '100' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' },
-  { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' },
-  { text: '委托方名称', value: 'customerName', align: 'center', width: '100' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
-  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, 'dispatch', true)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c9b7843..1baeaa3 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -186,8 +186,8 @@
   'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 37ac73f..6b87bfd 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -61,17 +61,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center', width: '100' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' },
-  { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' },
-  { text: '委托方名称', value: 'customerName', align: 'center', width: '100' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
-  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, 'dispatch', true)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c9b7843..1baeaa3 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -186,8 +186,8 @@
   'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c3c876d..059e30b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,7 +1,7 @@
 <!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFileList, columnsType, dictType } from '../report_interface'
@@ -57,7 +57,7 @@
   taskId: '', // 任务id，用于审批
   processId: '', // 	流程实例id
   processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
-  approvalSignId: '', // 认可标志专用章id
+  approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
@@ -286,14 +286,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -530,7 +536,7 @@
       names = `${names},${item.signName}`
     }
   })
-  formInline.value.approvalSignId = ids // 认可标志专用章id
+  formInline.value.approvalSignIds = ids // 认可标志专用章id
   formInline.value.approvalSignName = names // 认可标志专用章名称
 }
 // -------------------------------------------底部-------------------------------------------

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 37ac73f..6b87bfd 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -61,17 +61,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center', width: '100' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' },
-  { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' },
-  { text: '委托方名称', value: 'customerName', align: 'center', width: '100' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
-  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, 'dispatch', true)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c9b7843..1baeaa3 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -186,8 +186,8 @@
   'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c3c876d..059e30b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,7 +1,7 @@
 <!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFileList, columnsType, dictType } from '../report_interface'
@@ -57,7 +57,7 @@
   taskId: '', // 任务id，用于审批
   processId: '', // 	流程实例id
   processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
-  approvalSignId: '', // 认可标志专用章id
+  approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
@@ -286,14 +286,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -530,7 +536,7 @@
       names = `${names},${item.signName}`
     }
   })
-  formInline.value.approvalSignId = ids // 认可标志专用章id
+  formInline.value.approvalSignIds = ids // 认可标志专用章id
   formInline.value.approvalSignName = names // 认可标志专用章名称
 }
 // -------------------------------------------底部-------------------------------------------
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a8d9c6e..d07ea11 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -118,28 +118,15 @@
       type: 'warning',
     },
   ).then(() => {
-    if (row.approvalStatusName === '草稿箱') {
-      draftDeleteReport({ ids: [row.id] }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
-    else { // 除草稿箱之外的删除，审批删除
-      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
+    draftDeleteReport({ ids: [row.id] }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
   })
 }
 // 取消
@@ -359,7 +346,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" /> -->
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 37ac73f..6b87bfd 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -61,17 +61,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center', width: '100' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' },
-  { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' },
-  { text: '委托方名称', value: 'customerName', align: 'center', width: '100' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
-  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, 'dispatch', true)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c9b7843..1baeaa3 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -186,8 +186,8 @@
   'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c3c876d..059e30b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,7 +1,7 @@
 <!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFileList, columnsType, dictType } from '../report_interface'
@@ -57,7 +57,7 @@
   taskId: '', // 任务id，用于审批
   processId: '', // 	流程实例id
   processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
-  approvalSignId: '', // 认可标志专用章id
+  approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
@@ -286,14 +286,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -530,7 +536,7 @@
       names = `${names},${item.signName}`
     }
   })
-  formInline.value.approvalSignId = ids // 认可标志专用章id
+  formInline.value.approvalSignIds = ids // 认可标志专用章id
   formInline.value.approvalSignName = names // 认可标志专用章名称
 }
 // -------------------------------------------底部-------------------------------------------
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a8d9c6e..d07ea11 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -118,28 +118,15 @@
       type: 'warning',
     },
   ).then(() => {
-    if (row.approvalStatusName === '草稿箱') {
-      draftDeleteReport({ ids: [row.id] }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
-    else { // 除草稿箱之外的删除，审批删除
-      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
+    draftDeleteReport({ ids: [row.id] }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
   })
 }
 // 取消
@@ -359,7 +346,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" /> -->
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bf473cf..bf6e42f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -59,7 +59,7 @@
   { text: '样品状态', value: 'sampleStatusName', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '备注', value: 'remark', align: 'center' },
-  { text: '检定项目', value: 'measureContent', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center', required: true },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -232,7 +232,7 @@
 
 // 检查表格第几行信息未完善
 const checkList = () => {
-  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
   if (index !== -1) {
     return index + 1
   }

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 37ac73f..6b87bfd 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -61,17 +61,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center', width: '100' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' },
-  { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' },
-  { text: '委托方名称', value: 'customerName', align: 'center', width: '100' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
-  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, 'dispatch', true)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c9b7843..1baeaa3 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -186,8 +186,8 @@
   'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c3c876d..059e30b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,7 +1,7 @@
 <!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFileList, columnsType, dictType } from '../report_interface'
@@ -57,7 +57,7 @@
   taskId: '', // 任务id，用于审批
   processId: '', // 	流程实例id
   processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
-  approvalSignId: '', // 认可标志专用章id
+  approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
@@ -286,14 +286,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -530,7 +536,7 @@
       names = `${names},${item.signName}`
     }
   })
-  formInline.value.approvalSignId = ids // 认可标志专用章id
+  formInline.value.approvalSignIds = ids // 认可标志专用章id
   formInline.value.approvalSignName = names // 认可标志专用章名称
 }
 // -------------------------------------------底部-------------------------------------------
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a8d9c6e..d07ea11 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -118,28 +118,15 @@
       type: 'warning',
     },
   ).then(() => {
-    if (row.approvalStatusName === '草稿箱') {
-      draftDeleteReport({ ids: [row.id] }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
-    else { // 除草稿箱之外的删除，审批删除
-      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
+    draftDeleteReport({ ids: [row.id] }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
   })
 }
 // 取消
@@ -359,7 +346,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" /> -->
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bf473cf..bf6e42f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -59,7 +59,7 @@
   { text: '样品状态', value: 'sampleStatusName', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '备注', value: 'remark', align: 'center' },
-  { text: '检定项目', value: 'measureContent', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center', required: true },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -232,7 +232,7 @@
 
 // 检查表格第几行信息未完善
 const checkList = () => {
-  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
   if (index !== -1) {
     return index + 1
   }
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 925992b..13fe7bf 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -97,8 +97,6 @@
       return false
     }
     else {
-      console.log('111111', checkoutList.value)
-
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -174,16 +172,16 @@
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
           <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
-              <template #default="scope">
-                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-              </template>
-            </el-table-column>
             <el-table-column label="#" width="55" align="center" fixed="left">
               <template #default="scope">
                 {{ scope.$index + 1 }}
               </template>
             </el-table-column>
+            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
           </template>
         </normal-table>
       </div>

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 37ac73f..6b87bfd 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -61,17 +61,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center', width: '100' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' },
-  { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' },
-  { text: '委托方名称', value: 'customerName', align: 'center', width: '100' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
-  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, 'dispatch', true)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c9b7843..1baeaa3 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -186,8 +186,8 @@
   'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c3c876d..059e30b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,7 +1,7 @@
 <!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFileList, columnsType, dictType } from '../report_interface'
@@ -57,7 +57,7 @@
   taskId: '', // 任务id，用于审批
   processId: '', // 	流程实例id
   processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
-  approvalSignId: '', // 认可标志专用章id
+  approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
@@ -286,14 +286,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -530,7 +536,7 @@
       names = `${names},${item.signName}`
     }
   })
-  formInline.value.approvalSignId = ids // 认可标志专用章id
+  formInline.value.approvalSignIds = ids // 认可标志专用章id
   formInline.value.approvalSignName = names // 认可标志专用章名称
 }
 // -------------------------------------------底部-------------------------------------------
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a8d9c6e..d07ea11 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -118,28 +118,15 @@
       type: 'warning',
     },
   ).then(() => {
-    if (row.approvalStatusName === '草稿箱') {
-      draftDeleteReport({ ids: [row.id] }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
-    else { // 除草稿箱之外的删除，审批删除
-      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
+    draftDeleteReport({ ids: [row.id] }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
   })
 }
 // 取消
@@ -359,7 +346,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" /> -->
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bf473cf..bf6e42f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -59,7 +59,7 @@
   { text: '样品状态', value: 'sampleStatusName', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '备注', value: 'remark', align: 'center' },
-  { text: '检定项目', value: 'measureContent', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center', required: true },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -232,7 +232,7 @@
 
 // 检查表格第几行信息未完善
 const checkList = () => {
-  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
   if (index !== -1) {
     return index + 1
   }
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 925992b..13fe7bf 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -97,8 +97,6 @@
       return false
     }
     else {
-      console.log('111111', checkoutList.value)
-
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -174,16 +172,16 @@
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
           <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
-              <template #default="scope">
-                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-              </template>
-            </el-table-column>
             <el-table-column label="#" width="55" align="center" fixed="left">
               <template #default="scope">
                 {{ scope.$index + 1 }}
               </template>
             </el-table-column>
+            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
           </template>
         </normal-table>
       </div>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 6d6b9e7..dc4f83d 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -11,6 +11,7 @@
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
 const type = ref('distribute')
+const isDept = ref(false) // 是否是部门检测
 // 委托书-证书类别列表
 const certificationTypes = ref<dictType[]>([])
 // 获取字典值
@@ -43,7 +44,7 @@
   // 获取任务详情
   getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
     sampleDetail.value.sampleName = res.data.sampleName
-    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.mesureContent = res.data.measureContent
     sampleDetail.value.remark = res.data.remark
     sampleDetail.value.certifications = res.data.certifications.split(',')
     sampleDetail.value.measureProcessList = res.data.measureProcessList
@@ -53,9 +54,17 @@
 }
 
 // 初始化弹窗
-const initDialog = (orderid: string, sampleid: string, sampleStatus: string) => {
+/**
+ *
+ * @param orderid 委托书id
+ * @param sampleid 样品id
+ * @param sampleStatus distribute 待分发（分发到实验室）， dispatch（分配到人）
+ * @param isDeptType 是否是部门类型
+ */
+const initDialog = (orderid: string, sampleid: string, sampleStatus: string, isDeptType?: Boolean) => {
   dialogVisible.value = true
   sampleId.value = sampleid
+  isDept.value = isDeptType as boolean
   orderId.value = orderid
   if (sampleStatus === '3') { // 检测中
     type.value = 'testing'
@@ -105,17 +114,27 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled />
+        <el-input v-model="sampleDetail.mesureContent" type="textarea" autosize disabled />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
-        <el-input v-model="sampleDetail.remark" disabled />
+        <el-input v-model="sampleDetail.remark" type="textarea" autosize a disabled />
       </div>
     </div>
-    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+    <el-button v-if="!isDept" type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="saveOver" />
+    <process-config
+      v-if="orderId"
+      :key="Math.random()"
+      ref="processConfigRef"
+      :type="type"
+      :order-id="orderId"
+      :sample-id="sampleId"
+      :list="sampleDetail.measureProcessList"
+      :is-dept="isDept"
+      @save-over="saveOver"
+    />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 37ac73f..6b87bfd 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -61,17 +61,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center', width: '100' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' },
-  { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' },
-  { text: '委托方名称', value: 'customerName', align: 'center', width: '100' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
-  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, 'dispatch', true)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c9b7843..1baeaa3 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -186,8 +186,8 @@
   'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c3c876d..059e30b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,7 +1,7 @@
 <!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFileList, columnsType, dictType } from '../report_interface'
@@ -57,7 +57,7 @@
   taskId: '', // 任务id，用于审批
   processId: '', // 	流程实例id
   processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
-  approvalSignId: '', // 认可标志专用章id
+  approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
@@ -286,14 +286,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -530,7 +536,7 @@
       names = `${names},${item.signName}`
     }
   })
-  formInline.value.approvalSignId = ids // 认可标志专用章id
+  formInline.value.approvalSignIds = ids // 认可标志专用章id
   formInline.value.approvalSignName = names // 认可标志专用章名称
 }
 // -------------------------------------------底部-------------------------------------------
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a8d9c6e..d07ea11 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -118,28 +118,15 @@
       type: 'warning',
     },
   ).then(() => {
-    if (row.approvalStatusName === '草稿箱') {
-      draftDeleteReport({ ids: [row.id] }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
-    else { // 除草稿箱之外的删除，审批删除
-      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
+    draftDeleteReport({ ids: [row.id] }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
   })
 }
 // 取消
@@ -359,7 +346,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" /> -->
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bf473cf..bf6e42f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -59,7 +59,7 @@
   { text: '样品状态', value: 'sampleStatusName', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '备注', value: 'remark', align: 'center' },
-  { text: '检定项目', value: 'measureContent', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center', required: true },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -232,7 +232,7 @@
 
 // 检查表格第几行信息未完善
 const checkList = () => {
-  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
   if (index !== -1) {
     return index + 1
   }
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 925992b..13fe7bf 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -97,8 +97,6 @@
       return false
     }
     else {
-      console.log('111111', checkoutList.value)
-
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -174,16 +172,16 @@
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
           <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
-              <template #default="scope">
-                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-              </template>
-            </el-table-column>
             <el-table-column label="#" width="55" align="center" fixed="left">
               <template #default="scope">
                 {{ scope.$index + 1 }}
               </template>
             </el-table-column>
+            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
           </template>
         </normal-table>
       </div>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 6d6b9e7..dc4f83d 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -11,6 +11,7 @@
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
 const type = ref('distribute')
+const isDept = ref(false) // 是否是部门检测
 // 委托书-证书类别列表
 const certificationTypes = ref<dictType[]>([])
 // 获取字典值
@@ -43,7 +44,7 @@
   // 获取任务详情
   getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
     sampleDetail.value.sampleName = res.data.sampleName
-    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.mesureContent = res.data.measureContent
     sampleDetail.value.remark = res.data.remark
     sampleDetail.value.certifications = res.data.certifications.split(',')
     sampleDetail.value.measureProcessList = res.data.measureProcessList
@@ -53,9 +54,17 @@
 }
 
 // 初始化弹窗
-const initDialog = (orderid: string, sampleid: string, sampleStatus: string) => {
+/**
+ *
+ * @param orderid 委托书id
+ * @param sampleid 样品id
+ * @param sampleStatus distribute 待分发（分发到实验室）， dispatch（分配到人）
+ * @param isDeptType 是否是部门类型
+ */
+const initDialog = (orderid: string, sampleid: string, sampleStatus: string, isDeptType?: Boolean) => {
   dialogVisible.value = true
   sampleId.value = sampleid
+  isDept.value = isDeptType as boolean
   orderId.value = orderid
   if (sampleStatus === '3') { // 检测中
     type.value = 'testing'
@@ -105,17 +114,27 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled />
+        <el-input v-model="sampleDetail.mesureContent" type="textarea" autosize disabled />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
-        <el-input v-model="sampleDetail.remark" disabled />
+        <el-input v-model="sampleDetail.remark" type="textarea" autosize a disabled />
       </div>
     </div>
-    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+    <el-button v-if="!isDept" type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="saveOver" />
+    <process-config
+      v-if="orderId"
+      :key="Math.random()"
+      ref="processConfigRef"
+      :type="type"
+      :order-id="orderId"
+      :sample-id="sampleId"
+      :list="sampleDetail.measureProcessList"
+      :is-dept="isDept"
+      @save-over="saveOver"
+    />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index a67552a..27135c0 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -7,7 +7,8 @@
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
-import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+import useUserStore from '@/store/modules/user'
+import { allocate, setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
 const props = defineProps({
   type: {
     type: String,
@@ -32,8 +33,14 @@
     type: Array,
     default: () => [],
   },
+  isDept: { // 是否是部门检测
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['saveOver'])
+// 用户信息
+const user = useUserStore()
 // 默认流程节点
 const defaultProcess: IScheduleSet = {
   measurePersonId: '', // 执行人
@@ -96,7 +103,14 @@
       measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
       updateTime: '', // 流程更新时间
     }
-    processList.value.push(processTemp)
+    // 不能添加已经存在的实验室
+    const index = processList.value.findIndex(e => e.measureSegmentId === item.deptId)
+    if (index === -1) {
+      processList.value.push(processTemp)
+    }
+    else {
+      ElMessage.warning(`${item.organizeName}已添加过`)
+    }
   }
 }
 
@@ -108,7 +122,6 @@
     orderId: props.orderId,
     sampleId: props.sampleId,
   }
-  console.log('00000检定流程，', form.measureProcessList)
   const index = form.measureProcessList.findIndex(item => !item.measureSegmentId)
   if (index !== -1) {
     ElMessage.warning(`第${index + 1}个流程：检定环节不能为空`)
@@ -119,17 +132,37 @@
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
   }
-  if (props.type == 'distribute') {
-    setMeasureProcess(form).then((res) => {
-      ElMessage.success('保存成功')
-      emits('saveOver')
-    })
+  if (props.isDept) { // 是部门检测
+    // 只能操作此用户自己的实验室
+    const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId)
+    if (index !== -1) {
+      const params = {
+        id: processList.value[index].id,
+        measurePersonId: processList.value[index].measurePersonId, // 分配检定人员id（在本部门下的计量人员列表中选择）
+        requireCertifications: processList.value[index].requireCertifications, // 应出具证书总数
+      }
+      allocate(params).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
+    else {
+      ElMessage.warning('未在列表中找到此用户的部门')
+    }
   }
-  else {
-    setMeasureProcessByFfy(form).then((res) => {
-      ElMessage.success('保存成功')
-      emits('saveOver')
-    })
+  else { // 任务分发
+    if (props.type == 'distribute') {
+      setMeasureProcess(form).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
+    else {
+      setMeasureProcessByFfy(form).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
   }
 }
 // 删除流程
@@ -147,10 +180,10 @@
       <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
         <!-- eslint-disable-next-line vue/no-unused-vars -->
         <template #item="{ process, index }">
-          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+          <process-node v-model="processList[index]" :process-list="processList" :step="index + 1" :is-dept="props.isDept" :detail="props.detail" @delete="deleteProcess(index)" />
         </template>
         <template #footer>
-          <process-node-add v-if="!props.detail" @click="processAdd" />
+          <process-node-add v-if="!props.isDept && !props.detail" @click="processAdd" />
         </template>
       </draggable>
     </div>

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 37ac73f..6b87bfd 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -61,17 +61,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center', width: '100' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' },
-  { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' },
-  { text: '委托方名称', value: 'customerName', align: 'center', width: '100' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
-  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, 'dispatch', true)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c9b7843..1baeaa3 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -186,8 +186,8 @@
   'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c3c876d..059e30b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,7 +1,7 @@
 <!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFileList, columnsType, dictType } from '../report_interface'
@@ -57,7 +57,7 @@
   taskId: '', // 任务id，用于审批
   processId: '', // 	流程实例id
   processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
-  approvalSignId: '', // 认可标志专用章id
+  approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
@@ -286,14 +286,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -530,7 +536,7 @@
       names = `${names},${item.signName}`
     }
   })
-  formInline.value.approvalSignId = ids // 认可标志专用章id
+  formInline.value.approvalSignIds = ids // 认可标志专用章id
   formInline.value.approvalSignName = names // 认可标志专用章名称
 }
 // -------------------------------------------底部-------------------------------------------
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a8d9c6e..d07ea11 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -118,28 +118,15 @@
       type: 'warning',
     },
   ).then(() => {
-    if (row.approvalStatusName === '草稿箱') {
-      draftDeleteReport({ ids: [row.id] }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
-    else { // 除草稿箱之外的删除，审批删除
-      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
+    draftDeleteReport({ ids: [row.id] }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
   })
 }
 // 取消
@@ -359,7 +346,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" /> -->
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bf473cf..bf6e42f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -59,7 +59,7 @@
   { text: '样品状态', value: 'sampleStatusName', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '备注', value: 'remark', align: 'center' },
-  { text: '检定项目', value: 'measureContent', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center', required: true },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -232,7 +232,7 @@
 
 // 检查表格第几行信息未完善
 const checkList = () => {
-  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
   if (index !== -1) {
     return index + 1
   }
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 925992b..13fe7bf 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -97,8 +97,6 @@
       return false
     }
     else {
-      console.log('111111', checkoutList.value)
-
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -174,16 +172,16 @@
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
           <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
-              <template #default="scope">
-                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-              </template>
-            </el-table-column>
             <el-table-column label="#" width="55" align="center" fixed="left">
               <template #default="scope">
                 {{ scope.$index + 1 }}
               </template>
             </el-table-column>
+            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
           </template>
         </normal-table>
       </div>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 6d6b9e7..dc4f83d 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -11,6 +11,7 @@
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
 const type = ref('distribute')
+const isDept = ref(false) // 是否是部门检测
 // 委托书-证书类别列表
 const certificationTypes = ref<dictType[]>([])
 // 获取字典值
@@ -43,7 +44,7 @@
   // 获取任务详情
   getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
     sampleDetail.value.sampleName = res.data.sampleName
-    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.mesureContent = res.data.measureContent
     sampleDetail.value.remark = res.data.remark
     sampleDetail.value.certifications = res.data.certifications.split(',')
     sampleDetail.value.measureProcessList = res.data.measureProcessList
@@ -53,9 +54,17 @@
 }
 
 // 初始化弹窗
-const initDialog = (orderid: string, sampleid: string, sampleStatus: string) => {
+/**
+ *
+ * @param orderid 委托书id
+ * @param sampleid 样品id
+ * @param sampleStatus distribute 待分发（分发到实验室）， dispatch（分配到人）
+ * @param isDeptType 是否是部门类型
+ */
+const initDialog = (orderid: string, sampleid: string, sampleStatus: string, isDeptType?: Boolean) => {
   dialogVisible.value = true
   sampleId.value = sampleid
+  isDept.value = isDeptType as boolean
   orderId.value = orderid
   if (sampleStatus === '3') { // 检测中
     type.value = 'testing'
@@ -105,17 +114,27 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled />
+        <el-input v-model="sampleDetail.mesureContent" type="textarea" autosize disabled />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
-        <el-input v-model="sampleDetail.remark" disabled />
+        <el-input v-model="sampleDetail.remark" type="textarea" autosize a disabled />
       </div>
     </div>
-    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+    <el-button v-if="!isDept" type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="saveOver" />
+    <process-config
+      v-if="orderId"
+      :key="Math.random()"
+      ref="processConfigRef"
+      :type="type"
+      :order-id="orderId"
+      :sample-id="sampleId"
+      :list="sampleDetail.measureProcessList"
+      :is-dept="isDept"
+      @save-over="saveOver"
+    />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index a67552a..27135c0 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -7,7 +7,8 @@
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
-import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+import useUserStore from '@/store/modules/user'
+import { allocate, setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
 const props = defineProps({
   type: {
     type: String,
@@ -32,8 +33,14 @@
     type: Array,
     default: () => [],
   },
+  isDept: { // 是否是部门检测
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['saveOver'])
+// 用户信息
+const user = useUserStore()
 // 默认流程节点
 const defaultProcess: IScheduleSet = {
   measurePersonId: '', // 执行人
@@ -96,7 +103,14 @@
       measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
       updateTime: '', // 流程更新时间
     }
-    processList.value.push(processTemp)
+    // 不能添加已经存在的实验室
+    const index = processList.value.findIndex(e => e.measureSegmentId === item.deptId)
+    if (index === -1) {
+      processList.value.push(processTemp)
+    }
+    else {
+      ElMessage.warning(`${item.organizeName}已添加过`)
+    }
   }
 }
 
@@ -108,7 +122,6 @@
     orderId: props.orderId,
     sampleId: props.sampleId,
   }
-  console.log('00000检定流程，', form.measureProcessList)
   const index = form.measureProcessList.findIndex(item => !item.measureSegmentId)
   if (index !== -1) {
     ElMessage.warning(`第${index + 1}个流程：检定环节不能为空`)
@@ -119,17 +132,37 @@
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
   }
-  if (props.type == 'distribute') {
-    setMeasureProcess(form).then((res) => {
-      ElMessage.success('保存成功')
-      emits('saveOver')
-    })
+  if (props.isDept) { // 是部门检测
+    // 只能操作此用户自己的实验室
+    const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId)
+    if (index !== -1) {
+      const params = {
+        id: processList.value[index].id,
+        measurePersonId: processList.value[index].measurePersonId, // 分配检定人员id（在本部门下的计量人员列表中选择）
+        requireCertifications: processList.value[index].requireCertifications, // 应出具证书总数
+      }
+      allocate(params).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
+    else {
+      ElMessage.warning('未在列表中找到此用户的部门')
+    }
   }
-  else {
-    setMeasureProcessByFfy(form).then((res) => {
-      ElMessage.success('保存成功')
-      emits('saveOver')
-    })
+  else { // 任务分发
+    if (props.type == 'distribute') {
+      setMeasureProcess(form).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
+    else {
+      setMeasureProcessByFfy(form).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
   }
 }
 // 删除流程
@@ -147,10 +180,10 @@
       <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
         <!-- eslint-disable-next-line vue/no-unused-vars -->
         <template #item="{ process, index }">
-          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+          <process-node v-model="processList[index]" :process-list="processList" :step="index + 1" :is-dept="props.isDept" :detail="props.detail" @delete="deleteProcess(index)" />
         </template>
         <template #footer>
-          <process-node-add v-if="!props.detail" @click="processAdd" />
+          <process-node-add v-if="!props.isDept && !props.detail" @click="processAdd" />
         </template>
       </draggable>
     </div>
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index fad76ab..3b6af2b 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -2,9 +2,13 @@
 import {
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import selectStaff from './selectStaff.vue'
+import useUserStore from '@/store/modules/user'
+
 // 逻辑代码
 const props = defineProps({
   // 默认数据
@@ -35,10 +39,18 @@
     type: Number,
     default: 1,
   },
+  isDept: { // 是否是部门检测
+    type: Boolean,
+    default: false,
+  },
+  processList: { // 列表
+    type: Array,
+    defalult: () => [],
+  },
 })
 const emit = defineEmits(['update:modelValue', 'delete'])
-
-// ------------定义props参数----------
+// 用户信息
+const user = useUserStore()
 const processNodeData = computed({
   get() {
     return props.modelValue
@@ -75,6 +87,7 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
+  console.log('人员选择完毕', person)
   processNodeData.value.measurePersonId = person.id
   processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
@@ -88,9 +101,15 @@
 const _selectStaffDialog = ref()
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
-  console.log(lab)
-  processNodeData.value.measureSegmentId = lab.deptId
-  processNodeData.value.measureSegment = lab.organizeName
+  const index = props.processList?.findIndex((item: any) => item.measureSegmentId === item.deptId)
+  if (index === -1) {
+    processNodeData.value.measureSegmentId = lab.deptId
+    processNodeData.value.measureSegment = lab.organizeName
+  }
+  else {
+    ElMessage.warning(`${lab.organizeName}已添加过`)
+  }
+
   // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
   // 延迟使用，因为还没挂载
   nextTick(() => {
@@ -111,10 +130,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+        <el-icon v-show="!props.isDept && (canMove && !props.detail)" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+        <el-icon v-show="!props.isDept && (canMove && !props.detail)" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -122,22 +141,29 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
-          <template v-if="deptEdit && !props.detail" #append>
-            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="props.isDept || (!deptEdit || props.detail)">
+          <template v-if="props.isDept ? false : (deptEdit && !props.detail)" #append>
+            <el-button :icon="Aim" size="small" link :disabled="props.isDept" @click="clickChoose" />
           </template>
         </el-input>
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="user.deptId !== processNodeData.measureSegmentId || !personEdit || props.detail">
           <template v-if="personEdit && !props.detail" #append>
-            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === '' || user.deptId !== processNodeData.measureSegmentId" @click="choosePerson" />
           </template>
         </el-input>
       </div>
       <div class="line">
-        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span>
+        <el-input-number
+          v-model="processNodeData.requireCertifications"
+          class="process-input"
+          size="small"
+          :disabled="user.deptId !== processNodeData.measureSegmentId || !certificationEdit || props.detail"
+        />
+        <span class="unit"> 份</span>
       </div>
       <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
@@ -149,7 +175,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+    <select-staff ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 37ac73f..6b87bfd 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -61,17 +61,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center', width: '100' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' },
-  { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' },
-  { text: '委托方名称', value: 'customerName', align: 'center', width: '100' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
-  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, 'dispatch', true)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c9b7843..1baeaa3 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -186,8 +186,8 @@
   'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c3c876d..059e30b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,7 +1,7 @@
 <!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFileList, columnsType, dictType } from '../report_interface'
@@ -57,7 +57,7 @@
   taskId: '', // 任务id，用于审批
   processId: '', // 	流程实例id
   processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
-  approvalSignId: '', // 认可标志专用章id
+  approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
@@ -286,14 +286,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -530,7 +536,7 @@
       names = `${names},${item.signName}`
     }
   })
-  formInline.value.approvalSignId = ids // 认可标志专用章id
+  formInline.value.approvalSignIds = ids // 认可标志专用章id
   formInline.value.approvalSignName = names // 认可标志专用章名称
 }
 // -------------------------------------------底部-------------------------------------------
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a8d9c6e..d07ea11 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -118,28 +118,15 @@
       type: 'warning',
     },
   ).then(() => {
-    if (row.approvalStatusName === '草稿箱') {
-      draftDeleteReport({ ids: [row.id] }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
-    else { // 除草稿箱之外的删除，审批删除
-      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
+    draftDeleteReport({ ids: [row.id] }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
   })
 }
 // 取消
@@ -359,7 +346,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" /> -->
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bf473cf..bf6e42f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -59,7 +59,7 @@
   { text: '样品状态', value: 'sampleStatusName', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '备注', value: 'remark', align: 'center' },
-  { text: '检定项目', value: 'measureContent', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center', required: true },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -232,7 +232,7 @@
 
 // 检查表格第几行信息未完善
 const checkList = () => {
-  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
   if (index !== -1) {
     return index + 1
   }
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 925992b..13fe7bf 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -97,8 +97,6 @@
       return false
     }
     else {
-      console.log('111111', checkoutList.value)
-
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -174,16 +172,16 @@
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
           <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
-              <template #default="scope">
-                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-              </template>
-            </el-table-column>
             <el-table-column label="#" width="55" align="center" fixed="left">
               <template #default="scope">
                 {{ scope.$index + 1 }}
               </template>
             </el-table-column>
+            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
           </template>
         </normal-table>
       </div>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 6d6b9e7..dc4f83d 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -11,6 +11,7 @@
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
 const type = ref('distribute')
+const isDept = ref(false) // 是否是部门检测
 // 委托书-证书类别列表
 const certificationTypes = ref<dictType[]>([])
 // 获取字典值
@@ -43,7 +44,7 @@
   // 获取任务详情
   getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
     sampleDetail.value.sampleName = res.data.sampleName
-    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.mesureContent = res.data.measureContent
     sampleDetail.value.remark = res.data.remark
     sampleDetail.value.certifications = res.data.certifications.split(',')
     sampleDetail.value.measureProcessList = res.data.measureProcessList
@@ -53,9 +54,17 @@
 }
 
 // 初始化弹窗
-const initDialog = (orderid: string, sampleid: string, sampleStatus: string) => {
+/**
+ *
+ * @param orderid 委托书id
+ * @param sampleid 样品id
+ * @param sampleStatus distribute 待分发（分发到实验室）， dispatch（分配到人）
+ * @param isDeptType 是否是部门类型
+ */
+const initDialog = (orderid: string, sampleid: string, sampleStatus: string, isDeptType?: Boolean) => {
   dialogVisible.value = true
   sampleId.value = sampleid
+  isDept.value = isDeptType as boolean
   orderId.value = orderid
   if (sampleStatus === '3') { // 检测中
     type.value = 'testing'
@@ -105,17 +114,27 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled />
+        <el-input v-model="sampleDetail.mesureContent" type="textarea" autosize disabled />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
-        <el-input v-model="sampleDetail.remark" disabled />
+        <el-input v-model="sampleDetail.remark" type="textarea" autosize a disabled />
       </div>
     </div>
-    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+    <el-button v-if="!isDept" type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="saveOver" />
+    <process-config
+      v-if="orderId"
+      :key="Math.random()"
+      ref="processConfigRef"
+      :type="type"
+      :order-id="orderId"
+      :sample-id="sampleId"
+      :list="sampleDetail.measureProcessList"
+      :is-dept="isDept"
+      @save-over="saveOver"
+    />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index a67552a..27135c0 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -7,7 +7,8 @@
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
-import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+import useUserStore from '@/store/modules/user'
+import { allocate, setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
 const props = defineProps({
   type: {
     type: String,
@@ -32,8 +33,14 @@
     type: Array,
     default: () => [],
   },
+  isDept: { // 是否是部门检测
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['saveOver'])
+// 用户信息
+const user = useUserStore()
 // 默认流程节点
 const defaultProcess: IScheduleSet = {
   measurePersonId: '', // 执行人
@@ -96,7 +103,14 @@
       measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
       updateTime: '', // 流程更新时间
     }
-    processList.value.push(processTemp)
+    // 不能添加已经存在的实验室
+    const index = processList.value.findIndex(e => e.measureSegmentId === item.deptId)
+    if (index === -1) {
+      processList.value.push(processTemp)
+    }
+    else {
+      ElMessage.warning(`${item.organizeName}已添加过`)
+    }
   }
 }
 
@@ -108,7 +122,6 @@
     orderId: props.orderId,
     sampleId: props.sampleId,
   }
-  console.log('00000检定流程，', form.measureProcessList)
   const index = form.measureProcessList.findIndex(item => !item.measureSegmentId)
   if (index !== -1) {
     ElMessage.warning(`第${index + 1}个流程：检定环节不能为空`)
@@ -119,17 +132,37 @@
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
   }
-  if (props.type == 'distribute') {
-    setMeasureProcess(form).then((res) => {
-      ElMessage.success('保存成功')
-      emits('saveOver')
-    })
+  if (props.isDept) { // 是部门检测
+    // 只能操作此用户自己的实验室
+    const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId)
+    if (index !== -1) {
+      const params = {
+        id: processList.value[index].id,
+        measurePersonId: processList.value[index].measurePersonId, // 分配检定人员id（在本部门下的计量人员列表中选择）
+        requireCertifications: processList.value[index].requireCertifications, // 应出具证书总数
+      }
+      allocate(params).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
+    else {
+      ElMessage.warning('未在列表中找到此用户的部门')
+    }
   }
-  else {
-    setMeasureProcessByFfy(form).then((res) => {
-      ElMessage.success('保存成功')
-      emits('saveOver')
-    })
+  else { // 任务分发
+    if (props.type == 'distribute') {
+      setMeasureProcess(form).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
+    else {
+      setMeasureProcessByFfy(form).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
   }
 }
 // 删除流程
@@ -147,10 +180,10 @@
       <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
         <!-- eslint-disable-next-line vue/no-unused-vars -->
         <template #item="{ process, index }">
-          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+          <process-node v-model="processList[index]" :process-list="processList" :step="index + 1" :is-dept="props.isDept" :detail="props.detail" @delete="deleteProcess(index)" />
         </template>
         <template #footer>
-          <process-node-add v-if="!props.detail" @click="processAdd" />
+          <process-node-add v-if="!props.isDept && !props.detail" @click="processAdd" />
         </template>
       </draggable>
     </div>
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index fad76ab..3b6af2b 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -2,9 +2,13 @@
 import {
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import selectStaff from './selectStaff.vue'
+import useUserStore from '@/store/modules/user'
+
 // 逻辑代码
 const props = defineProps({
   // 默认数据
@@ -35,10 +39,18 @@
     type: Number,
     default: 1,
   },
+  isDept: { // 是否是部门检测
+    type: Boolean,
+    default: false,
+  },
+  processList: { // 列表
+    type: Array,
+    defalult: () => [],
+  },
 })
 const emit = defineEmits(['update:modelValue', 'delete'])
-
-// ------------定义props参数----------
+// 用户信息
+const user = useUserStore()
 const processNodeData = computed({
   get() {
     return props.modelValue
@@ -75,6 +87,7 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
+  console.log('人员选择完毕', person)
   processNodeData.value.measurePersonId = person.id
   processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
@@ -88,9 +101,15 @@
 const _selectStaffDialog = ref()
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
-  console.log(lab)
-  processNodeData.value.measureSegmentId = lab.deptId
-  processNodeData.value.measureSegment = lab.organizeName
+  const index = props.processList?.findIndex((item: any) => item.measureSegmentId === item.deptId)
+  if (index === -1) {
+    processNodeData.value.measureSegmentId = lab.deptId
+    processNodeData.value.measureSegment = lab.organizeName
+  }
+  else {
+    ElMessage.warning(`${lab.organizeName}已添加过`)
+  }
+
   // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
   // 延迟使用，因为还没挂载
   nextTick(() => {
@@ -111,10 +130,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+        <el-icon v-show="!props.isDept && (canMove && !props.detail)" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+        <el-icon v-show="!props.isDept && (canMove && !props.detail)" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -122,22 +141,29 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
-          <template v-if="deptEdit && !props.detail" #append>
-            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="props.isDept || (!deptEdit || props.detail)">
+          <template v-if="props.isDept ? false : (deptEdit && !props.detail)" #append>
+            <el-button :icon="Aim" size="small" link :disabled="props.isDept" @click="clickChoose" />
           </template>
         </el-input>
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="user.deptId !== processNodeData.measureSegmentId || !personEdit || props.detail">
           <template v-if="personEdit && !props.detail" #append>
-            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === '' || user.deptId !== processNodeData.measureSegmentId" @click="choosePerson" />
           </template>
         </el-input>
       </div>
       <div class="line">
-        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span>
+        <el-input-number
+          v-model="processNodeData.requireCertifications"
+          class="process-input"
+          size="small"
+          :disabled="user.deptId !== processNodeData.measureSegmentId || !certificationEdit || props.detail"
+        />
+        <span class="unit"> 份</span>
       </div>
       <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
@@ -149,7 +175,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+    <select-staff ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/components/selectStaff.vue b/src/views/business/schedule/task/components/selectStaff.vue
new file mode 100644
index 0000000..77c97d8
--- /dev/null
+++ b/src/views/business/schedule/task/components/selectStaff.vue
@@ -0,0 +1,265 @@
+<!-- 选择计量人员弹窗 -->
+<script setup lang="ts" name="SelectStaffsDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import { getStaffList } from '@/api/measure/person'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  data: {
+    type: Array,
+    default: () => [],
+  },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 过滤组织
+  deptName: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '人员编号', value: 'staffNo', align: 'center' },
+  { text: '所在部门', value: 'deptId', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = reactive({
+  name: '', // 姓名
+  deptId: '', // 部门
+  administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
+  limit: 5,
+  offset: 1,
+})
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
+const jobList = ref<dictType[]>([]) // 职务列表
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+function getDict() {
+  // 获取样品属性
+  getDictByCode('administrationJob').then((response) => {
+    jobList.value = response.data
+  })
+}
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        name: item.name,
+        id: item.id,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  listQuery.deptId = props.deptId
+  loading.value = true
+  // list.value = []
+  getStaffList(listQuery).then((res) => {
+    list.value = res.data.records
+    total.value = parseInt(res.data.total)
+    loading.value = false
+  })
+}
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  // 获取列表数据
+  fetchData(true)
+  getDict()
+})
+
+defineExpose({ fetchData })
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="800px" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.name" class="short-input" placeholder="姓名" clearable />
+          </search-item>
+          <search-item>
+            <dept-select v-if="!props.deptId" v-model="listQuery.deptId" class="short-input" placeholder="所在部门" :dept-show="true" />
+          </search-item>
+          <search-item>
+            <el-select v-model="listQuery.administrationJob" class="short-input" placeholder="行政职务" clearable>
+              <el-option v-for="item in jobList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            :page-sizes="[5]"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 37ac73f..6b87bfd 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -61,17 +61,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center', width: '100' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' },
-  { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' },
-  { text: '委托方名称', value: 'customerName', align: 'center', width: '100' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
-  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, 'dispatch', true)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c9b7843..1baeaa3 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -186,8 +186,8 @@
   'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c3c876d..059e30b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,7 +1,7 @@
 <!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFileList, columnsType, dictType } from '../report_interface'
@@ -57,7 +57,7 @@
   taskId: '', // 任务id，用于审批
   processId: '', // 	流程实例id
   processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
-  approvalSignId: '', // 认可标志专用章id
+  approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
@@ -286,14 +286,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -530,7 +536,7 @@
       names = `${names},${item.signName}`
     }
   })
-  formInline.value.approvalSignId = ids // 认可标志专用章id
+  formInline.value.approvalSignIds = ids // 认可标志专用章id
   formInline.value.approvalSignName = names // 认可标志专用章名称
 }
 // -------------------------------------------底部-------------------------------------------
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a8d9c6e..d07ea11 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -118,28 +118,15 @@
       type: 'warning',
     },
   ).then(() => {
-    if (row.approvalStatusName === '草稿箱') {
-      draftDeleteReport({ ids: [row.id] }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
-    else { // 除草稿箱之外的删除，审批删除
-      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
+    draftDeleteReport({ ids: [row.id] }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
   })
 }
 // 取消
@@ -359,7 +346,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" /> -->
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bf473cf..bf6e42f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -59,7 +59,7 @@
   { text: '样品状态', value: 'sampleStatusName', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '备注', value: 'remark', align: 'center' },
-  { text: '检定项目', value: 'measureContent', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center', required: true },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -232,7 +232,7 @@
 
 // 检查表格第几行信息未完善
 const checkList = () => {
-  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
   if (index !== -1) {
     return index + 1
   }
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 925992b..13fe7bf 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -97,8 +97,6 @@
       return false
     }
     else {
-      console.log('111111', checkoutList.value)
-
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -174,16 +172,16 @@
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
           <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
-              <template #default="scope">
-                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-              </template>
-            </el-table-column>
             <el-table-column label="#" width="55" align="center" fixed="left">
               <template #default="scope">
                 {{ scope.$index + 1 }}
               </template>
             </el-table-column>
+            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
           </template>
         </normal-table>
       </div>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 6d6b9e7..dc4f83d 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -11,6 +11,7 @@
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
 const type = ref('distribute')
+const isDept = ref(false) // 是否是部门检测
 // 委托书-证书类别列表
 const certificationTypes = ref<dictType[]>([])
 // 获取字典值
@@ -43,7 +44,7 @@
   // 获取任务详情
   getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
     sampleDetail.value.sampleName = res.data.sampleName
-    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.mesureContent = res.data.measureContent
     sampleDetail.value.remark = res.data.remark
     sampleDetail.value.certifications = res.data.certifications.split(',')
     sampleDetail.value.measureProcessList = res.data.measureProcessList
@@ -53,9 +54,17 @@
 }
 
 // 初始化弹窗
-const initDialog = (orderid: string, sampleid: string, sampleStatus: string) => {
+/**
+ *
+ * @param orderid 委托书id
+ * @param sampleid 样品id
+ * @param sampleStatus distribute 待分发（分发到实验室）， dispatch（分配到人）
+ * @param isDeptType 是否是部门类型
+ */
+const initDialog = (orderid: string, sampleid: string, sampleStatus: string, isDeptType?: Boolean) => {
   dialogVisible.value = true
   sampleId.value = sampleid
+  isDept.value = isDeptType as boolean
   orderId.value = orderid
   if (sampleStatus === '3') { // 检测中
     type.value = 'testing'
@@ -105,17 +114,27 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled />
+        <el-input v-model="sampleDetail.mesureContent" type="textarea" autosize disabled />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
-        <el-input v-model="sampleDetail.remark" disabled />
+        <el-input v-model="sampleDetail.remark" type="textarea" autosize a disabled />
       </div>
     </div>
-    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+    <el-button v-if="!isDept" type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="saveOver" />
+    <process-config
+      v-if="orderId"
+      :key="Math.random()"
+      ref="processConfigRef"
+      :type="type"
+      :order-id="orderId"
+      :sample-id="sampleId"
+      :list="sampleDetail.measureProcessList"
+      :is-dept="isDept"
+      @save-over="saveOver"
+    />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index a67552a..27135c0 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -7,7 +7,8 @@
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
-import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+import useUserStore from '@/store/modules/user'
+import { allocate, setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
 const props = defineProps({
   type: {
     type: String,
@@ -32,8 +33,14 @@
     type: Array,
     default: () => [],
   },
+  isDept: { // 是否是部门检测
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['saveOver'])
+// 用户信息
+const user = useUserStore()
 // 默认流程节点
 const defaultProcess: IScheduleSet = {
   measurePersonId: '', // 执行人
@@ -96,7 +103,14 @@
       measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
       updateTime: '', // 流程更新时间
     }
-    processList.value.push(processTemp)
+    // 不能添加已经存在的实验室
+    const index = processList.value.findIndex(e => e.measureSegmentId === item.deptId)
+    if (index === -1) {
+      processList.value.push(processTemp)
+    }
+    else {
+      ElMessage.warning(`${item.organizeName}已添加过`)
+    }
   }
 }
 
@@ -108,7 +122,6 @@
     orderId: props.orderId,
     sampleId: props.sampleId,
   }
-  console.log('00000检定流程，', form.measureProcessList)
   const index = form.measureProcessList.findIndex(item => !item.measureSegmentId)
   if (index !== -1) {
     ElMessage.warning(`第${index + 1}个流程：检定环节不能为空`)
@@ -119,17 +132,37 @@
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
   }
-  if (props.type == 'distribute') {
-    setMeasureProcess(form).then((res) => {
-      ElMessage.success('保存成功')
-      emits('saveOver')
-    })
+  if (props.isDept) { // 是部门检测
+    // 只能操作此用户自己的实验室
+    const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId)
+    if (index !== -1) {
+      const params = {
+        id: processList.value[index].id,
+        measurePersonId: processList.value[index].measurePersonId, // 分配检定人员id（在本部门下的计量人员列表中选择）
+        requireCertifications: processList.value[index].requireCertifications, // 应出具证书总数
+      }
+      allocate(params).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
+    else {
+      ElMessage.warning('未在列表中找到此用户的部门')
+    }
   }
-  else {
-    setMeasureProcessByFfy(form).then((res) => {
-      ElMessage.success('保存成功')
-      emits('saveOver')
-    })
+  else { // 任务分发
+    if (props.type == 'distribute') {
+      setMeasureProcess(form).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
+    else {
+      setMeasureProcessByFfy(form).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
   }
 }
 // 删除流程
@@ -147,10 +180,10 @@
       <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
         <!-- eslint-disable-next-line vue/no-unused-vars -->
         <template #item="{ process, index }">
-          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+          <process-node v-model="processList[index]" :process-list="processList" :step="index + 1" :is-dept="props.isDept" :detail="props.detail" @delete="deleteProcess(index)" />
         </template>
         <template #footer>
-          <process-node-add v-if="!props.detail" @click="processAdd" />
+          <process-node-add v-if="!props.isDept && !props.detail" @click="processAdd" />
         </template>
       </draggable>
     </div>
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index fad76ab..3b6af2b 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -2,9 +2,13 @@
 import {
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import selectStaff from './selectStaff.vue'
+import useUserStore from '@/store/modules/user'
+
 // 逻辑代码
 const props = defineProps({
   // 默认数据
@@ -35,10 +39,18 @@
     type: Number,
     default: 1,
   },
+  isDept: { // 是否是部门检测
+    type: Boolean,
+    default: false,
+  },
+  processList: { // 列表
+    type: Array,
+    defalult: () => [],
+  },
 })
 const emit = defineEmits(['update:modelValue', 'delete'])
-
-// ------------定义props参数----------
+// 用户信息
+const user = useUserStore()
 const processNodeData = computed({
   get() {
     return props.modelValue
@@ -75,6 +87,7 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
+  console.log('人员选择完毕', person)
   processNodeData.value.measurePersonId = person.id
   processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
@@ -88,9 +101,15 @@
 const _selectStaffDialog = ref()
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
-  console.log(lab)
-  processNodeData.value.measureSegmentId = lab.deptId
-  processNodeData.value.measureSegment = lab.organizeName
+  const index = props.processList?.findIndex((item: any) => item.measureSegmentId === item.deptId)
+  if (index === -1) {
+    processNodeData.value.measureSegmentId = lab.deptId
+    processNodeData.value.measureSegment = lab.organizeName
+  }
+  else {
+    ElMessage.warning(`${lab.organizeName}已添加过`)
+  }
+
   // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
   // 延迟使用，因为还没挂载
   nextTick(() => {
@@ -111,10 +130,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+        <el-icon v-show="!props.isDept && (canMove && !props.detail)" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+        <el-icon v-show="!props.isDept && (canMove && !props.detail)" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -122,22 +141,29 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
-          <template v-if="deptEdit && !props.detail" #append>
-            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="props.isDept || (!deptEdit || props.detail)">
+          <template v-if="props.isDept ? false : (deptEdit && !props.detail)" #append>
+            <el-button :icon="Aim" size="small" link :disabled="props.isDept" @click="clickChoose" />
           </template>
         </el-input>
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="user.deptId !== processNodeData.measureSegmentId || !personEdit || props.detail">
           <template v-if="personEdit && !props.detail" #append>
-            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === '' || user.deptId !== processNodeData.measureSegmentId" @click="choosePerson" />
           </template>
         </el-input>
       </div>
       <div class="line">
-        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span>
+        <el-input-number
+          v-model="processNodeData.requireCertifications"
+          class="process-input"
+          size="small"
+          :disabled="user.deptId !== processNodeData.measureSegmentId || !certificationEdit || props.detail"
+        />
+        <span class="unit"> 份</span>
       </div>
       <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
@@ -149,7 +175,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+    <select-staff ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/components/selectStaff.vue b/src/views/business/schedule/task/components/selectStaff.vue
new file mode 100644
index 0000000..77c97d8
--- /dev/null
+++ b/src/views/business/schedule/task/components/selectStaff.vue
@@ -0,0 +1,265 @@
+<!-- 选择计量人员弹窗 -->
+<script setup lang="ts" name="SelectStaffsDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import { getStaffList } from '@/api/measure/person'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  data: {
+    type: Array,
+    default: () => [],
+  },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 过滤组织
+  deptName: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '人员编号', value: 'staffNo', align: 'center' },
+  { text: '所在部门', value: 'deptId', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = reactive({
+  name: '', // 姓名
+  deptId: '', // 部门
+  administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
+  limit: 5,
+  offset: 1,
+})
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
+const jobList = ref<dictType[]>([]) // 职务列表
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+function getDict() {
+  // 获取样品属性
+  getDictByCode('administrationJob').then((response) => {
+    jobList.value = response.data
+  })
+}
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        name: item.name,
+        id: item.id,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  listQuery.deptId = props.deptId
+  loading.value = true
+  // list.value = []
+  getStaffList(listQuery).then((res) => {
+    list.value = res.data.records
+    total.value = parseInt(res.data.total)
+    loading.value = false
+  })
+}
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  // 获取列表数据
+  fetchData(true)
+  getDict()
+})
+
+defineExpose({ fetchData })
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="800px" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.name" class="short-input" placeholder="姓名" clearable />
+          </search-item>
+          <search-item>
+            <dept-select v-if="!props.deptId" v-model="listQuery.deptId" class="short-input" placeholder="所在部门" :dept-show="true" />
+          </search-item>
+          <search-item>
+            <el-select v-model="listQuery.administrationJob" class="short-input" placeholder="行政职务" clearable>
+              <el-option v-for="item in jobList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            :page-sizes="[5]"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 25c5cf9..d58d87c 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -87,6 +87,7 @@
 }
 // 检测流程节点
 export interface IScheduleSet {
+  id?: string
   measurePersonId: string // 执行人
   measurePerson: string // 执行人名称
   measureSegmentId: string // 执行部门

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 37ac73f..6b87bfd 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -61,17 +61,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center', width: '100' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' },
-  { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' },
-  { text: '委托方名称', value: 'customerName', align: 'center', width: '100' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
-  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, 'dispatch', true)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c9b7843..1baeaa3 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -186,8 +186,8 @@
   'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c3c876d..059e30b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,7 +1,7 @@
 <!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFileList, columnsType, dictType } from '../report_interface'
@@ -57,7 +57,7 @@
   taskId: '', // 任务id，用于审批
   processId: '', // 	流程实例id
   processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
-  approvalSignId: '', // 认可标志专用章id
+  approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
@@ -286,14 +286,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -530,7 +536,7 @@
       names = `${names},${item.signName}`
     }
   })
-  formInline.value.approvalSignId = ids // 认可标志专用章id
+  formInline.value.approvalSignIds = ids // 认可标志专用章id
   formInline.value.approvalSignName = names // 认可标志专用章名称
 }
 // -------------------------------------------底部-------------------------------------------
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a8d9c6e..d07ea11 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -118,28 +118,15 @@
       type: 'warning',
     },
   ).then(() => {
-    if (row.approvalStatusName === '草稿箱') {
-      draftDeleteReport({ ids: [row.id] }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
-    else { // 除草稿箱之外的删除，审批删除
-      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
+    draftDeleteReport({ ids: [row.id] }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
   })
 }
 // 取消
@@ -359,7 +346,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" /> -->
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bf473cf..bf6e42f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -59,7 +59,7 @@
   { text: '样品状态', value: 'sampleStatusName', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '备注', value: 'remark', align: 'center' },
-  { text: '检定项目', value: 'measureContent', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center', required: true },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -232,7 +232,7 @@
 
 // 检查表格第几行信息未完善
 const checkList = () => {
-  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
   if (index !== -1) {
     return index + 1
   }
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 925992b..13fe7bf 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -97,8 +97,6 @@
       return false
     }
     else {
-      console.log('111111', checkoutList.value)
-
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -174,16 +172,16 @@
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
           <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
-              <template #default="scope">
-                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-              </template>
-            </el-table-column>
             <el-table-column label="#" width="55" align="center" fixed="left">
               <template #default="scope">
                 {{ scope.$index + 1 }}
               </template>
             </el-table-column>
+            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
           </template>
         </normal-table>
       </div>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 6d6b9e7..dc4f83d 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -11,6 +11,7 @@
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
 const type = ref('distribute')
+const isDept = ref(false) // 是否是部门检测
 // 委托书-证书类别列表
 const certificationTypes = ref<dictType[]>([])
 // 获取字典值
@@ -43,7 +44,7 @@
   // 获取任务详情
   getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
     sampleDetail.value.sampleName = res.data.sampleName
-    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.mesureContent = res.data.measureContent
     sampleDetail.value.remark = res.data.remark
     sampleDetail.value.certifications = res.data.certifications.split(',')
     sampleDetail.value.measureProcessList = res.data.measureProcessList
@@ -53,9 +54,17 @@
 }
 
 // 初始化弹窗
-const initDialog = (orderid: string, sampleid: string, sampleStatus: string) => {
+/**
+ *
+ * @param orderid 委托书id
+ * @param sampleid 样品id
+ * @param sampleStatus distribute 待分发（分发到实验室）， dispatch（分配到人）
+ * @param isDeptType 是否是部门类型
+ */
+const initDialog = (orderid: string, sampleid: string, sampleStatus: string, isDeptType?: Boolean) => {
   dialogVisible.value = true
   sampleId.value = sampleid
+  isDept.value = isDeptType as boolean
   orderId.value = orderid
   if (sampleStatus === '3') { // 检测中
     type.value = 'testing'
@@ -105,17 +114,27 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled />
+        <el-input v-model="sampleDetail.mesureContent" type="textarea" autosize disabled />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
-        <el-input v-model="sampleDetail.remark" disabled />
+        <el-input v-model="sampleDetail.remark" type="textarea" autosize a disabled />
       </div>
     </div>
-    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+    <el-button v-if="!isDept" type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="saveOver" />
+    <process-config
+      v-if="orderId"
+      :key="Math.random()"
+      ref="processConfigRef"
+      :type="type"
+      :order-id="orderId"
+      :sample-id="sampleId"
+      :list="sampleDetail.measureProcessList"
+      :is-dept="isDept"
+      @save-over="saveOver"
+    />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index a67552a..27135c0 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -7,7 +7,8 @@
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
-import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+import useUserStore from '@/store/modules/user'
+import { allocate, setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
 const props = defineProps({
   type: {
     type: String,
@@ -32,8 +33,14 @@
     type: Array,
     default: () => [],
   },
+  isDept: { // 是否是部门检测
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['saveOver'])
+// 用户信息
+const user = useUserStore()
 // 默认流程节点
 const defaultProcess: IScheduleSet = {
   measurePersonId: '', // 执行人
@@ -96,7 +103,14 @@
       measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
       updateTime: '', // 流程更新时间
     }
-    processList.value.push(processTemp)
+    // 不能添加已经存在的实验室
+    const index = processList.value.findIndex(e => e.measureSegmentId === item.deptId)
+    if (index === -1) {
+      processList.value.push(processTemp)
+    }
+    else {
+      ElMessage.warning(`${item.organizeName}已添加过`)
+    }
   }
 }
 
@@ -108,7 +122,6 @@
     orderId: props.orderId,
     sampleId: props.sampleId,
   }
-  console.log('00000检定流程，', form.measureProcessList)
   const index = form.measureProcessList.findIndex(item => !item.measureSegmentId)
   if (index !== -1) {
     ElMessage.warning(`第${index + 1}个流程：检定环节不能为空`)
@@ -119,17 +132,37 @@
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
   }
-  if (props.type == 'distribute') {
-    setMeasureProcess(form).then((res) => {
-      ElMessage.success('保存成功')
-      emits('saveOver')
-    })
+  if (props.isDept) { // 是部门检测
+    // 只能操作此用户自己的实验室
+    const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId)
+    if (index !== -1) {
+      const params = {
+        id: processList.value[index].id,
+        measurePersonId: processList.value[index].measurePersonId, // 分配检定人员id（在本部门下的计量人员列表中选择）
+        requireCertifications: processList.value[index].requireCertifications, // 应出具证书总数
+      }
+      allocate(params).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
+    else {
+      ElMessage.warning('未在列表中找到此用户的部门')
+    }
   }
-  else {
-    setMeasureProcessByFfy(form).then((res) => {
-      ElMessage.success('保存成功')
-      emits('saveOver')
-    })
+  else { // 任务分发
+    if (props.type == 'distribute') {
+      setMeasureProcess(form).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
+    else {
+      setMeasureProcessByFfy(form).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
   }
 }
 // 删除流程
@@ -147,10 +180,10 @@
       <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
         <!-- eslint-disable-next-line vue/no-unused-vars -->
         <template #item="{ process, index }">
-          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+          <process-node v-model="processList[index]" :process-list="processList" :step="index + 1" :is-dept="props.isDept" :detail="props.detail" @delete="deleteProcess(index)" />
         </template>
         <template #footer>
-          <process-node-add v-if="!props.detail" @click="processAdd" />
+          <process-node-add v-if="!props.isDept && !props.detail" @click="processAdd" />
         </template>
       </draggable>
     </div>
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index fad76ab..3b6af2b 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -2,9 +2,13 @@
 import {
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import selectStaff from './selectStaff.vue'
+import useUserStore from '@/store/modules/user'
+
 // 逻辑代码
 const props = defineProps({
   // 默认数据
@@ -35,10 +39,18 @@
     type: Number,
     default: 1,
   },
+  isDept: { // 是否是部门检测
+    type: Boolean,
+    default: false,
+  },
+  processList: { // 列表
+    type: Array,
+    defalult: () => [],
+  },
 })
 const emit = defineEmits(['update:modelValue', 'delete'])
-
-// ------------定义props参数----------
+// 用户信息
+const user = useUserStore()
 const processNodeData = computed({
   get() {
     return props.modelValue
@@ -75,6 +87,7 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
+  console.log('人员选择完毕', person)
   processNodeData.value.measurePersonId = person.id
   processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
@@ -88,9 +101,15 @@
 const _selectStaffDialog = ref()
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
-  console.log(lab)
-  processNodeData.value.measureSegmentId = lab.deptId
-  processNodeData.value.measureSegment = lab.organizeName
+  const index = props.processList?.findIndex((item: any) => item.measureSegmentId === item.deptId)
+  if (index === -1) {
+    processNodeData.value.measureSegmentId = lab.deptId
+    processNodeData.value.measureSegment = lab.organizeName
+  }
+  else {
+    ElMessage.warning(`${lab.organizeName}已添加过`)
+  }
+
   // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
   // 延迟使用，因为还没挂载
   nextTick(() => {
@@ -111,10 +130,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+        <el-icon v-show="!props.isDept && (canMove && !props.detail)" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+        <el-icon v-show="!props.isDept && (canMove && !props.detail)" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -122,22 +141,29 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
-          <template v-if="deptEdit && !props.detail" #append>
-            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="props.isDept || (!deptEdit || props.detail)">
+          <template v-if="props.isDept ? false : (deptEdit && !props.detail)" #append>
+            <el-button :icon="Aim" size="small" link :disabled="props.isDept" @click="clickChoose" />
           </template>
         </el-input>
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="user.deptId !== processNodeData.measureSegmentId || !personEdit || props.detail">
           <template v-if="personEdit && !props.detail" #append>
-            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === '' || user.deptId !== processNodeData.measureSegmentId" @click="choosePerson" />
           </template>
         </el-input>
       </div>
       <div class="line">
-        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span>
+        <el-input-number
+          v-model="processNodeData.requireCertifications"
+          class="process-input"
+          size="small"
+          :disabled="user.deptId !== processNodeData.measureSegmentId || !certificationEdit || props.detail"
+        />
+        <span class="unit"> 份</span>
       </div>
       <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
@@ -149,7 +175,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+    <select-staff ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/components/selectStaff.vue b/src/views/business/schedule/task/components/selectStaff.vue
new file mode 100644
index 0000000..77c97d8
--- /dev/null
+++ b/src/views/business/schedule/task/components/selectStaff.vue
@@ -0,0 +1,265 @@
+<!-- 选择计量人员弹窗 -->
+<script setup lang="ts" name="SelectStaffsDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import { getStaffList } from '@/api/measure/person'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  data: {
+    type: Array,
+    default: () => [],
+  },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 过滤组织
+  deptName: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '人员编号', value: 'staffNo', align: 'center' },
+  { text: '所在部门', value: 'deptId', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = reactive({
+  name: '', // 姓名
+  deptId: '', // 部门
+  administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
+  limit: 5,
+  offset: 1,
+})
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
+const jobList = ref<dictType[]>([]) // 职务列表
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+function getDict() {
+  // 获取样品属性
+  getDictByCode('administrationJob').then((response) => {
+    jobList.value = response.data
+  })
+}
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        name: item.name,
+        id: item.id,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  listQuery.deptId = props.deptId
+  loading.value = true
+  // list.value = []
+  getStaffList(listQuery).then((res) => {
+    list.value = res.data.records
+    total.value = parseInt(res.data.total)
+    loading.value = false
+  })
+}
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  // 获取列表数据
+  fetchData(true)
+  getDict()
+})
+
+defineExpose({ fetchData })
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="800px" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.name" class="short-input" placeholder="姓名" clearable />
+          </search-item>
+          <search-item>
+            <dept-select v-if="!props.deptId" v-model="listQuery.deptId" class="short-input" placeholder="所在部门" :dept-show="true" />
+          </search-item>
+          <search-item>
+            <el-select v-model="listQuery.administrationJob" class="short-input" placeholder="行政职务" clearable>
+              <el-option v-for="item in jobList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            :page-sizes="[5]"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 25c5cf9..d58d87c 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -87,6 +87,7 @@
 }
 // 检测流程节点
 export interface IScheduleSet {
+  id?: string
   measurePersonId: string // 执行人
   measurePerson: string // 执行人名称
   measureSegmentId: string // 执行部门
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7159350..3db238a 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -219,9 +219,6 @@
     taskForm.value.measureContent = res.data.measureContent // 检定项目
     taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
     taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
-    console.log('pppppp')
-    console.log(taskForm.value.measureProcessList)
-
     // 改用一个接口获取
     sampleForm.value = res.data
   })

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index ebf033a..a1eb4e6 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -88,7 +88,7 @@
 }
 
 // 分配
-export function allocate(data: { id: string; measurePersonId: string; requireCertifications: string }) {
+export function allocate(data: any) {
   return request({
     url: '/business/labExecutive/deptExecutive/allocate',
     method: 'post',
@@ -141,27 +141,27 @@
 }
 
 // 证书监控
-export function certificateMonitorsById(data: object) {
+export function certificateMonitorsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateMonitorsById',
+    url: `/business/certificateReport/certificateMonitorsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定记录
-export function measureRecordsById(data: object) {
+export function measureRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/customer/sample/measureRecordsById',
+    url: `/customer/sample/measureRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
 // 检定证书
-export function certificateRecordsById(data: object) {
+export function certificateRecordsById(data: { offset: number; limit: number }) {
   return request({
-    url: '/business/certificateReport/certificateRecordsById',
+    url: `/business/certificateReport/certificateRecordsById?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index 9cf2b29..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    DeptSelectByName: typeof import('./components/DeptSelectByName/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 53e8373..8f4e411 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -19,15 +19,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationReportName', align: 'center' },
   { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
   { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center' },
-  { text: '完成时间', value: 'text', align: 'center' },
+  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
+  { text: '完成时间', value: 'text', align: 'center', width: '180' },
   { text: '退回次数', value: 'text', align: 'center' },
   { text: '制作人', value: 'text', align: 'center' },
 ])
@@ -42,23 +44,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 0923ff5..332a97c 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -28,15 +28,17 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationCode', align: 'center' },
+  { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
   { text: '证书类型', value: 'certificationType', align: 'center' },
-  { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center' },
+  { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
+  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -45,22 +47,51 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
     <normal-table
-      :data="list" :total="total" :columns="columns"
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
       :list-loading="loading"
-      :pagination="false"
-    />
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index b7b2dbc..34cd405 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -20,6 +20,8 @@
 const searchQuery = ref({
   sampleId: props.sampleId,
   customerId: props.customerId,
+  limit: 10,
+  offset: 1,
 })
 
 // 检定记录
@@ -34,12 +36,12 @@
 
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '委托单编号', value: 'orderCode', align: 'center' },
-  { text: '委托单日期', value: 'orderTime', align: 'center' },
-  { text: '委托方代码', value: 'customerCode', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center', width: '160' },
+  { text: '委托单日期', value: 'orderTime', align: 'center', width: '120' },
+  { text: '委托方代码', value: 'customerCode', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '送检日期', value: 'deliverTime', align: 'center' },
+  { text: '送检日期', value: 'deliverTime', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -48,19 +50,52 @@
 // 加载状态
 const loading = ref(false)
 // 查找证书状态及列表
-function fetchData() {
+function fetchData(isNowPage = false) {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
     list.value = res.data.rows
+    total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
 fetchData()
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
   <div>
-    <normal-table :data="list" :total="total" :columns="columns" :list-loading="loading" :pagination="false" />
+    <normal-table
+      :data="list"
+      :total="total"
+      :query="searchQuery"
+      :columns="columns"
+      :list-loading="loading"
+      :pagination="true"
+      :page-sizes="[10, 20, 30]"
+      @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
   </div>
 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..7f578d7 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -72,14 +72,6 @@
 const closeDialog = () => {
   emits('update:visible', false)
 }
-const visibleDialog = computed({
-  get() {
-    return props.visible
-  },
-  set() {
-    closeDialog()
-  },
-})
 
 watch(() => props.visible, (val) => {
   // 清除上次选中
@@ -122,6 +114,8 @@
   loading.value = true
   // list.value = []
   getStaffList(listQuery).then((res) => {
+    console.log('000000', res.data.records)
+
     list.value = res.data.records.filter((item: any) => {
       if (props.deptName) {
         return item.deptId === props.deptName
@@ -130,14 +124,20 @@
         return item
       }
     })
-    console.log(props.deptName)
-    console.log(props.deptId)
-    console.log(list.value)
     total.value = parseInt(res.data.total)
     loading.value = false
+    console.log('11111', list.value)
   })
 }
-
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
 // 多选
 const multiSelect = (val: any) => {
   multipleTable.value = val
@@ -204,28 +204,28 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column v-if="!props.multi" label="" width="40" align="center">
-                <template #default="scope">
-                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-                </template>
-              </el-table-column>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
           </normal-table>
         </table-container>
       </div>
       <!-- </div> -->
       <template #footer>
-        <el-button @click="closeDialog">
-          取 消
-        </el-button>
         <el-button type="primary" @click="saveDialog">
           确 定
         </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 37ac73f..6b87bfd 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -61,17 +61,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '180', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center', width: '100' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center', width: '100' },
-  { text: '委托书编号', value: 'orderNo', align: 'center', width: '180' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '180' },
-  { text: '委托方名称', value: 'customerName', align: 'center', width: '100' },
-  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
-  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '120' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -137,7 +137,7 @@
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, row.sampleStatus)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId, 'dispatch', true)
 }
 // 点击标签绑定
 const barCodeBind = ref()
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c9b7843..1baeaa3 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -186,8 +186,8 @@
   'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
   'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  // 'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c3c876d..059e30b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,7 +1,7 @@
 <!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFileList, columnsType, dictType } from '../report_interface'
@@ -57,7 +57,7 @@
   taskId: '', // 任务id，用于审批
   processId: '', // 	流程实例id
   processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
-  approvalSignId: '', // 认可标志专用章id
+  approvalSignIds: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
   approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
@@ -286,14 +286,20 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
         ElMessage.error(res.message)
+        loading.close()
       }
     })
   }
@@ -530,7 +536,7 @@
       names = `${names},${item.signName}`
     }
   })
-  formInline.value.approvalSignId = ids // 认可标志专用章id
+  formInline.value.approvalSignIds = ids // 认可标志专用章id
   formInline.value.approvalSignName = names // 认可标志专用章名称
 }
 // -------------------------------------------底部-------------------------------------------
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index a8d9c6e..d07ea11 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -118,28 +118,15 @@
       type: 'warning',
     },
   ).then(() => {
-    if (row.approvalStatusName === '草稿箱') {
-      draftDeleteReport({ ids: [row.id] }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
-    else { // 除草稿箱之外的删除，审批删除
-      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    }
+    draftDeleteReport({ ids: [row.id] }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
   })
 }
 // 取消
@@ -359,7 +346,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" /> -->
+        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index bf473cf..bf6e42f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -59,7 +59,7 @@
   { text: '样品状态', value: 'sampleStatusName', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '备注', value: 'remark', align: 'center' },
-  { text: '检定项目', value: 'measureContent', align: 'center' },
+  { text: '检定项目', value: 'measureContent', align: 'center', required: true },
 ])
 
 // 自定义校验规则--要求检完时间不能比预计送达时间大
@@ -232,7 +232,7 @@
 
 // 检查表格第几行信息未完善
 const checkList = () => {
-  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage))
+  const index = list.value.findIndex(item => (!item.sampleNo || item.sampleNo === '系统自动生成') && (!item.sampleName || !item.sampleModel || !item.manufacturingNo || !item.powerVoltage || !item.measureContent))
   if (index !== -1) {
     return index + 1
   }
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 925992b..13fe7bf 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -97,8 +97,6 @@
       return false
     }
     else {
-      console.log('111111', checkoutList.value)
-
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -174,16 +172,16 @@
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
           <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
-              <template #default="scope">
-                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
-              </template>
-            </el-table-column>
             <el-table-column label="#" width="55" align="center" fixed="left">
               <template #default="scope">
                 {{ scope.$index + 1 }}
               </template>
             </el-table-column>
+            <el-table-column v-if="!multi" label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
           </template>
         </normal-table>
       </div>
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index 6d6b9e7..dc4f83d 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -11,6 +11,7 @@
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
 const type = ref('distribute')
+const isDept = ref(false) // 是否是部门检测
 // 委托书-证书类别列表
 const certificationTypes = ref<dictType[]>([])
 // 获取字典值
@@ -43,7 +44,7 @@
   // 获取任务详情
   getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
     sampleDetail.value.sampleName = res.data.sampleName
-    sampleDetail.value.mesureContent = res.data.mesureContent
+    sampleDetail.value.mesureContent = res.data.measureContent
     sampleDetail.value.remark = res.data.remark
     sampleDetail.value.certifications = res.data.certifications.split(',')
     sampleDetail.value.measureProcessList = res.data.measureProcessList
@@ -53,9 +54,17 @@
 }
 
 // 初始化弹窗
-const initDialog = (orderid: string, sampleid: string, sampleStatus: string) => {
+/**
+ *
+ * @param orderid 委托书id
+ * @param sampleid 样品id
+ * @param sampleStatus distribute 待分发（分发到实验室）， dispatch（分配到人）
+ * @param isDeptType 是否是部门类型
+ */
+const initDialog = (orderid: string, sampleid: string, sampleStatus: string, isDeptType?: Boolean) => {
   dialogVisible.value = true
   sampleId.value = sampleid
+  isDept.value = isDeptType as boolean
   orderId.value = orderid
   if (sampleStatus === '3') { // 检测中
     type.value = 'testing'
@@ -105,17 +114,27 @@
       </div>
       <div class="simple-info-line">
         <span class="label">检定项目:</span>
-        <el-input v-model="sampleDetail.mesureContent" disabled />
+        <el-input v-model="sampleDetail.mesureContent" type="textarea" autosize disabled />
       </div>
       <div class="simple-info-line">
         <span class="label">备注:</span>
-        <el-input v-model="sampleDetail.remark" disabled />
+        <el-input v-model="sampleDetail.remark" type="textarea" autosize a disabled />
       </div>
     </div>
-    <el-button type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
+    <el-button v-if="!isDept" type="primary" style="margin-top: 5px; margin-bottom: 10px;" @click="batchProcessAdd">
       批量添加
     </el-button>
-    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="saveOver" />
+    <process-config
+      v-if="orderId"
+      :key="Math.random()"
+      ref="processConfigRef"
+      :type="type"
+      :order-id="orderId"
+      :sample-id="sampleId"
+      :list="sampleDetail.measureProcessList"
+      :is-dept="isDept"
+      @save-over="saveOver"
+    />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index a67552a..27135c0 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -7,7 +7,8 @@
 import ProcessNodeAdd from './processNodeAdd.vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
-import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+import useUserStore from '@/store/modules/user'
+import { allocate, setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
 const props = defineProps({
   type: {
     type: String,
@@ -32,8 +33,14 @@
     type: Array,
     default: () => [],
   },
+  isDept: { // 是否是部门检测
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['saveOver'])
+// 用户信息
+const user = useUserStore()
 // 默认流程节点
 const defaultProcess: IScheduleSet = {
   measurePersonId: '', // 执行人
@@ -96,7 +103,14 @@
       measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
       updateTime: '', // 流程更新时间
     }
-    processList.value.push(processTemp)
+    // 不能添加已经存在的实验室
+    const index = processList.value.findIndex(e => e.measureSegmentId === item.deptId)
+    if (index === -1) {
+      processList.value.push(processTemp)
+    }
+    else {
+      ElMessage.warning(`${item.organizeName}已添加过`)
+    }
   }
 }
 
@@ -108,7 +122,6 @@
     orderId: props.orderId,
     sampleId: props.sampleId,
   }
-  console.log('00000检定流程，', form.measureProcessList)
   const index = form.measureProcessList.findIndex(item => !item.measureSegmentId)
   if (index !== -1) {
     ElMessage.warning(`第${index + 1}个流程：检定环节不能为空`)
@@ -119,17 +132,37 @@
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
   }
-  if (props.type == 'distribute') {
-    setMeasureProcess(form).then((res) => {
-      ElMessage.success('保存成功')
-      emits('saveOver')
-    })
+  if (props.isDept) { // 是部门检测
+    // 只能操作此用户自己的实验室
+    const index = processList.value.findIndex(item => item.measureSegmentId === user.deptId)
+    if (index !== -1) {
+      const params = {
+        id: processList.value[index].id,
+        measurePersonId: processList.value[index].measurePersonId, // 分配检定人员id（在本部门下的计量人员列表中选择）
+        requireCertifications: processList.value[index].requireCertifications, // 应出具证书总数
+      }
+      allocate(params).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
+    else {
+      ElMessage.warning('未在列表中找到此用户的部门')
+    }
   }
-  else {
-    setMeasureProcessByFfy(form).then((res) => {
-      ElMessage.success('保存成功')
-      emits('saveOver')
-    })
+  else { // 任务分发
+    if (props.type == 'distribute') {
+      setMeasureProcess(form).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
+    else {
+      setMeasureProcessByFfy(form).then((res) => {
+        ElMessage.success('保存成功')
+        emits('saveOver')
+      })
+    }
   }
 }
 // 删除流程
@@ -147,10 +180,10 @@
       <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
         <!-- eslint-disable-next-line vue/no-unused-vars -->
         <template #item="{ process, index }">
-          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+          <process-node v-model="processList[index]" :process-list="processList" :step="index + 1" :is-dept="props.isDept" :detail="props.detail" @delete="deleteProcess(index)" />
         </template>
         <template #footer>
-          <process-node-add v-if="!props.detail" @click="processAdd" />
+          <process-node-add v-if="!props.isDept && !props.detail" @click="processAdd" />
         </template>
       </draggable>
     </div>
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index fad76ab..3b6af2b 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -2,9 +2,13 @@
 import {
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import chooseLab from './chooseLab.vue'
 import type { ILabList } from './lab-interface'
+import selectStaff from './selectStaff.vue'
+import useUserStore from '@/store/modules/user'
+
 // 逻辑代码
 const props = defineProps({
   // 默认数据
@@ -35,10 +39,18 @@
     type: Number,
     default: 1,
   },
+  isDept: { // 是否是部门检测
+    type: Boolean,
+    default: false,
+  },
+  processList: { // 列表
+    type: Array,
+    defalult: () => [],
+  },
 })
 const emit = defineEmits(['update:modelValue', 'delete'])
-
-// ------------定义props参数----------
+// 用户信息
+const user = useUserStore()
 const processNodeData = computed({
   get() {
     return props.modelValue
@@ -75,6 +87,7 @@
 }
 // 人员选择完毕
 const choosePersonOver = (person: { id: string; name: string }) => {
+  console.log('人员选择完毕', person)
   processNodeData.value.measurePersonId = person.id
   processNodeData.value.measurePerson = person.name
   choosePersonShow.value = false
@@ -88,9 +101,15 @@
 const _selectStaffDialog = ref()
 // 实验室选择完毕
 const chooseOver = (lab: ILabList) => {
-  console.log(lab)
-  processNodeData.value.measureSegmentId = lab.deptId
-  processNodeData.value.measureSegment = lab.organizeName
+  const index = props.processList?.findIndex((item: any) => item.measureSegmentId === item.deptId)
+  if (index === -1) {
+    processNodeData.value.measureSegmentId = lab.deptId
+    processNodeData.value.measureSegment = lab.organizeName
+  }
+  else {
+    ElMessage.warning(`${lab.organizeName}已添加过`)
+  }
+
   // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
   // 延迟使用，因为还没挂载
   nextTick(() => {
@@ -111,10 +130,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+        <el-icon v-show="!props.isDept && (canMove && !props.detail)" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+        <el-icon v-show="!props.isDept && (canMove && !props.detail)" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -122,22 +141,29 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
-          <template v-if="deptEdit && !props.detail" #append>
-            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="props.isDept || (!deptEdit || props.detail)">
+          <template v-if="props.isDept ? false : (deptEdit && !props.detail)" #append>
+            <el-button :icon="Aim" size="small" link :disabled="props.isDept" @click="clickChoose" />
           </template>
         </el-input>
       </div>
       <div class="line">
         <span class="label">检定人员</span>
-        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="user.deptId !== processNodeData.measureSegmentId || !personEdit || props.detail">
           <template v-if="personEdit && !props.detail" #append>
-            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === '' || user.deptId !== processNodeData.measureSegmentId" @click="choosePerson" />
           </template>
         </el-input>
       </div>
       <div class="line">
-        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span>
+        <el-input-number
+          v-model="processNodeData.requireCertifications"
+          class="process-input"
+          size="small"
+          :disabled="user.deptId !== processNodeData.measureSegmentId || !certificationEdit || props.detail"
+        />
+        <span class="unit"> 份</span>
       </div>
       <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
@@ -149,7 +175,7 @@
     <!-- 选择实验室弹窗 -->
     <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
     <!-- 成员弹框 -->
-    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+    <select-staff ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
diff --git a/src/views/business/schedule/task/components/selectStaff.vue b/src/views/business/schedule/task/components/selectStaff.vue
new file mode 100644
index 0000000..77c97d8
--- /dev/null
+++ b/src/views/business/schedule/task/components/selectStaff.vue
@@ -0,0 +1,265 @@
+<!-- 选择计量人员弹窗 -->
+<script setup lang="ts" name="SelectStaffsDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
+import { getStaffList } from '@/api/measure/person'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  data: {
+    type: Array,
+    default: () => [],
+  },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 过滤组织
+  deptName: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
+})
+const emits = defineEmits(['update:visible', 'change'])
+const table = ref() // 表格ref
+
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '人员编号', value: 'staffNo', align: 'center' },
+  { text: '所在部门', value: 'deptId', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IEmployees[]>([])
+
+const loading = ref(false)
+const total = ref(0)
+// 查询参数
+const listQuery = reactive({
+  name: '', // 姓名
+  deptId: '', // 部门
+  administrationJob: '', // 行政职务
+  major: '', // 专业
+  staffNo: '', // 人员编号
+  limit: 5,
+  offset: 1,
+})
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
+const jobList = ref<dictType[]>([]) // 职务列表
+// 多选的数据
+const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+
+watch(() => props.visible, (val) => {
+  // 清除上次选中
+  if (!val) {
+    table.value.clearMulti()
+  }
+})
+function getDict() {
+  // 获取样品属性
+  getDictByCode('administrationJob').then((response) => {
+    jobList.value = response.data
+  })
+}
+// 点击确定，保存选择的成员配置
+const saveDialog = () => {
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        name: item.name,
+        id: item.id,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
+}
+
+const select = ref('')
+// 获取列表数据
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  listQuery.deptId = props.deptId
+  loading.value = true
+  // list.value = []
+  getStaffList(listQuery).then((res) => {
+    list.value = res.data.records
+    total.value = parseInt(res.data.total)
+    loading.value = false
+  })
+}
+const visibleDialog = computed({
+  get() {
+    fetchData(true)
+    return props.visible
+  },
+  set() {
+    closeDialog()
+  },
+})
+// 多选
+const multiSelect = (val: any) => {
+  multipleTable.value = val
+}
+
+// 查询数据
+const search = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+
+onMounted(() => {
+  // 获取列表数据
+  fetchData(true)
+  getDict()
+})
+
+defineExpose({ fetchData })
+</script>
+
+<template>
+  <div class="select-emplotees-dialog">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="800px" append-to-body custom-class="chengyuan-dialog promoter_person">
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table-area">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.name" class="short-input" placeholder="姓名" clearable />
+          </search-item>
+          <search-item>
+            <dept-select v-if="!props.deptId" v-model="listQuery.deptId" class="short-input" placeholder="所在部门" :dept-show="true" />
+          </search-item>
+          <search-item>
+            <el-select v-model="listQuery.administrationJob" class="short-input" placeholder="行政职务" clearable>
+              <el-option v-for="item in jobList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </search-item>
+        </search-area>
+        <!-- 表头标题 -->
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
+          <!-- 查询结果Table显示 -->
+          <normal-table
+            ref="table"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            :page-sizes="[5]"
+            @change="changePage"
+            @multi-select="multiSelect"
+          >
+            <!-- 序号 -->
+            <template #preColumns>
+              <el-table-column label="#" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+      <!-- </div> -->
+      <template #footer>
+        <el-button type="primary" @click="saveDialog">
+          确 定
+        </el-button>
+        <el-button @click="closeDialog">
+          取 消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss">
+@import "@/css/dialog.css";
+
+.chengyuan-dialog {
+  .el-table .cell {
+    white-space: nowrap;
+  }
+
+  .el-dialog__body {
+    display: flex;
+    overflow: auto;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.chengyuan-dialog {
+  width: 100%;
+
+  .left-container {
+    white-space: nowrap;
+    height: 100%;
+  }
+
+  .table-area {
+    flex: 1;
+    overflow: auto;
+
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
+    .pagination {
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 25c5cf9..d58d87c 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -87,6 +87,7 @@
 }
 // 检测流程节点
 export interface IScheduleSet {
+  id?: string
   measurePersonId: string // 执行人
   measurePerson: string // 执行人名称
   measureSegmentId: string // 执行部门
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 7159350..3db238a 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -219,9 +219,6 @@
     taskForm.value.measureContent = res.data.measureContent // 检定项目
     taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
     taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
-    console.log('pppppp')
-    console.log(taskForm.value.measureProcessList)
-
     // 改用一个接口获取
     sampleForm.value = res.data
   })
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 20b2c4f..e8b4a37 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -463,10 +463,10 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="addRow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button v-if="pageType === 'detail'" type="info" @click="deleteList">
+        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
           删除行
         </el-button>
       </template>