diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 50cf032..a9841f0 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -131,3 +131,11 @@
     data,
   })
 }
+// 工作培训记录
+export function getStaffCultivateLog(data: { id: string }) {
+  return request({
+    url: '/staff/staffCultivateLog',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 50cf032..a9841f0 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -131,3 +131,11 @@
     data,
   })
 }
+// 工作培训记录
+export function getStaffCultivateLog(data: { id: string }) {
+  return request({
+    url: '/staff/staffCultivateLog',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 0dcebfc..925992b 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -94,8 +94,11 @@
         message: '请选择至少一个实验室',
         type: 'warning',
       })
+      return false
     }
     else {
+      console.log('111111', checkoutList.value)
+
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -105,6 +108,7 @@
         message: '请选择检定实验室',
         type: 'warning',
       })
+      return false
     }
     else {
       const checkValue = list.value.find(item => item.id == singleChecked.value)
@@ -127,7 +131,7 @@
 
 <template>
   <div class="choose-lab-dialog">
-    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -161,23 +165,25 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
+          :is-showmulti-select="multi"
+          :height="300"
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
-          <template v-if="!multi" #preColumns>
+          <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 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/measure/person.ts b/src/api/measure/person.ts
index 50cf032..a9841f0 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -131,3 +131,11 @@
     data,
   })
 }
+// 工作培训记录
+export function getStaffCultivateLog(data: { id: string }) {
+  return request({
+    url: '/staff/staffCultivateLog',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 0dcebfc..925992b 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -94,8 +94,11 @@
         message: '请选择至少一个实验室',
         type: 'warning',
       })
+      return false
     }
     else {
+      console.log('111111', checkoutList.value)
+
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -105,6 +108,7 @@
         message: '请选择检定实验室',
         type: 'warning',
       })
+      return false
     }
     else {
       const checkValue = list.value.find(item => item.id == singleChecked.value)
@@ -127,7 +131,7 @@
 
 <template>
   <div class="choose-lab-dialog">
-    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -161,23 +165,25 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
+          :is-showmulti-select="multi"
+          :height="300"
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
-          <template v-if="!multi" #preColumns>
+          <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 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 d342a64..6d6b9e7 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -6,7 +6,7 @@
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', 'saveOver'])
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
@@ -75,11 +75,15 @@
 // 保存流程按钮点击
 const saveProcess = () => {
   processConfigRef.value.saveProcess()
-  emit('close')
 }
 function cancel() {
   dialogVisible.value = false
 }
+// 保存流程成功
+const saveOver = () => {
+  dialogVisible.value = false
+  emit('close')
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -111,7 +115,7 @@
     <el-button 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="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @save-over="saveOver" />
     <template #footer>
       <el-button type="primary" @click="saveProcess">
         确定

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 50cf032..a9841f0 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -131,3 +131,11 @@
     data,
   })
 }
+// 工作培训记录
+export function getStaffCultivateLog(data: { id: string }) {
+  return request({
+    url: '/staff/staffCultivateLog',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 0dcebfc..925992b 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -94,8 +94,11 @@
         message: '请选择至少一个实验室',
         type: 'warning',
       })
+      return false
     }
     else {
+      console.log('111111', checkoutList.value)
+
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -105,6 +108,7 @@
         message: '请选择检定实验室',
         type: 'warning',
       })
+      return false
     }
     else {
       const checkValue = list.value.find(item => item.id == singleChecked.value)
@@ -127,7 +131,7 @@
 
 <template>
   <div class="choose-lab-dialog">
-    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -161,23 +165,25 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
+          :is-showmulti-select="multi"
+          :height="300"
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
-          <template v-if="!multi" #preColumns>
+          <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 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 d342a64..6d6b9e7 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -6,7 +6,7 @@
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', 'saveOver'])
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
@@ -75,11 +75,15 @@
 // 保存流程按钮点击
 const saveProcess = () => {
   processConfigRef.value.saveProcess()
-  emit('close')
 }
 function cancel() {
   dialogVisible.value = false
 }
+// 保存流程成功
+const saveOver = () => {
+  dialogVisible.value = false
+  emit('close')
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -111,7 +115,7 @@
     <el-button 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="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @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 bb66076..a67552a 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -108,6 +108,13 @@
     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}个流程：检定环节不能为空`)
+    return false
+  }
+
   // 处理顺序
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 50cf032..a9841f0 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -131,3 +131,11 @@
     data,
   })
 }
+// 工作培训记录
+export function getStaffCultivateLog(data: { id: string }) {
+  return request({
+    url: '/staff/staffCultivateLog',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 0dcebfc..925992b 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -94,8 +94,11 @@
         message: '请选择至少一个实验室',
         type: 'warning',
       })
+      return false
     }
     else {
+      console.log('111111', checkoutList.value)
+
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -105,6 +108,7 @@
         message: '请选择检定实验室',
         type: 'warning',
       })
+      return false
     }
     else {
       const checkValue = list.value.find(item => item.id == singleChecked.value)
@@ -127,7 +131,7 @@
 
 <template>
   <div class="choose-lab-dialog">
-    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -161,23 +165,25 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
+          :is-showmulti-select="multi"
+          :height="300"
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
-          <template v-if="!multi" #preColumns>
+          <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 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 d342a64..6d6b9e7 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -6,7 +6,7 @@
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', 'saveOver'])
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
@@ -75,11 +75,15 @@
 // 保存流程按钮点击
 const saveProcess = () => {
   processConfigRef.value.saveProcess()
-  emit('close')
 }
 function cancel() {
   dialogVisible.value = false
 }
+// 保存流程成功
+const saveOver = () => {
+  dialogVisible.value = false
+  emit('close')
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -111,7 +115,7 @@
     <el-button 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="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @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 bb66076..a67552a 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -108,6 +108,13 @@
     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}个流程：检定环节不能为空`)
+    return false
+  }
+
   // 处理顺序
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 07b2296..f995313 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -115,7 +115,7 @@
   ruleForm.createUserId = ''
   effectiveStatusName.value = ''
 }
-// 提交
+// 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 50cf032..a9841f0 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -131,3 +131,11 @@
     data,
   })
 }
+// 工作培训记录
+export function getStaffCultivateLog(data: { id: string }) {
+  return request({
+    url: '/staff/staffCultivateLog',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 0dcebfc..925992b 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -94,8 +94,11 @@
         message: '请选择至少一个实验室',
         type: 'warning',
       })
+      return false
     }
     else {
+      console.log('111111', checkoutList.value)
+
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -105,6 +108,7 @@
         message: '请选择检定实验室',
         type: 'warning',
       })
+      return false
     }
     else {
       const checkValue = list.value.find(item => item.id == singleChecked.value)
@@ -127,7 +131,7 @@
 
 <template>
   <div class="choose-lab-dialog">
-    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -161,23 +165,25 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
+          :is-showmulti-select="multi"
+          :height="300"
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
-          <template v-if="!multi" #preColumns>
+          <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 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 d342a64..6d6b9e7 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -6,7 +6,7 @@
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', 'saveOver'])
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
@@ -75,11 +75,15 @@
 // 保存流程按钮点击
 const saveProcess = () => {
   processConfigRef.value.saveProcess()
-  emit('close')
 }
 function cancel() {
   dialogVisible.value = false
 }
+// 保存流程成功
+const saveOver = () => {
+  dialogVisible.value = false
+  emit('close')
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -111,7 +115,7 @@
     <el-button 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="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @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 bb66076..a67552a 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -108,6 +108,13 @@
     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}个流程：检定环节不能为空`)
+    return false
+  }
+
   // 处理顺序
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 07b2296..f995313 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -115,7 +115,7 @@
   ruleForm.createUserId = ''
   effectiveStatusName.value = ''
 }
-// 提交
+// 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e19a555..1c03550 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -12,12 +12,16 @@
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const ruleForm = ref({
   organizeType: '', // 类型
   organizeName: '', // 名称
   organizeNo: '', // 编号
   deptId: '', // 部门
   director: '', // 负责人
+  phone: '', // 联系方式
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
   meterMajor: '', // 计量专业
@@ -37,11 +41,12 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
-  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
-  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
+  organizeName: [{ required: true, message: '名称必填', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  phone: [{ required: true, message: '联系方式必填', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务必填', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务必填', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -49,12 +54,15 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    // deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    deptId: '', // 所属科室, // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
     if (res.code === 200) {
       userList.value = res.data.records
+      usePersonList.value = res.data.records
+      usePersonOptions.value = res.data.records
     }
   })
 }
@@ -95,13 +103,13 @@
     }
   })
 }
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -113,7 +121,7 @@
         updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
-            ElMessage.success('提交成功')
+            ElMessage.success('保存成功')
             $router.go(-1)
           }
         })
@@ -450,6 +458,22 @@
     }
   })
 }
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,7 +484,7 @@
   ruleForm.value.deptId = row.deptId
   ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
   ruleForm.value.meterMajor = row.meterMajor
-  getuser()
+  getuser() // 获取计量人员列表
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -507,8 +531,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="title">
       <template #btns>
-        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-          提交
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
@@ -609,9 +633,28 @@
         <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              <el-select
+                v-model="ruleForm.director"
+                :disabled="title.split('-')[2] === '详情'"
+                :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="directorChange"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <!-- <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式" prop="phone">
+              <el-input v-model.trim="ruleForm.phone" :placeholder="title.split('-')[2] === '详情' ? '' : '联系方式'" :disabled="title.split('-')[2] === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 50cf032..a9841f0 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -131,3 +131,11 @@
     data,
   })
 }
+// 工作培训记录
+export function getStaffCultivateLog(data: { id: string }) {
+  return request({
+    url: '/staff/staffCultivateLog',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 0dcebfc..925992b 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -94,8 +94,11 @@
         message: '请选择至少一个实验室',
         type: 'warning',
       })
+      return false
     }
     else {
+      console.log('111111', checkoutList.value)
+
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -105,6 +108,7 @@
         message: '请选择检定实验室',
         type: 'warning',
       })
+      return false
     }
     else {
       const checkValue = list.value.find(item => item.id == singleChecked.value)
@@ -127,7 +131,7 @@
 
 <template>
   <div class="choose-lab-dialog">
-    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -161,23 +165,25 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
+          :is-showmulti-select="multi"
+          :height="300"
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
-          <template v-if="!multi" #preColumns>
+          <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 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 d342a64..6d6b9e7 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -6,7 +6,7 @@
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', 'saveOver'])
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
@@ -75,11 +75,15 @@
 // 保存流程按钮点击
 const saveProcess = () => {
   processConfigRef.value.saveProcess()
-  emit('close')
 }
 function cancel() {
   dialogVisible.value = false
 }
+// 保存流程成功
+const saveOver = () => {
+  dialogVisible.value = false
+  emit('close')
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -111,7 +115,7 @@
     <el-button 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="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @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 bb66076..a67552a 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -108,6 +108,13 @@
     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}个流程：检定环节不能为空`)
+    return false
+  }
+
   // 处理顺序
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 07b2296..f995313 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -115,7 +115,7 @@
   ruleForm.createUserId = ''
   effectiveStatusName.value = ''
 }
-// 提交
+// 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e19a555..1c03550 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -12,12 +12,16 @@
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const ruleForm = ref({
   organizeType: '', // 类型
   organizeName: '', // 名称
   organizeNo: '', // 编号
   deptId: '', // 部门
   director: '', // 负责人
+  phone: '', // 联系方式
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
   meterMajor: '', // 计量专业
@@ -37,11 +41,12 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
-  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
-  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
+  organizeName: [{ required: true, message: '名称必填', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  phone: [{ required: true, message: '联系方式必填', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务必填', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务必填', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -49,12 +54,15 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    // deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    deptId: '', // 所属科室, // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
     if (res.code === 200) {
       userList.value = res.data.records
+      usePersonList.value = res.data.records
+      usePersonOptions.value = res.data.records
     }
   })
 }
@@ -95,13 +103,13 @@
     }
   })
 }
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -113,7 +121,7 @@
         updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
-            ElMessage.success('提交成功')
+            ElMessage.success('保存成功')
             $router.go(-1)
           }
         })
@@ -450,6 +458,22 @@
     }
   })
 }
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,7 +484,7 @@
   ruleForm.value.deptId = row.deptId
   ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
   ruleForm.value.meterMajor = row.meterMajor
-  getuser()
+  getuser() // 获取计量人员列表
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -507,8 +531,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="title">
       <template #btns>
-        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-          提交
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
@@ -609,9 +633,28 @@
         <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              <el-select
+                v-model="ruleForm.director"
+                :disabled="title.split('-')[2] === '详情'"
+                :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="directorChange"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <!-- <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式" prop="phone">
+              <el-input v-model.trim="ruleForm.phone" :placeholder="title.split('-')[2] === '详情' ? '' : '联系方式'" :disabled="title.split('-')[2] === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 33e63c8..44cad86 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -8,6 +8,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { dictType } from '@/global'
 const props = defineProps({
   name: {
     type: String,
@@ -52,39 +53,39 @@
   {
     name: '计量组织-部门',
     columns: [
-      { text: '部门编号', value: 'organizeNo', align: 'center' },
+      { text: '部门编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '部门名称', value: 'organizeName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-科室',
     columns: [
-      { text: '科室编号', value: 'organizeNo', align: 'center' },
+      { text: '科室编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-工程组',
     columns: [
-      { text: '工程组编号', value: 'organizeNo', align: 'center' },
+      { text: '工程组编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
 ])
@@ -92,11 +93,19 @@
   return columnsData.value.filter((item: { name: string;columns: TableColumn[] }) => item.name === props.name)[0].columns
 })
 const list = ref<rowType[]>([]) // 表格数据
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('deptType')
-  searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取类型
+  getDictByCode('deptType').then((res) => {
+    searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
@@ -119,6 +128,17 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  console.log('00000', props.name, props.authority)
+
+  if (props.authority === 'bm') {
+    searchQuery.organizeType = '2'
+  }
+  if (props.authority === 'ks') {
+    searchQuery.organizeType = '3'
+  }
+  if (props.authority === 'gcz') {
+    searchQuery.organizeType = '4'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
@@ -155,8 +175,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
@@ -168,11 +186,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: `${props.name}-编辑`,
-  // })
 }
 // 搜索
 const search = () => {
@@ -236,15 +249,13 @@
     ElMessage('无可打印内容')
   }
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-}
-onMounted(() => {
+
+onMounted(async () => {
+  await getDict()
   getDepartmentList()
-  getType().then((_) => {
-    getList()
-  })
+  // getType().then((_) => {
+  getList()
+  // })
 })
 </script>
 
@@ -261,7 +272,9 @@
           <el-input v-model="searchQuery.organizeName" :placeholder="`${props.name.split('-')[1]}名称`" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="专业" clearable class="w-50 m-2 " />
+          <el-select v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
@@ -282,22 +295,11 @@
             end-placeholder="创建结束时间"
             clearable
           />
-          <!-- <el-date-picker
-            v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="创建时间"
-          /> -->
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button> -->
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
@@ -319,7 +321,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="110">
+            <el-table-column label="操作" align="center" width="110" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 50cf032..a9841f0 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -131,3 +131,11 @@
     data,
   })
 }
+// 工作培训记录
+export function getStaffCultivateLog(data: { id: string }) {
+  return request({
+    url: '/staff/staffCultivateLog',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 0dcebfc..925992b 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -94,8 +94,11 @@
         message: '请选择至少一个实验室',
         type: 'warning',
       })
+      return false
     }
     else {
+      console.log('111111', checkoutList.value)
+
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -105,6 +108,7 @@
         message: '请选择检定实验室',
         type: 'warning',
       })
+      return false
     }
     else {
       const checkValue = list.value.find(item => item.id == singleChecked.value)
@@ -127,7 +131,7 @@
 
 <template>
   <div class="choose-lab-dialog">
-    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -161,23 +165,25 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
+          :is-showmulti-select="multi"
+          :height="300"
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
-          <template v-if="!multi" #preColumns>
+          <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 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 d342a64..6d6b9e7 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -6,7 +6,7 @@
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', 'saveOver'])
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
@@ -75,11 +75,15 @@
 // 保存流程按钮点击
 const saveProcess = () => {
   processConfigRef.value.saveProcess()
-  emit('close')
 }
 function cancel() {
   dialogVisible.value = false
 }
+// 保存流程成功
+const saveOver = () => {
+  dialogVisible.value = false
+  emit('close')
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -111,7 +115,7 @@
     <el-button 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="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @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 bb66076..a67552a 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -108,6 +108,13 @@
     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}个流程：检定环节不能为空`)
+    return false
+  }
+
   // 处理顺序
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 07b2296..f995313 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -115,7 +115,7 @@
   ruleForm.createUserId = ''
   effectiveStatusName.value = ''
 }
-// 提交
+// 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e19a555..1c03550 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -12,12 +12,16 @@
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const ruleForm = ref({
   organizeType: '', // 类型
   organizeName: '', // 名称
   organizeNo: '', // 编号
   deptId: '', // 部门
   director: '', // 负责人
+  phone: '', // 联系方式
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
   meterMajor: '', // 计量专业
@@ -37,11 +41,12 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
-  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
-  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
+  organizeName: [{ required: true, message: '名称必填', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  phone: [{ required: true, message: '联系方式必填', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务必填', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务必填', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -49,12 +54,15 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    // deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    deptId: '', // 所属科室, // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
     if (res.code === 200) {
       userList.value = res.data.records
+      usePersonList.value = res.data.records
+      usePersonOptions.value = res.data.records
     }
   })
 }
@@ -95,13 +103,13 @@
     }
   })
 }
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -113,7 +121,7 @@
         updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
-            ElMessage.success('提交成功')
+            ElMessage.success('保存成功')
             $router.go(-1)
           }
         })
@@ -450,6 +458,22 @@
     }
   })
 }
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,7 +484,7 @@
   ruleForm.value.deptId = row.deptId
   ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
   ruleForm.value.meterMajor = row.meterMajor
-  getuser()
+  getuser() // 获取计量人员列表
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -507,8 +531,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="title">
       <template #btns>
-        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-          提交
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
@@ -609,9 +633,28 @@
         <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              <el-select
+                v-model="ruleForm.director"
+                :disabled="title.split('-')[2] === '详情'"
+                :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="directorChange"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <!-- <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式" prop="phone">
+              <el-input v-model.trim="ruleForm.phone" :placeholder="title.split('-')[2] === '详情' ? '' : '联系方式'" :disabled="title.split('-')[2] === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 33e63c8..44cad86 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -8,6 +8,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { dictType } from '@/global'
 const props = defineProps({
   name: {
     type: String,
@@ -52,39 +53,39 @@
   {
     name: '计量组织-部门',
     columns: [
-      { text: '部门编号', value: 'organizeNo', align: 'center' },
+      { text: '部门编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '部门名称', value: 'organizeName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-科室',
     columns: [
-      { text: '科室编号', value: 'organizeNo', align: 'center' },
+      { text: '科室编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-工程组',
     columns: [
-      { text: '工程组编号', value: 'organizeNo', align: 'center' },
+      { text: '工程组编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
 ])
@@ -92,11 +93,19 @@
   return columnsData.value.filter((item: { name: string;columns: TableColumn[] }) => item.name === props.name)[0].columns
 })
 const list = ref<rowType[]>([]) // 表格数据
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('deptType')
-  searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取类型
+  getDictByCode('deptType').then((res) => {
+    searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
@@ -119,6 +128,17 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  console.log('00000', props.name, props.authority)
+
+  if (props.authority === 'bm') {
+    searchQuery.organizeType = '2'
+  }
+  if (props.authority === 'ks') {
+    searchQuery.organizeType = '3'
+  }
+  if (props.authority === 'gcz') {
+    searchQuery.organizeType = '4'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
@@ -155,8 +175,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
@@ -168,11 +186,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: `${props.name}-编辑`,
-  // })
 }
 // 搜索
 const search = () => {
@@ -236,15 +249,13 @@
     ElMessage('无可打印内容')
   }
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-}
-onMounted(() => {
+
+onMounted(async () => {
+  await getDict()
   getDepartmentList()
-  getType().then((_) => {
-    getList()
-  })
+  // getType().then((_) => {
+  getList()
+  // })
 })
 </script>
 
@@ -261,7 +272,9 @@
           <el-input v-model="searchQuery.organizeName" :placeholder="`${props.name.split('-')[1]}名称`" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="专业" clearable class="w-50 m-2 " />
+          <el-select v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
@@ -282,22 +295,11 @@
             end-placeholder="创建结束时间"
             clearable
           />
-          <!-- <el-date-picker
-            v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="创建时间"
-          /> -->
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button> -->
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
@@ -319,7 +321,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="110">
+            <el-table-column label="操作" align="center" width="110" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index c75b5c1..85fdc44 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -40,32 +40,27 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
-  { text: '人员编号', value: 'staffNo', align: 'center' },
-  { text: '姓名', value: 'name', align: 'center', width: 90 },
-  { text: '性别', value: 'sex', align: 'center', width: 90 },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '160' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center', width: '70' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'validDate', align: 'center' },
-  { text: '证书状况', value: 'certificateStatus', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '110' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '110' },
+  { text: '证书状况', value: 'certificateStatusName', align: 'center' },
 ]) // 表格
 const certificateStatusList = ref([
   {
-    name: '全部',
-    id: 'status01',
-    value: '',
-  },
-  {
     name: '已失效',
-    id: 'status02',
+    id: '1',
     value: '1',
   },
   {
     name: '正常',
-    id: 'status02',
+    id: '0',
     value: '0',
   },
 ])
@@ -131,12 +126,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '详情',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 // 编辑
 const update = (row: StaffType) => {
@@ -151,12 +140,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '编辑',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 
 // 删除
@@ -233,11 +216,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 // 表格被选中的行
 const selectList = ref<StaffType[]>([])
@@ -331,18 +309,6 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
-            <el-option
-              v-for="item in deptList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select> -->
-          <!-- <com-tree-select
-            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
-            placeholder="工作部门" :tree-props="deptProps"
-          /> -->
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
@@ -364,8 +330,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 50cf032..a9841f0 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -131,3 +131,11 @@
     data,
   })
 }
+// 工作培训记录
+export function getStaffCultivateLog(data: { id: string }) {
+  return request({
+    url: '/staff/staffCultivateLog',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 0dcebfc..925992b 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -94,8 +94,11 @@
         message: '请选择至少一个实验室',
         type: 'warning',
       })
+      return false
     }
     else {
+      console.log('111111', checkoutList.value)
+
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -105,6 +108,7 @@
         message: '请选择检定实验室',
         type: 'warning',
       })
+      return false
     }
     else {
       const checkValue = list.value.find(item => item.id == singleChecked.value)
@@ -127,7 +131,7 @@
 
 <template>
   <div class="choose-lab-dialog">
-    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -161,23 +165,25 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
+          :is-showmulti-select="multi"
+          :height="300"
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
-          <template v-if="!multi" #preColumns>
+          <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 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 d342a64..6d6b9e7 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -6,7 +6,7 @@
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', 'saveOver'])
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
@@ -75,11 +75,15 @@
 // 保存流程按钮点击
 const saveProcess = () => {
   processConfigRef.value.saveProcess()
-  emit('close')
 }
 function cancel() {
   dialogVisible.value = false
 }
+// 保存流程成功
+const saveOver = () => {
+  dialogVisible.value = false
+  emit('close')
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -111,7 +115,7 @@
     <el-button 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="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @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 bb66076..a67552a 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -108,6 +108,13 @@
     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}个流程：检定环节不能为空`)
+    return false
+  }
+
   // 处理顺序
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 07b2296..f995313 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -115,7 +115,7 @@
   ruleForm.createUserId = ''
   effectiveStatusName.value = ''
 }
-// 提交
+// 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e19a555..1c03550 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -12,12 +12,16 @@
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const ruleForm = ref({
   organizeType: '', // 类型
   organizeName: '', // 名称
   organizeNo: '', // 编号
   deptId: '', // 部门
   director: '', // 负责人
+  phone: '', // 联系方式
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
   meterMajor: '', // 计量专业
@@ -37,11 +41,12 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
-  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
-  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
+  organizeName: [{ required: true, message: '名称必填', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  phone: [{ required: true, message: '联系方式必填', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务必填', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务必填', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -49,12 +54,15 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    // deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    deptId: '', // 所属科室, // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
     if (res.code === 200) {
       userList.value = res.data.records
+      usePersonList.value = res.data.records
+      usePersonOptions.value = res.data.records
     }
   })
 }
@@ -95,13 +103,13 @@
     }
   })
 }
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -113,7 +121,7 @@
         updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
-            ElMessage.success('提交成功')
+            ElMessage.success('保存成功')
             $router.go(-1)
           }
         })
@@ -450,6 +458,22 @@
     }
   })
 }
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,7 +484,7 @@
   ruleForm.value.deptId = row.deptId
   ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
   ruleForm.value.meterMajor = row.meterMajor
-  getuser()
+  getuser() // 获取计量人员列表
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -507,8 +531,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="title">
       <template #btns>
-        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-          提交
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
@@ -609,9 +633,28 @@
         <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              <el-select
+                v-model="ruleForm.director"
+                :disabled="title.split('-')[2] === '详情'"
+                :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="directorChange"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <!-- <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式" prop="phone">
+              <el-input v-model.trim="ruleForm.phone" :placeholder="title.split('-')[2] === '详情' ? '' : '联系方式'" :disabled="title.split('-')[2] === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 33e63c8..44cad86 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -8,6 +8,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { dictType } from '@/global'
 const props = defineProps({
   name: {
     type: String,
@@ -52,39 +53,39 @@
   {
     name: '计量组织-部门',
     columns: [
-      { text: '部门编号', value: 'organizeNo', align: 'center' },
+      { text: '部门编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '部门名称', value: 'organizeName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-科室',
     columns: [
-      { text: '科室编号', value: 'organizeNo', align: 'center' },
+      { text: '科室编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-工程组',
     columns: [
-      { text: '工程组编号', value: 'organizeNo', align: 'center' },
+      { text: '工程组编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
 ])
@@ -92,11 +93,19 @@
   return columnsData.value.filter((item: { name: string;columns: TableColumn[] }) => item.name === props.name)[0].columns
 })
 const list = ref<rowType[]>([]) // 表格数据
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('deptType')
-  searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取类型
+  getDictByCode('deptType').then((res) => {
+    searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
@@ -119,6 +128,17 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  console.log('00000', props.name, props.authority)
+
+  if (props.authority === 'bm') {
+    searchQuery.organizeType = '2'
+  }
+  if (props.authority === 'ks') {
+    searchQuery.organizeType = '3'
+  }
+  if (props.authority === 'gcz') {
+    searchQuery.organizeType = '4'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
@@ -155,8 +175,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
@@ -168,11 +186,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: `${props.name}-编辑`,
-  // })
 }
 // 搜索
 const search = () => {
@@ -236,15 +249,13 @@
     ElMessage('无可打印内容')
   }
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-}
-onMounted(() => {
+
+onMounted(async () => {
+  await getDict()
   getDepartmentList()
-  getType().then((_) => {
-    getList()
-  })
+  // getType().then((_) => {
+  getList()
+  // })
 })
 </script>
 
@@ -261,7 +272,9 @@
           <el-input v-model="searchQuery.organizeName" :placeholder="`${props.name.split('-')[1]}名称`" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="专业" clearable class="w-50 m-2 " />
+          <el-select v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
@@ -282,22 +295,11 @@
             end-placeholder="创建结束时间"
             clearable
           />
-          <!-- <el-date-picker
-            v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="创建时间"
-          /> -->
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button> -->
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
@@ -319,7 +321,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="110">
+            <el-table-column label="操作" align="center" width="110" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index c75b5c1..85fdc44 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -40,32 +40,27 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
-  { text: '人员编号', value: 'staffNo', align: 'center' },
-  { text: '姓名', value: 'name', align: 'center', width: 90 },
-  { text: '性别', value: 'sex', align: 'center', width: 90 },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '160' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center', width: '70' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'validDate', align: 'center' },
-  { text: '证书状况', value: 'certificateStatus', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '110' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '110' },
+  { text: '证书状况', value: 'certificateStatusName', align: 'center' },
 ]) // 表格
 const certificateStatusList = ref([
   {
-    name: '全部',
-    id: 'status01',
-    value: '',
-  },
-  {
     name: '已失效',
-    id: 'status02',
+    id: '1',
     value: '1',
   },
   {
     name: '正常',
-    id: 'status02',
+    id: '0',
     value: '0',
   },
 ])
@@ -131,12 +126,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '详情',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 // 编辑
 const update = (row: StaffType) => {
@@ -151,12 +140,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '编辑',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 
 // 删除
@@ -233,11 +216,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 // 表格被选中的行
 const selectList = ref<StaffType[]>([])
@@ -331,18 +309,6 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
-            <el-option
-              v-for="item in deptList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select> -->
-          <!-- <com-tree-select
-            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
-            placeholder="工作部门" :tree-props="deptProps"
-          /> -->
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
@@ -364,8 +330,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index c750426..f2a2afc 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
+import dayjs from 'dayjs'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
 import { getUserList, roleAssign } from '@/api/system/user'
@@ -12,12 +13,13 @@
 import { toTreeList } from '@/utils/structure'
 import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
-import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
+const infoId = ref('') // id
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm: { [key: string]: string | any } = ref({
   account: '',
@@ -71,6 +73,8 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
+    console.log('0000', ruleForm.value.birthday)
+
     // 获取性别 第17位  奇数为男 偶数为女
     // ruleForm.value.sex
     if (Number(IdCard.substring(16, 17)) % 2) {
@@ -93,12 +97,10 @@
 const selectWhether = ref([
   { name: '是', value: '0' },
   { name: '否', value: '1' },
-])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
-const PubList = ref<TreeStructure[]>([])
-const PubListTree = ref([])
+])// 字典
+// ----------------------------------------------组织列表-------------------------------
+const PubList = ref<TreeStructure[]>([]) // 组织列表
+const PubListTree = ref([]) // 组织列表树
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
@@ -107,6 +109,7 @@
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
+// ----------------------------------------字典--------------------------------------------
 const sexList = ref<{ id: string; value: string; name: string }[]>()
 // 获取性别
 const getSexList = () => {
@@ -157,6 +160,7 @@
     administrationJobList.value = response.data
   })
 }
+// --------------------------------------------------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -248,35 +252,37 @@
       {
         text: '发证单位',
         value: 'certificateCompany',
-        id: 'zs01',
+        id: 'certificateCompany',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '证书号',
         value: 'certificateNo',
-        id: 'zs02',
+        id: 'certificateNo',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '证书名称',
         value: 'certificateName',
-        id: 'zs03',
+        id: 'certificateName',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '发证日期',
         value: 'certificateDate',
-        id: 'zs04',
+        id: 'certificateDate',
+        width: '120',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        id: 'zs05',
+        width: '120',
+        id: 'validDate',
         required: true,
         isDate: true, // 是否日期
       },
@@ -289,115 +295,126 @@
     column: [
       {
         text: '培训时间',
-        value: 'a1',
+        value: 'trainTime',
+        width: '180',
         id: 'zs01',
-        required: true,
+        required: false,
         isDate: true, // 是否日期
       },
       {
-        text: '培训班名称',
-        value: 'a2',
+        text: '培训名称',
+        value: 'planName',
         id: 'zs02',
-        required: true,
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '类别',
         value: 'a3',
         id: 'zs03',
-        required: true,
+        required: false,
         isSelect: true, // 是否下拉框
       },
       {
         text: '计划编号',
-        value: 'a4',
-        id: 'zs04',
-        required: true,
+        value: 'planNo',
+        width: '160',
+        id: 'planNo',
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '培训对象',
-        value: 'a5',
-        id: 'zs05',
-        required: true,
+        value: 'name',
+        id: 'name',
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '培训结果',
-        value: 'a6',
-        id: 'zs05',
-        required: true,
+        value: 'examResult',
+        id: 'examResult',
+        required: false,
         isDate: false, // 是否日期
       },
     ],
   },
-  {
-    name: '业务记录',
-    data: [] as any[],
-    deepData: [] as any[],
-    column: [
-      {
-        text: '样品编号',
-        value: 'b1',
-        id: 'zs01',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '样品名称',
-        value: 'b2',
-        id: 'zs02',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '委托书编号',
-        value: 'b3',
-        id: 'zs03',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '合同编号',
-        value: 'b4',
-        id: 'zs04',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '检定时间',
-        value: 'b5',
-        id: 'zs05',
-        required: true,
-        isDate: true, // 是否日期
-      },
-      {
-        text: '检定结果',
-        value: 'b6',
-        id: 'zs05',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '业务额',
-        value: 'b7',
-        id: 'zs05',
-        required: true,
-        isDate: false, // 是否日期
-      },
-    ],
-  },
+  // {
+  //   name: '业务记录',
+  //   data: [] as any[],
+  //   deepData: [] as any[],
+  //   column: [
+  //     {
+  //       text: '样品编号',
+  //       value: 'b1',
+  //       id: 'zs01',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '样品名称',
+  //       value: 'b2',
+  //       id: 'zs02',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '委托书编号',
+  //       value: 'b3',
+  //       id: 'zs03',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '合同编号',
+  //       value: 'b4',
+  //       id: 'zs04',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '检定时间',
+  //       value: 'b5',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: true, // 是否日期
+  //     },
+  //     {
+  //       text: '检定结果',
+  //       value: 'b6',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '业务额',
+  //       value: 'b7',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //   ],
+  // },
 ])
 const current = ref('证书基本信息')
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
-
+watch(current, () => {
+  if (current.value === '计量工作培训记录') {
+    getStaffCultivateLog({ id: infoId.value }).then((res) => {
+      changeList.value[1].data = res.data.rows
+    })
+  }
+  // if (current.value === '业务记录') {
+  //   console.log('暂时没有接口')
+  // }
+})
 // 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
+function checkCertificateList() {
+  for (let index = 0; index < changeList.value[0].data.length; index++) {
+    const item = changeList.value[0].data[index]
+    for (const prop of changeList.value[0].column) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
         ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
@@ -426,7 +443,7 @@
 // 添加行
 const addRow = () => {
   // certificateRef.value.initDialog({ title: '添加' })
-  if (checkPersonList()) {
+  if (checkCertificateList()) {
     setAllRowReadable()
     currentShow.value.data.push({
       ...addObj[current.value],
@@ -478,15 +495,30 @@
   console.log(certificateList, '最终需要提交的数组')
   return certificateList
 }
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (changeList.value[0].data.length) {
+    for (const key in ruleForm.value) {
+      if (ruleForm.value[key] === '') {
+        ruleForm.value[key] = null
+      }
+    }
+    if (!checkCertificateList()) {
+      return false
+    }
+  }
+  else {
+    ElMessage.warning('请先填写证书信息')
+    return false
+  }
   if (!formEl) { return }
   // 当前选中的证书基本信息列表
   const currentData = currentShow.value.data
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -498,59 +530,99 @@
           item.id = ''
           return item
         })
-        if (changeList.value[0].data.length) {
-          for (const key in ruleForm.value) {
-            if (ruleForm.value[key] === '') {
-              ruleForm.value[key] = null
-            }
-          }
-          // changeList.value[0].data
-          // handleRecord(changeList.value[0].deepData
-          (title.value === '新建'
-            ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
-            : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
-            if (res.code == 200) {
-              // formEl?.resetFields()
-              // ElMessage.success('提交成功')
-              // resetFormData()
-              // $router.go(-1)
-              // 获取当前用户角色
-              getRoleTreeListByUser(userInfoData.value.id).then((res) => {
-                console.log(res.data, '角色列表')
-                // 当前用户 角色 id
-                const roleIds: string[] = []
-                // 挑选 计量人员 角色id
-                let metering = ''
-                const data = res.data
-                data.forEach((item: any) => {
-                  // 当前用户角色
-                  if (item.checked) {
-                    roleIds.push(item.id)
-                  }
-                  // 计量人员角色
-                  if (item.name === '计量人员') {
-                    metering = item.id
-                  }
-                })
-                // 判断当前用户是否 计量人员角色
-                if (roleIds.every(item => item !== metering)) {
-                  roleIds.push(metering)
+
+        // changeList.value[0].data
+        // handleRecord(changeList.value[0].deepData
+        if (title.value === '新建') {
+          getStaffAdd({
+            ...ruleForm.value,
+            certificateList: changeList.value[0].data,
+            birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}`,
+          }).then((res) => {
+            // 获取当前用户角色
+            getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+              console.log(res.data, '角色列表')
+              // 当前用户 角色 id
+              const roleIds: string[] = []
+              // 挑选 计量人员 角色id
+              let metering = ''
+              const data = res.data
+              data.forEach((item: any) => {
+                // 当前用户角色
+                if (item.checked) {
+                  roleIds.push(item.id)
                 }
-                // 设置当前用户角色
-                roleAssign(userInfoData.value.id, roleIds).then((res) => {
-                  console.log('分配计量人员角色成功')
-                  formEl?.resetFields()
-                  ElMessage.success('提交成功')
-                  resetFormData()
-                  $router.go(-1)
-                })
+                // 计量人员角色
+                if (item.name === '计量人员') {
+                  metering = item.id
+                }
               })
-            }
+              // 判断当前用户是否 计量人员角色
+              if (roleIds.every(item => item !== metering)) {
+                roleIds.push(metering)
+              }
+              // 设置当前用户角色
+              roleAssign(userInfoData.value.id, roleIds).then((res) => {
+                console.log('分配计量人员角色成功')
+                formEl?.resetFields()
+                ElMessage.success('保存成功')
+                resetFormData()
+                $router.go(-1)
+              })
+            })
           })
         }
         else {
-          ElMessage.warning('请先填写证书信息')
+          getStaffupdate({
+            ...ruleForm.value,
+            certificateList: changeList.value[0].data,
+            birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}`,
+          }).then((res) => {
+            if (res.code == 200) {
+              ElMessage.success('保存成功')
+              $router.go(-1)
+            }
+          })
         }
+
+        //   if (res.code == 200) {
+        //     // formEl?.resetFields()
+        //     ElMessage.success('保存成功')
+        //     // resetFormData()
+        //     // $router.go(-1)
+        //     // 获取当前用户角色
+        //     getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+        //       console.log(res.data, '角色列表')
+        //       // 当前用户 角色 id
+        //       const roleIds: string[] = []
+        //       // 挑选 计量人员 角色id
+        //       let metering = ''
+        //       const data = res.data
+        //       data.forEach((item: any) => {
+        //         // 当前用户角色
+        //         if (item.checked) {
+        //           roleIds.push(item.id)
+        //         }
+        //         // 计量人员角色
+        //         if (item.name === '计量人员') {
+        //           metering = item.id
+        //         }
+        //       })
+        //       // 判断当前用户是否 计量人员角色
+        //       if (roleIds.every(item => item !== metering)) {
+        //         roleIds.push(metering)
+        //       }
+        //       // 设置当前用户角色
+        //       roleAssign(userInfoData.value.id, roleIds).then((res) => {
+        //         console.log('分配计量人员角色成功')
+        //         formEl?.resetFields()
+        //         ElMessage.success('保存成功')
+        //         resetFormData()
+        //         $router.go(-1)
+        //       })
+        //     })
+        //   }
+        // })
       })
     }
   })
@@ -564,6 +636,7 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  infoId.value = row.id // 主键
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
@@ -581,7 +654,13 @@
     getStaffDetail({ ...row }).then((res) => {
       if (res.code === 200) {
         ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        changeList.value[0].data = res.data.certificateList.map((item: { certificateDate: string; validDate: string }) => {
+          return {
+            ...item,
+            certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+          }
+        }) // 证书基本信息
         changeList.value[0].deepData = lodash.cloneDeep(res.data.certificateList)
         staffId.value = changeList.value[0].deepData[0]?.staffId
       }
@@ -607,8 +686,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`计量人员-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-          完成
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
@@ -636,7 +715,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" disabled @focus="selectPerson">
                 <template #append>
                   <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
                     选择
@@ -647,19 +726,11 @@
             <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
-                placeholder="出生年月" :disabled="title === '详情'"
+                placeholder="出生年月" disabled
                 style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <!-- <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
-              /> -->
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -676,7 +747,7 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" disabled style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -725,27 +796,24 @@
     </detail-page>
     <detail-block-switch :title="current">
       <template #menu>
-        <el-radio-group v-model="current">
+        <el-radio-group v-if="title === '详情'" v-model="current">
           <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
             {{ item.name }}
           </el-radio-button>
         </el-radio-group>
       </template>
       <template #btns>
-        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+        <el-button v-if="title !== '详情' && current === '证书基本信息'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button v-if="title !== '详情' && current === '证书基本信息'" type="info" @click="removeRow">
           删除行
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
       </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="current === '证书基本信息' && title !== '详情'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.value" :label="item.text" align="center">
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :width="item.width" :prop="item.value" :label="item.text" align="center">
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
@@ -760,9 +828,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <!-- 选择用户列表组件 -->
-      <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
     </detail-block-switch>
+    <!-- 选择用户列表组件 -->
+    <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
   </app-container>
 </template>
 

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 50cf032..a9841f0 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -131,3 +131,11 @@
     data,
   })
 }
+// 工作培训记录
+export function getStaffCultivateLog(data: { id: string }) {
+  return request({
+    url: '/staff/staffCultivateLog',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 0dcebfc..925992b 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -94,8 +94,11 @@
         message: '请选择至少一个实验室',
         type: 'warning',
       })
+      return false
     }
     else {
+      console.log('111111', checkoutList.value)
+
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -105,6 +108,7 @@
         message: '请选择检定实验室',
         type: 'warning',
       })
+      return false
     }
     else {
       const checkValue = list.value.find(item => item.id == singleChecked.value)
@@ -127,7 +131,7 @@
 
 <template>
   <div class="choose-lab-dialog">
-    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -161,23 +165,25 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
+          :is-showmulti-select="multi"
+          :height="300"
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
-          <template v-if="!multi" #preColumns>
+          <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 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 d342a64..6d6b9e7 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -6,7 +6,7 @@
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', 'saveOver'])
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
@@ -75,11 +75,15 @@
 // 保存流程按钮点击
 const saveProcess = () => {
   processConfigRef.value.saveProcess()
-  emit('close')
 }
 function cancel() {
   dialogVisible.value = false
 }
+// 保存流程成功
+const saveOver = () => {
+  dialogVisible.value = false
+  emit('close')
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -111,7 +115,7 @@
     <el-button 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="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @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 bb66076..a67552a 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -108,6 +108,13 @@
     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}个流程：检定环节不能为空`)
+    return false
+  }
+
   // 处理顺序
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 07b2296..f995313 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -115,7 +115,7 @@
   ruleForm.createUserId = ''
   effectiveStatusName.value = ''
 }
-// 提交
+// 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e19a555..1c03550 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -12,12 +12,16 @@
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const ruleForm = ref({
   organizeType: '', // 类型
   organizeName: '', // 名称
   organizeNo: '', // 编号
   deptId: '', // 部门
   director: '', // 负责人
+  phone: '', // 联系方式
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
   meterMajor: '', // 计量专业
@@ -37,11 +41,12 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
-  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
-  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
+  organizeName: [{ required: true, message: '名称必填', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  phone: [{ required: true, message: '联系方式必填', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务必填', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务必填', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -49,12 +54,15 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    // deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    deptId: '', // 所属科室, // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
     if (res.code === 200) {
       userList.value = res.data.records
+      usePersonList.value = res.data.records
+      usePersonOptions.value = res.data.records
     }
   })
 }
@@ -95,13 +103,13 @@
     }
   })
 }
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -113,7 +121,7 @@
         updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
-            ElMessage.success('提交成功')
+            ElMessage.success('保存成功')
             $router.go(-1)
           }
         })
@@ -450,6 +458,22 @@
     }
   })
 }
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,7 +484,7 @@
   ruleForm.value.deptId = row.deptId
   ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
   ruleForm.value.meterMajor = row.meterMajor
-  getuser()
+  getuser() // 获取计量人员列表
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -507,8 +531,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="title">
       <template #btns>
-        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-          提交
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
@@ -609,9 +633,28 @@
         <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              <el-select
+                v-model="ruleForm.director"
+                :disabled="title.split('-')[2] === '详情'"
+                :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="directorChange"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <!-- <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式" prop="phone">
+              <el-input v-model.trim="ruleForm.phone" :placeholder="title.split('-')[2] === '详情' ? '' : '联系方式'" :disabled="title.split('-')[2] === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 33e63c8..44cad86 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -8,6 +8,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { dictType } from '@/global'
 const props = defineProps({
   name: {
     type: String,
@@ -52,39 +53,39 @@
   {
     name: '计量组织-部门',
     columns: [
-      { text: '部门编号', value: 'organizeNo', align: 'center' },
+      { text: '部门编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '部门名称', value: 'organizeName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-科室',
     columns: [
-      { text: '科室编号', value: 'organizeNo', align: 'center' },
+      { text: '科室编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-工程组',
     columns: [
-      { text: '工程组编号', value: 'organizeNo', align: 'center' },
+      { text: '工程组编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
 ])
@@ -92,11 +93,19 @@
   return columnsData.value.filter((item: { name: string;columns: TableColumn[] }) => item.name === props.name)[0].columns
 })
 const list = ref<rowType[]>([]) // 表格数据
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('deptType')
-  searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取类型
+  getDictByCode('deptType').then((res) => {
+    searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
@@ -119,6 +128,17 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  console.log('00000', props.name, props.authority)
+
+  if (props.authority === 'bm') {
+    searchQuery.organizeType = '2'
+  }
+  if (props.authority === 'ks') {
+    searchQuery.organizeType = '3'
+  }
+  if (props.authority === 'gcz') {
+    searchQuery.organizeType = '4'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
@@ -155,8 +175,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
@@ -168,11 +186,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: `${props.name}-编辑`,
-  // })
 }
 // 搜索
 const search = () => {
@@ -236,15 +249,13 @@
     ElMessage('无可打印内容')
   }
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-}
-onMounted(() => {
+
+onMounted(async () => {
+  await getDict()
   getDepartmentList()
-  getType().then((_) => {
-    getList()
-  })
+  // getType().then((_) => {
+  getList()
+  // })
 })
 </script>
 
@@ -261,7 +272,9 @@
           <el-input v-model="searchQuery.organizeName" :placeholder="`${props.name.split('-')[1]}名称`" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="专业" clearable class="w-50 m-2 " />
+          <el-select v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
@@ -282,22 +295,11 @@
             end-placeholder="创建结束时间"
             clearable
           />
-          <!-- <el-date-picker
-            v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="创建时间"
-          /> -->
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button> -->
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
@@ -319,7 +321,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="110">
+            <el-table-column label="操作" align="center" width="110" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index c75b5c1..85fdc44 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -40,32 +40,27 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
-  { text: '人员编号', value: 'staffNo', align: 'center' },
-  { text: '姓名', value: 'name', align: 'center', width: 90 },
-  { text: '性别', value: 'sex', align: 'center', width: 90 },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '160' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center', width: '70' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'validDate', align: 'center' },
-  { text: '证书状况', value: 'certificateStatus', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '110' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '110' },
+  { text: '证书状况', value: 'certificateStatusName', align: 'center' },
 ]) // 表格
 const certificateStatusList = ref([
   {
-    name: '全部',
-    id: 'status01',
-    value: '',
-  },
-  {
     name: '已失效',
-    id: 'status02',
+    id: '1',
     value: '1',
   },
   {
     name: '正常',
-    id: 'status02',
+    id: '0',
     value: '0',
   },
 ])
@@ -131,12 +126,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '详情',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 // 编辑
 const update = (row: StaffType) => {
@@ -151,12 +140,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '编辑',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 
 // 删除
@@ -233,11 +216,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 // 表格被选中的行
 const selectList = ref<StaffType[]>([])
@@ -331,18 +309,6 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
-            <el-option
-              v-for="item in deptList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select> -->
-          <!-- <com-tree-select
-            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
-            placeholder="工作部门" :tree-props="deptProps"
-          /> -->
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
@@ -364,8 +330,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index c750426..f2a2afc 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
+import dayjs from 'dayjs'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
 import { getUserList, roleAssign } from '@/api/system/user'
@@ -12,12 +13,13 @@
 import { toTreeList } from '@/utils/structure'
 import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
-import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
+const infoId = ref('') // id
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm: { [key: string]: string | any } = ref({
   account: '',
@@ -71,6 +73,8 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
+    console.log('0000', ruleForm.value.birthday)
+
     // 获取性别 第17位  奇数为男 偶数为女
     // ruleForm.value.sex
     if (Number(IdCard.substring(16, 17)) % 2) {
@@ -93,12 +97,10 @@
 const selectWhether = ref([
   { name: '是', value: '0' },
   { name: '否', value: '1' },
-])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
-const PubList = ref<TreeStructure[]>([])
-const PubListTree = ref([])
+])// 字典
+// ----------------------------------------------组织列表-------------------------------
+const PubList = ref<TreeStructure[]>([]) // 组织列表
+const PubListTree = ref([]) // 组织列表树
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
@@ -107,6 +109,7 @@
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
+// ----------------------------------------字典--------------------------------------------
 const sexList = ref<{ id: string; value: string; name: string }[]>()
 // 获取性别
 const getSexList = () => {
@@ -157,6 +160,7 @@
     administrationJobList.value = response.data
   })
 }
+// --------------------------------------------------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -248,35 +252,37 @@
       {
         text: '发证单位',
         value: 'certificateCompany',
-        id: 'zs01',
+        id: 'certificateCompany',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '证书号',
         value: 'certificateNo',
-        id: 'zs02',
+        id: 'certificateNo',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '证书名称',
         value: 'certificateName',
-        id: 'zs03',
+        id: 'certificateName',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '发证日期',
         value: 'certificateDate',
-        id: 'zs04',
+        id: 'certificateDate',
+        width: '120',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        id: 'zs05',
+        width: '120',
+        id: 'validDate',
         required: true,
         isDate: true, // 是否日期
       },
@@ -289,115 +295,126 @@
     column: [
       {
         text: '培训时间',
-        value: 'a1',
+        value: 'trainTime',
+        width: '180',
         id: 'zs01',
-        required: true,
+        required: false,
         isDate: true, // 是否日期
       },
       {
-        text: '培训班名称',
-        value: 'a2',
+        text: '培训名称',
+        value: 'planName',
         id: 'zs02',
-        required: true,
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '类别',
         value: 'a3',
         id: 'zs03',
-        required: true,
+        required: false,
         isSelect: true, // 是否下拉框
       },
       {
         text: '计划编号',
-        value: 'a4',
-        id: 'zs04',
-        required: true,
+        value: 'planNo',
+        width: '160',
+        id: 'planNo',
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '培训对象',
-        value: 'a5',
-        id: 'zs05',
-        required: true,
+        value: 'name',
+        id: 'name',
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '培训结果',
-        value: 'a6',
-        id: 'zs05',
-        required: true,
+        value: 'examResult',
+        id: 'examResult',
+        required: false,
         isDate: false, // 是否日期
       },
     ],
   },
-  {
-    name: '业务记录',
-    data: [] as any[],
-    deepData: [] as any[],
-    column: [
-      {
-        text: '样品编号',
-        value: 'b1',
-        id: 'zs01',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '样品名称',
-        value: 'b2',
-        id: 'zs02',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '委托书编号',
-        value: 'b3',
-        id: 'zs03',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '合同编号',
-        value: 'b4',
-        id: 'zs04',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '检定时间',
-        value: 'b5',
-        id: 'zs05',
-        required: true,
-        isDate: true, // 是否日期
-      },
-      {
-        text: '检定结果',
-        value: 'b6',
-        id: 'zs05',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '业务额',
-        value: 'b7',
-        id: 'zs05',
-        required: true,
-        isDate: false, // 是否日期
-      },
-    ],
-  },
+  // {
+  //   name: '业务记录',
+  //   data: [] as any[],
+  //   deepData: [] as any[],
+  //   column: [
+  //     {
+  //       text: '样品编号',
+  //       value: 'b1',
+  //       id: 'zs01',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '样品名称',
+  //       value: 'b2',
+  //       id: 'zs02',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '委托书编号',
+  //       value: 'b3',
+  //       id: 'zs03',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '合同编号',
+  //       value: 'b4',
+  //       id: 'zs04',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '检定时间',
+  //       value: 'b5',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: true, // 是否日期
+  //     },
+  //     {
+  //       text: '检定结果',
+  //       value: 'b6',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '业务额',
+  //       value: 'b7',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //   ],
+  // },
 ])
 const current = ref('证书基本信息')
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
-
+watch(current, () => {
+  if (current.value === '计量工作培训记录') {
+    getStaffCultivateLog({ id: infoId.value }).then((res) => {
+      changeList.value[1].data = res.data.rows
+    })
+  }
+  // if (current.value === '业务记录') {
+  //   console.log('暂时没有接口')
+  // }
+})
 // 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
+function checkCertificateList() {
+  for (let index = 0; index < changeList.value[0].data.length; index++) {
+    const item = changeList.value[0].data[index]
+    for (const prop of changeList.value[0].column) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
         ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
@@ -426,7 +443,7 @@
 // 添加行
 const addRow = () => {
   // certificateRef.value.initDialog({ title: '添加' })
-  if (checkPersonList()) {
+  if (checkCertificateList()) {
     setAllRowReadable()
     currentShow.value.data.push({
       ...addObj[current.value],
@@ -478,15 +495,30 @@
   console.log(certificateList, '最终需要提交的数组')
   return certificateList
 }
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (changeList.value[0].data.length) {
+    for (const key in ruleForm.value) {
+      if (ruleForm.value[key] === '') {
+        ruleForm.value[key] = null
+      }
+    }
+    if (!checkCertificateList()) {
+      return false
+    }
+  }
+  else {
+    ElMessage.warning('请先填写证书信息')
+    return false
+  }
   if (!formEl) { return }
   // 当前选中的证书基本信息列表
   const currentData = currentShow.value.data
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -498,59 +530,99 @@
           item.id = ''
           return item
         })
-        if (changeList.value[0].data.length) {
-          for (const key in ruleForm.value) {
-            if (ruleForm.value[key] === '') {
-              ruleForm.value[key] = null
-            }
-          }
-          // changeList.value[0].data
-          // handleRecord(changeList.value[0].deepData
-          (title.value === '新建'
-            ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
-            : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
-            if (res.code == 200) {
-              // formEl?.resetFields()
-              // ElMessage.success('提交成功')
-              // resetFormData()
-              // $router.go(-1)
-              // 获取当前用户角色
-              getRoleTreeListByUser(userInfoData.value.id).then((res) => {
-                console.log(res.data, '角色列表')
-                // 当前用户 角色 id
-                const roleIds: string[] = []
-                // 挑选 计量人员 角色id
-                let metering = ''
-                const data = res.data
-                data.forEach((item: any) => {
-                  // 当前用户角色
-                  if (item.checked) {
-                    roleIds.push(item.id)
-                  }
-                  // 计量人员角色
-                  if (item.name === '计量人员') {
-                    metering = item.id
-                  }
-                })
-                // 判断当前用户是否 计量人员角色
-                if (roleIds.every(item => item !== metering)) {
-                  roleIds.push(metering)
+
+        // changeList.value[0].data
+        // handleRecord(changeList.value[0].deepData
+        if (title.value === '新建') {
+          getStaffAdd({
+            ...ruleForm.value,
+            certificateList: changeList.value[0].data,
+            birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}`,
+          }).then((res) => {
+            // 获取当前用户角色
+            getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+              console.log(res.data, '角色列表')
+              // 当前用户 角色 id
+              const roleIds: string[] = []
+              // 挑选 计量人员 角色id
+              let metering = ''
+              const data = res.data
+              data.forEach((item: any) => {
+                // 当前用户角色
+                if (item.checked) {
+                  roleIds.push(item.id)
                 }
-                // 设置当前用户角色
-                roleAssign(userInfoData.value.id, roleIds).then((res) => {
-                  console.log('分配计量人员角色成功')
-                  formEl?.resetFields()
-                  ElMessage.success('提交成功')
-                  resetFormData()
-                  $router.go(-1)
-                })
+                // 计量人员角色
+                if (item.name === '计量人员') {
+                  metering = item.id
+                }
               })
-            }
+              // 判断当前用户是否 计量人员角色
+              if (roleIds.every(item => item !== metering)) {
+                roleIds.push(metering)
+              }
+              // 设置当前用户角色
+              roleAssign(userInfoData.value.id, roleIds).then((res) => {
+                console.log('分配计量人员角色成功')
+                formEl?.resetFields()
+                ElMessage.success('保存成功')
+                resetFormData()
+                $router.go(-1)
+              })
+            })
           })
         }
         else {
-          ElMessage.warning('请先填写证书信息')
+          getStaffupdate({
+            ...ruleForm.value,
+            certificateList: changeList.value[0].data,
+            birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}`,
+          }).then((res) => {
+            if (res.code == 200) {
+              ElMessage.success('保存成功')
+              $router.go(-1)
+            }
+          })
         }
+
+        //   if (res.code == 200) {
+        //     // formEl?.resetFields()
+        //     ElMessage.success('保存成功')
+        //     // resetFormData()
+        //     // $router.go(-1)
+        //     // 获取当前用户角色
+        //     getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+        //       console.log(res.data, '角色列表')
+        //       // 当前用户 角色 id
+        //       const roleIds: string[] = []
+        //       // 挑选 计量人员 角色id
+        //       let metering = ''
+        //       const data = res.data
+        //       data.forEach((item: any) => {
+        //         // 当前用户角色
+        //         if (item.checked) {
+        //           roleIds.push(item.id)
+        //         }
+        //         // 计量人员角色
+        //         if (item.name === '计量人员') {
+        //           metering = item.id
+        //         }
+        //       })
+        //       // 判断当前用户是否 计量人员角色
+        //       if (roleIds.every(item => item !== metering)) {
+        //         roleIds.push(metering)
+        //       }
+        //       // 设置当前用户角色
+        //       roleAssign(userInfoData.value.id, roleIds).then((res) => {
+        //         console.log('分配计量人员角色成功')
+        //         formEl?.resetFields()
+        //         ElMessage.success('保存成功')
+        //         resetFormData()
+        //         $router.go(-1)
+        //       })
+        //     })
+        //   }
+        // })
       })
     }
   })
@@ -564,6 +636,7 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  infoId.value = row.id // 主键
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
@@ -581,7 +654,13 @@
     getStaffDetail({ ...row }).then((res) => {
       if (res.code === 200) {
         ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        changeList.value[0].data = res.data.certificateList.map((item: { certificateDate: string; validDate: string }) => {
+          return {
+            ...item,
+            certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+          }
+        }) // 证书基本信息
         changeList.value[0].deepData = lodash.cloneDeep(res.data.certificateList)
         staffId.value = changeList.value[0].deepData[0]?.staffId
       }
@@ -607,8 +686,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`计量人员-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-          完成
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
@@ -636,7 +715,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" disabled @focus="selectPerson">
                 <template #append>
                   <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
                     选择
@@ -647,19 +726,11 @@
             <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
-                placeholder="出生年月" :disabled="title === '详情'"
+                placeholder="出生年月" disabled
                 style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <!-- <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
-              /> -->
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -676,7 +747,7 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" disabled style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -725,27 +796,24 @@
     </detail-page>
     <detail-block-switch :title="current">
       <template #menu>
-        <el-radio-group v-model="current">
+        <el-radio-group v-if="title === '详情'" v-model="current">
           <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
             {{ item.name }}
           </el-radio-button>
         </el-radio-group>
       </template>
       <template #btns>
-        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+        <el-button v-if="title !== '详情' && current === '证书基本信息'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button v-if="title !== '详情' && current === '证书基本信息'" type="info" @click="removeRow">
           删除行
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
       </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="current === '证书基本信息' && title !== '详情'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.value" :label="item.text" align="center">
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :width="item.width" :prop="item.value" :label="item.text" align="center">
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
@@ -760,9 +828,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <!-- 选择用户列表组件 -->
-      <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
     </detail-block-switch>
+    <!-- 选择用户列表组件 -->
+    <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 35ab7ea..9d8359b 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -1,4 +1,4 @@
-<!-- 计量人员新增 -->
+<!-- 证书记录新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
@@ -45,26 +45,27 @@
 }) // 表单
 const title = ref('')
 const name = ref('')
-// 身份证号码验证规则
-// const validateIDcard = (rule: any, value: any, callback: any) => {
-//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-//   if (rr.test(value)) {
-//     callback()
-//   }
-//   else {
-//     callback(new Error('验证失败'))
-//   }
-// }
+// 自定义校验规则--要求检完时间不能比预计送达时间大
+const requireOverTimeValid = (rule: any, value: any, callback: any) => {
+  if (!value) {
+    return callback(new Error('有效日期必填'))
+  }
+  if (new Date(baseInfo.value.certificateDate).getTime() >= new Date(baseInfo.value.validDate).getTime()) {
+    return callback(new Error('有效日期应大于发证日期'))
+  }
+  callback()
+}
 const rules = ref({
-  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  staffNo: [{ required: true, message: '人员编号必填', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
 }) // 表单验证规则
+
 const rules2 = ref({
-  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
-  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
-  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '发证单位必填', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期必填', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: 'blur' }],
+  validDate: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -151,16 +152,12 @@
   ruleFormRef1.value?.clearValidate('staffNo')
 }
 // 提交
-const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  // 日期判断 证书有效期大于发证日期
-  if ((baseInfo.value.certificateDate && new Date(baseInfo.value.certificateDate).getTime()) >= (baseInfo.value.validDate && new Date(baseInfo.value.validDate).getTime())) {
-    ElMessage.warning('证书有效期应该大于发证日期!')
-  }
+const saveForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   if (!formEl1 || !formEl2) { return }
 
   Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认提交吗？',
+      '确认保存吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -237,8 +234,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title=" `${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
-          完成
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef1, ruleFormRef2)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
           关闭
@@ -248,9 +245,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title !== '新建'" @focus="selectPerson">
-                <template #append>
-                  <el-button size="small" :disabled="title !== '新建'" @click="selectPerson">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" disabled @focus="selectPerson">
+                <template v-if="title === '新建' || title === '编辑'" #append>
+                  <el-button size="small" @click="selectPerson">
                     选择
                   </el-button>
                 </template>
@@ -259,17 +256,17 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="meterStaff.name">
-              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title !== '新建'" />
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title !== '新建'" />
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" disabled style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -278,21 +275,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文化程度" prop="meterStaff.education">
-              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" disabled style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="meterStaff.technologyJob">
-              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" disabled style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="meterStaff.administrationJob">
-              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" disabled style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -301,28 +298,18 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title !== '新建'" style="width: 100%;" />
-              <!-- <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
-                placeholder="选择组织机构"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              /> -->
+              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title !== '新建'" />
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="从事日期" prop="workDate">
               <el-date-picker
-                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title !== '新建'"
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 50cf032..a9841f0 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -131,3 +131,11 @@
     data,
   })
 }
+// 工作培训记录
+export function getStaffCultivateLog(data: { id: string }) {
+  return request({
+    url: '/staff/staffCultivateLog',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 0dcebfc..925992b 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -94,8 +94,11 @@
         message: '请选择至少一个实验室',
         type: 'warning',
       })
+      return false
     }
     else {
+      console.log('111111', checkoutList.value)
+
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -105,6 +108,7 @@
         message: '请选择检定实验室',
         type: 'warning',
       })
+      return false
     }
     else {
       const checkValue = list.value.find(item => item.id == singleChecked.value)
@@ -127,7 +131,7 @@
 
 <template>
   <div class="choose-lab-dialog">
-    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -161,23 +165,25 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
+          :is-showmulti-select="multi"
+          :height="300"
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
-          <template v-if="!multi" #preColumns>
+          <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 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 d342a64..6d6b9e7 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -6,7 +6,7 @@
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', 'saveOver'])
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
@@ -75,11 +75,15 @@
 // 保存流程按钮点击
 const saveProcess = () => {
   processConfigRef.value.saveProcess()
-  emit('close')
 }
 function cancel() {
   dialogVisible.value = false
 }
+// 保存流程成功
+const saveOver = () => {
+  dialogVisible.value = false
+  emit('close')
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -111,7 +115,7 @@
     <el-button 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="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @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 bb66076..a67552a 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -108,6 +108,13 @@
     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}个流程：检定环节不能为空`)
+    return false
+  }
+
   // 处理顺序
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 07b2296..f995313 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -115,7 +115,7 @@
   ruleForm.createUserId = ''
   effectiveStatusName.value = ''
 }
-// 提交
+// 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e19a555..1c03550 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -12,12 +12,16 @@
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const ruleForm = ref({
   organizeType: '', // 类型
   organizeName: '', // 名称
   organizeNo: '', // 编号
   deptId: '', // 部门
   director: '', // 负责人
+  phone: '', // 联系方式
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
   meterMajor: '', // 计量专业
@@ -37,11 +41,12 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
-  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
-  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
+  organizeName: [{ required: true, message: '名称必填', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  phone: [{ required: true, message: '联系方式必填', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务必填', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务必填', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -49,12 +54,15 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    // deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    deptId: '', // 所属科室, // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
     if (res.code === 200) {
       userList.value = res.data.records
+      usePersonList.value = res.data.records
+      usePersonOptions.value = res.data.records
     }
   })
 }
@@ -95,13 +103,13 @@
     }
   })
 }
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -113,7 +121,7 @@
         updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
-            ElMessage.success('提交成功')
+            ElMessage.success('保存成功')
             $router.go(-1)
           }
         })
@@ -450,6 +458,22 @@
     }
   })
 }
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,7 +484,7 @@
   ruleForm.value.deptId = row.deptId
   ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
   ruleForm.value.meterMajor = row.meterMajor
-  getuser()
+  getuser() // 获取计量人员列表
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -507,8 +531,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="title">
       <template #btns>
-        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-          提交
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
@@ -609,9 +633,28 @@
         <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              <el-select
+                v-model="ruleForm.director"
+                :disabled="title.split('-')[2] === '详情'"
+                :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="directorChange"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <!-- <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式" prop="phone">
+              <el-input v-model.trim="ruleForm.phone" :placeholder="title.split('-')[2] === '详情' ? '' : '联系方式'" :disabled="title.split('-')[2] === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 33e63c8..44cad86 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -8,6 +8,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { dictType } from '@/global'
 const props = defineProps({
   name: {
     type: String,
@@ -52,39 +53,39 @@
   {
     name: '计量组织-部门',
     columns: [
-      { text: '部门编号', value: 'organizeNo', align: 'center' },
+      { text: '部门编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '部门名称', value: 'organizeName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-科室',
     columns: [
-      { text: '科室编号', value: 'organizeNo', align: 'center' },
+      { text: '科室编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-工程组',
     columns: [
-      { text: '工程组编号', value: 'organizeNo', align: 'center' },
+      { text: '工程组编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
 ])
@@ -92,11 +93,19 @@
   return columnsData.value.filter((item: { name: string;columns: TableColumn[] }) => item.name === props.name)[0].columns
 })
 const list = ref<rowType[]>([]) // 表格数据
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('deptType')
-  searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取类型
+  getDictByCode('deptType').then((res) => {
+    searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
@@ -119,6 +128,17 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  console.log('00000', props.name, props.authority)
+
+  if (props.authority === 'bm') {
+    searchQuery.organizeType = '2'
+  }
+  if (props.authority === 'ks') {
+    searchQuery.organizeType = '3'
+  }
+  if (props.authority === 'gcz') {
+    searchQuery.organizeType = '4'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
@@ -155,8 +175,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
@@ -168,11 +186,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: `${props.name}-编辑`,
-  // })
 }
 // 搜索
 const search = () => {
@@ -236,15 +249,13 @@
     ElMessage('无可打印内容')
   }
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-}
-onMounted(() => {
+
+onMounted(async () => {
+  await getDict()
   getDepartmentList()
-  getType().then((_) => {
-    getList()
-  })
+  // getType().then((_) => {
+  getList()
+  // })
 })
 </script>
 
@@ -261,7 +272,9 @@
           <el-input v-model="searchQuery.organizeName" :placeholder="`${props.name.split('-')[1]}名称`" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="专业" clearable class="w-50 m-2 " />
+          <el-select v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
@@ -282,22 +295,11 @@
             end-placeholder="创建结束时间"
             clearable
           />
-          <!-- <el-date-picker
-            v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="创建时间"
-          /> -->
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button> -->
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
@@ -319,7 +321,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="110">
+            <el-table-column label="操作" align="center" width="110" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index c75b5c1..85fdc44 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -40,32 +40,27 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
-  { text: '人员编号', value: 'staffNo', align: 'center' },
-  { text: '姓名', value: 'name', align: 'center', width: 90 },
-  { text: '性别', value: 'sex', align: 'center', width: 90 },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '160' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center', width: '70' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'validDate', align: 'center' },
-  { text: '证书状况', value: 'certificateStatus', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '110' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '110' },
+  { text: '证书状况', value: 'certificateStatusName', align: 'center' },
 ]) // 表格
 const certificateStatusList = ref([
   {
-    name: '全部',
-    id: 'status01',
-    value: '',
-  },
-  {
     name: '已失效',
-    id: 'status02',
+    id: '1',
     value: '1',
   },
   {
     name: '正常',
-    id: 'status02',
+    id: '0',
     value: '0',
   },
 ])
@@ -131,12 +126,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '详情',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 // 编辑
 const update = (row: StaffType) => {
@@ -151,12 +140,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '编辑',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 
 // 删除
@@ -233,11 +216,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 // 表格被选中的行
 const selectList = ref<StaffType[]>([])
@@ -331,18 +309,6 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
-            <el-option
-              v-for="item in deptList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select> -->
-          <!-- <com-tree-select
-            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
-            placeholder="工作部门" :tree-props="deptProps"
-          /> -->
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
@@ -364,8 +330,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index c750426..f2a2afc 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
+import dayjs from 'dayjs'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
 import { getUserList, roleAssign } from '@/api/system/user'
@@ -12,12 +13,13 @@
 import { toTreeList } from '@/utils/structure'
 import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
-import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
+const infoId = ref('') // id
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm: { [key: string]: string | any } = ref({
   account: '',
@@ -71,6 +73,8 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
+    console.log('0000', ruleForm.value.birthday)
+
     // 获取性别 第17位  奇数为男 偶数为女
     // ruleForm.value.sex
     if (Number(IdCard.substring(16, 17)) % 2) {
@@ -93,12 +97,10 @@
 const selectWhether = ref([
   { name: '是', value: '0' },
   { name: '否', value: '1' },
-])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
-const PubList = ref<TreeStructure[]>([])
-const PubListTree = ref([])
+])// 字典
+// ----------------------------------------------组织列表-------------------------------
+const PubList = ref<TreeStructure[]>([]) // 组织列表
+const PubListTree = ref([]) // 组织列表树
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
@@ -107,6 +109,7 @@
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
+// ----------------------------------------字典--------------------------------------------
 const sexList = ref<{ id: string; value: string; name: string }[]>()
 // 获取性别
 const getSexList = () => {
@@ -157,6 +160,7 @@
     administrationJobList.value = response.data
   })
 }
+// --------------------------------------------------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -248,35 +252,37 @@
       {
         text: '发证单位',
         value: 'certificateCompany',
-        id: 'zs01',
+        id: 'certificateCompany',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '证书号',
         value: 'certificateNo',
-        id: 'zs02',
+        id: 'certificateNo',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '证书名称',
         value: 'certificateName',
-        id: 'zs03',
+        id: 'certificateName',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '发证日期',
         value: 'certificateDate',
-        id: 'zs04',
+        id: 'certificateDate',
+        width: '120',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        id: 'zs05',
+        width: '120',
+        id: 'validDate',
         required: true,
         isDate: true, // 是否日期
       },
@@ -289,115 +295,126 @@
     column: [
       {
         text: '培训时间',
-        value: 'a1',
+        value: 'trainTime',
+        width: '180',
         id: 'zs01',
-        required: true,
+        required: false,
         isDate: true, // 是否日期
       },
       {
-        text: '培训班名称',
-        value: 'a2',
+        text: '培训名称',
+        value: 'planName',
         id: 'zs02',
-        required: true,
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '类别',
         value: 'a3',
         id: 'zs03',
-        required: true,
+        required: false,
         isSelect: true, // 是否下拉框
       },
       {
         text: '计划编号',
-        value: 'a4',
-        id: 'zs04',
-        required: true,
+        value: 'planNo',
+        width: '160',
+        id: 'planNo',
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '培训对象',
-        value: 'a5',
-        id: 'zs05',
-        required: true,
+        value: 'name',
+        id: 'name',
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '培训结果',
-        value: 'a6',
-        id: 'zs05',
-        required: true,
+        value: 'examResult',
+        id: 'examResult',
+        required: false,
         isDate: false, // 是否日期
       },
     ],
   },
-  {
-    name: '业务记录',
-    data: [] as any[],
-    deepData: [] as any[],
-    column: [
-      {
-        text: '样品编号',
-        value: 'b1',
-        id: 'zs01',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '样品名称',
-        value: 'b2',
-        id: 'zs02',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '委托书编号',
-        value: 'b3',
-        id: 'zs03',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '合同编号',
-        value: 'b4',
-        id: 'zs04',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '检定时间',
-        value: 'b5',
-        id: 'zs05',
-        required: true,
-        isDate: true, // 是否日期
-      },
-      {
-        text: '检定结果',
-        value: 'b6',
-        id: 'zs05',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '业务额',
-        value: 'b7',
-        id: 'zs05',
-        required: true,
-        isDate: false, // 是否日期
-      },
-    ],
-  },
+  // {
+  //   name: '业务记录',
+  //   data: [] as any[],
+  //   deepData: [] as any[],
+  //   column: [
+  //     {
+  //       text: '样品编号',
+  //       value: 'b1',
+  //       id: 'zs01',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '样品名称',
+  //       value: 'b2',
+  //       id: 'zs02',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '委托书编号',
+  //       value: 'b3',
+  //       id: 'zs03',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '合同编号',
+  //       value: 'b4',
+  //       id: 'zs04',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '检定时间',
+  //       value: 'b5',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: true, // 是否日期
+  //     },
+  //     {
+  //       text: '检定结果',
+  //       value: 'b6',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '业务额',
+  //       value: 'b7',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //   ],
+  // },
 ])
 const current = ref('证书基本信息')
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
-
+watch(current, () => {
+  if (current.value === '计量工作培训记录') {
+    getStaffCultivateLog({ id: infoId.value }).then((res) => {
+      changeList.value[1].data = res.data.rows
+    })
+  }
+  // if (current.value === '业务记录') {
+  //   console.log('暂时没有接口')
+  // }
+})
 // 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
+function checkCertificateList() {
+  for (let index = 0; index < changeList.value[0].data.length; index++) {
+    const item = changeList.value[0].data[index]
+    for (const prop of changeList.value[0].column) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
         ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
@@ -426,7 +443,7 @@
 // 添加行
 const addRow = () => {
   // certificateRef.value.initDialog({ title: '添加' })
-  if (checkPersonList()) {
+  if (checkCertificateList()) {
     setAllRowReadable()
     currentShow.value.data.push({
       ...addObj[current.value],
@@ -478,15 +495,30 @@
   console.log(certificateList, '最终需要提交的数组')
   return certificateList
 }
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (changeList.value[0].data.length) {
+    for (const key in ruleForm.value) {
+      if (ruleForm.value[key] === '') {
+        ruleForm.value[key] = null
+      }
+    }
+    if (!checkCertificateList()) {
+      return false
+    }
+  }
+  else {
+    ElMessage.warning('请先填写证书信息')
+    return false
+  }
   if (!formEl) { return }
   // 当前选中的证书基本信息列表
   const currentData = currentShow.value.data
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -498,59 +530,99 @@
           item.id = ''
           return item
         })
-        if (changeList.value[0].data.length) {
-          for (const key in ruleForm.value) {
-            if (ruleForm.value[key] === '') {
-              ruleForm.value[key] = null
-            }
-          }
-          // changeList.value[0].data
-          // handleRecord(changeList.value[0].deepData
-          (title.value === '新建'
-            ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
-            : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
-            if (res.code == 200) {
-              // formEl?.resetFields()
-              // ElMessage.success('提交成功')
-              // resetFormData()
-              // $router.go(-1)
-              // 获取当前用户角色
-              getRoleTreeListByUser(userInfoData.value.id).then((res) => {
-                console.log(res.data, '角色列表')
-                // 当前用户 角色 id
-                const roleIds: string[] = []
-                // 挑选 计量人员 角色id
-                let metering = ''
-                const data = res.data
-                data.forEach((item: any) => {
-                  // 当前用户角色
-                  if (item.checked) {
-                    roleIds.push(item.id)
-                  }
-                  // 计量人员角色
-                  if (item.name === '计量人员') {
-                    metering = item.id
-                  }
-                })
-                // 判断当前用户是否 计量人员角色
-                if (roleIds.every(item => item !== metering)) {
-                  roleIds.push(metering)
+
+        // changeList.value[0].data
+        // handleRecord(changeList.value[0].deepData
+        if (title.value === '新建') {
+          getStaffAdd({
+            ...ruleForm.value,
+            certificateList: changeList.value[0].data,
+            birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}`,
+          }).then((res) => {
+            // 获取当前用户角色
+            getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+              console.log(res.data, '角色列表')
+              // 当前用户 角色 id
+              const roleIds: string[] = []
+              // 挑选 计量人员 角色id
+              let metering = ''
+              const data = res.data
+              data.forEach((item: any) => {
+                // 当前用户角色
+                if (item.checked) {
+                  roleIds.push(item.id)
                 }
-                // 设置当前用户角色
-                roleAssign(userInfoData.value.id, roleIds).then((res) => {
-                  console.log('分配计量人员角色成功')
-                  formEl?.resetFields()
-                  ElMessage.success('提交成功')
-                  resetFormData()
-                  $router.go(-1)
-                })
+                // 计量人员角色
+                if (item.name === '计量人员') {
+                  metering = item.id
+                }
               })
-            }
+              // 判断当前用户是否 计量人员角色
+              if (roleIds.every(item => item !== metering)) {
+                roleIds.push(metering)
+              }
+              // 设置当前用户角色
+              roleAssign(userInfoData.value.id, roleIds).then((res) => {
+                console.log('分配计量人员角色成功')
+                formEl?.resetFields()
+                ElMessage.success('保存成功')
+                resetFormData()
+                $router.go(-1)
+              })
+            })
           })
         }
         else {
-          ElMessage.warning('请先填写证书信息')
+          getStaffupdate({
+            ...ruleForm.value,
+            certificateList: changeList.value[0].data,
+            birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}`,
+          }).then((res) => {
+            if (res.code == 200) {
+              ElMessage.success('保存成功')
+              $router.go(-1)
+            }
+          })
         }
+
+        //   if (res.code == 200) {
+        //     // formEl?.resetFields()
+        //     ElMessage.success('保存成功')
+        //     // resetFormData()
+        //     // $router.go(-1)
+        //     // 获取当前用户角色
+        //     getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+        //       console.log(res.data, '角色列表')
+        //       // 当前用户 角色 id
+        //       const roleIds: string[] = []
+        //       // 挑选 计量人员 角色id
+        //       let metering = ''
+        //       const data = res.data
+        //       data.forEach((item: any) => {
+        //         // 当前用户角色
+        //         if (item.checked) {
+        //           roleIds.push(item.id)
+        //         }
+        //         // 计量人员角色
+        //         if (item.name === '计量人员') {
+        //           metering = item.id
+        //         }
+        //       })
+        //       // 判断当前用户是否 计量人员角色
+        //       if (roleIds.every(item => item !== metering)) {
+        //         roleIds.push(metering)
+        //       }
+        //       // 设置当前用户角色
+        //       roleAssign(userInfoData.value.id, roleIds).then((res) => {
+        //         console.log('分配计量人员角色成功')
+        //         formEl?.resetFields()
+        //         ElMessage.success('保存成功')
+        //         resetFormData()
+        //         $router.go(-1)
+        //       })
+        //     })
+        //   }
+        // })
       })
     }
   })
@@ -564,6 +636,7 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  infoId.value = row.id // 主键
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
@@ -581,7 +654,13 @@
     getStaffDetail({ ...row }).then((res) => {
       if (res.code === 200) {
         ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        changeList.value[0].data = res.data.certificateList.map((item: { certificateDate: string; validDate: string }) => {
+          return {
+            ...item,
+            certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+          }
+        }) // 证书基本信息
         changeList.value[0].deepData = lodash.cloneDeep(res.data.certificateList)
         staffId.value = changeList.value[0].deepData[0]?.staffId
       }
@@ -607,8 +686,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`计量人员-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-          完成
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
@@ -636,7 +715,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" disabled @focus="selectPerson">
                 <template #append>
                   <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
                     选择
@@ -647,19 +726,11 @@
             <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
-                placeholder="出生年月" :disabled="title === '详情'"
+                placeholder="出生年月" disabled
                 style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <!-- <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
-              /> -->
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -676,7 +747,7 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" disabled style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -725,27 +796,24 @@
     </detail-page>
     <detail-block-switch :title="current">
       <template #menu>
-        <el-radio-group v-model="current">
+        <el-radio-group v-if="title === '详情'" v-model="current">
           <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
             {{ item.name }}
           </el-radio-button>
         </el-radio-group>
       </template>
       <template #btns>
-        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+        <el-button v-if="title !== '详情' && current === '证书基本信息'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button v-if="title !== '详情' && current === '证书基本信息'" type="info" @click="removeRow">
           删除行
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
       </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="current === '证书基本信息' && title !== '详情'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.value" :label="item.text" align="center">
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :width="item.width" :prop="item.value" :label="item.text" align="center">
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
@@ -760,9 +828,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <!-- 选择用户列表组件 -->
-      <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
     </detail-block-switch>
+    <!-- 选择用户列表组件 -->
+    <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 35ab7ea..9d8359b 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -1,4 +1,4 @@
-<!-- 计量人员新增 -->
+<!-- 证书记录新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
@@ -45,26 +45,27 @@
 }) // 表单
 const title = ref('')
 const name = ref('')
-// 身份证号码验证规则
-// const validateIDcard = (rule: any, value: any, callback: any) => {
-//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-//   if (rr.test(value)) {
-//     callback()
-//   }
-//   else {
-//     callback(new Error('验证失败'))
-//   }
-// }
+// 自定义校验规则--要求检完时间不能比预计送达时间大
+const requireOverTimeValid = (rule: any, value: any, callback: any) => {
+  if (!value) {
+    return callback(new Error('有效日期必填'))
+  }
+  if (new Date(baseInfo.value.certificateDate).getTime() >= new Date(baseInfo.value.validDate).getTime()) {
+    return callback(new Error('有效日期应大于发证日期'))
+  }
+  callback()
+}
 const rules = ref({
-  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  staffNo: [{ required: true, message: '人员编号必填', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
 }) // 表单验证规则
+
 const rules2 = ref({
-  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
-  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
-  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '发证单位必填', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期必填', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: 'blur' }],
+  validDate: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -151,16 +152,12 @@
   ruleFormRef1.value?.clearValidate('staffNo')
 }
 // 提交
-const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  // 日期判断 证书有效期大于发证日期
-  if ((baseInfo.value.certificateDate && new Date(baseInfo.value.certificateDate).getTime()) >= (baseInfo.value.validDate && new Date(baseInfo.value.validDate).getTime())) {
-    ElMessage.warning('证书有效期应该大于发证日期!')
-  }
+const saveForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   if (!formEl1 || !formEl2) { return }
 
   Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认提交吗？',
+      '确认保存吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -237,8 +234,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title=" `${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
-          完成
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef1, ruleFormRef2)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
           关闭
@@ -248,9 +245,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title !== '新建'" @focus="selectPerson">
-                <template #append>
-                  <el-button size="small" :disabled="title !== '新建'" @click="selectPerson">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" disabled @focus="selectPerson">
+                <template v-if="title === '新建' || title === '编辑'" #append>
+                  <el-button size="small" @click="selectPerson">
                     选择
                   </el-button>
                 </template>
@@ -259,17 +256,17 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="meterStaff.name">
-              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title !== '新建'" />
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title !== '新建'" />
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" disabled style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -278,21 +275,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文化程度" prop="meterStaff.education">
-              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" disabled style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="meterStaff.technologyJob">
-              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" disabled style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="meterStaff.administrationJob">
-              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" disabled style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -301,28 +298,18 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title !== '新建'" style="width: 100%;" />
-              <!-- <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
-                placeholder="选择组织机构"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              /> -->
+              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title !== '新建'" />
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="从事日期" prop="workDate">
               <el-date-picker
-                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title !== '新建'"
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 303f239..02672dc 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -29,9 +29,9 @@
 const select = ref(-1)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '姓名', value: 'name' },
-  { text: '账户', value: 'account' },
-  { text: '所在部门', value: 'deptName' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '账户', value: 'account', align: 'center' },
+  { text: '所在部门', value: 'deptName', align: 'center' },
 ])
 // 所在部门
 const deptProps = reactive({
@@ -114,7 +114,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -137,16 +137,16 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-          <el-table-column label="序号" width="55" align="center">
+          <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 label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
         </template>
       </normal-table>
     </div>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 50cf032..a9841f0 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -131,3 +131,11 @@
     data,
   })
 }
+// 工作培训记录
+export function getStaffCultivateLog(data: { id: string }) {
+  return request({
+    url: '/staff/staffCultivateLog',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 0dcebfc..925992b 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -94,8 +94,11 @@
         message: '请选择至少一个实验室',
         type: 'warning',
       })
+      return false
     }
     else {
+      console.log('111111', checkoutList.value)
+
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -105,6 +108,7 @@
         message: '请选择检定实验室',
         type: 'warning',
       })
+      return false
     }
     else {
       const checkValue = list.value.find(item => item.id == singleChecked.value)
@@ -127,7 +131,7 @@
 
 <template>
   <div class="choose-lab-dialog">
-    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -161,23 +165,25 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
+          :is-showmulti-select="multi"
+          :height="300"
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
-          <template v-if="!multi" #preColumns>
+          <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 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 d342a64..6d6b9e7 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -6,7 +6,7 @@
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', 'saveOver'])
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
@@ -75,11 +75,15 @@
 // 保存流程按钮点击
 const saveProcess = () => {
   processConfigRef.value.saveProcess()
-  emit('close')
 }
 function cancel() {
   dialogVisible.value = false
 }
+// 保存流程成功
+const saveOver = () => {
+  dialogVisible.value = false
+  emit('close')
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -111,7 +115,7 @@
     <el-button 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="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @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 bb66076..a67552a 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -108,6 +108,13 @@
     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}个流程：检定环节不能为空`)
+    return false
+  }
+
   // 处理顺序
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 07b2296..f995313 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -115,7 +115,7 @@
   ruleForm.createUserId = ''
   effectiveStatusName.value = ''
 }
-// 提交
+// 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e19a555..1c03550 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -12,12 +12,16 @@
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const ruleForm = ref({
   organizeType: '', // 类型
   organizeName: '', // 名称
   organizeNo: '', // 编号
   deptId: '', // 部门
   director: '', // 负责人
+  phone: '', // 联系方式
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
   meterMajor: '', // 计量专业
@@ -37,11 +41,12 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
-  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
-  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
+  organizeName: [{ required: true, message: '名称必填', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  phone: [{ required: true, message: '联系方式必填', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务必填', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务必填', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -49,12 +54,15 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    // deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    deptId: '', // 所属科室, // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
     if (res.code === 200) {
       userList.value = res.data.records
+      usePersonList.value = res.data.records
+      usePersonOptions.value = res.data.records
     }
   })
 }
@@ -95,13 +103,13 @@
     }
   })
 }
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -113,7 +121,7 @@
         updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
-            ElMessage.success('提交成功')
+            ElMessage.success('保存成功')
             $router.go(-1)
           }
         })
@@ -450,6 +458,22 @@
     }
   })
 }
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,7 +484,7 @@
   ruleForm.value.deptId = row.deptId
   ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
   ruleForm.value.meterMajor = row.meterMajor
-  getuser()
+  getuser() // 获取计量人员列表
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -507,8 +531,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="title">
       <template #btns>
-        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-          提交
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
@@ -609,9 +633,28 @@
         <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              <el-select
+                v-model="ruleForm.director"
+                :disabled="title.split('-')[2] === '详情'"
+                :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="directorChange"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <!-- <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式" prop="phone">
+              <el-input v-model.trim="ruleForm.phone" :placeholder="title.split('-')[2] === '详情' ? '' : '联系方式'" :disabled="title.split('-')[2] === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 33e63c8..44cad86 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -8,6 +8,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { dictType } from '@/global'
 const props = defineProps({
   name: {
     type: String,
@@ -52,39 +53,39 @@
   {
     name: '计量组织-部门',
     columns: [
-      { text: '部门编号', value: 'organizeNo', align: 'center' },
+      { text: '部门编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '部门名称', value: 'organizeName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-科室',
     columns: [
-      { text: '科室编号', value: 'organizeNo', align: 'center' },
+      { text: '科室编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-工程组',
     columns: [
-      { text: '工程组编号', value: 'organizeNo', align: 'center' },
+      { text: '工程组编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
 ])
@@ -92,11 +93,19 @@
   return columnsData.value.filter((item: { name: string;columns: TableColumn[] }) => item.name === props.name)[0].columns
 })
 const list = ref<rowType[]>([]) // 表格数据
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('deptType')
-  searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取类型
+  getDictByCode('deptType').then((res) => {
+    searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
@@ -119,6 +128,17 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  console.log('00000', props.name, props.authority)
+
+  if (props.authority === 'bm') {
+    searchQuery.organizeType = '2'
+  }
+  if (props.authority === 'ks') {
+    searchQuery.organizeType = '3'
+  }
+  if (props.authority === 'gcz') {
+    searchQuery.organizeType = '4'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
@@ -155,8 +175,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
@@ -168,11 +186,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: `${props.name}-编辑`,
-  // })
 }
 // 搜索
 const search = () => {
@@ -236,15 +249,13 @@
     ElMessage('无可打印内容')
   }
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-}
-onMounted(() => {
+
+onMounted(async () => {
+  await getDict()
   getDepartmentList()
-  getType().then((_) => {
-    getList()
-  })
+  // getType().then((_) => {
+  getList()
+  // })
 })
 </script>
 
@@ -261,7 +272,9 @@
           <el-input v-model="searchQuery.organizeName" :placeholder="`${props.name.split('-')[1]}名称`" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="专业" clearable class="w-50 m-2 " />
+          <el-select v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
@@ -282,22 +295,11 @@
             end-placeholder="创建结束时间"
             clearable
           />
-          <!-- <el-date-picker
-            v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="创建时间"
-          /> -->
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button> -->
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
@@ -319,7 +321,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="110">
+            <el-table-column label="操作" align="center" width="110" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index c75b5c1..85fdc44 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -40,32 +40,27 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
-  { text: '人员编号', value: 'staffNo', align: 'center' },
-  { text: '姓名', value: 'name', align: 'center', width: 90 },
-  { text: '性别', value: 'sex', align: 'center', width: 90 },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '160' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center', width: '70' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'validDate', align: 'center' },
-  { text: '证书状况', value: 'certificateStatus', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '110' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '110' },
+  { text: '证书状况', value: 'certificateStatusName', align: 'center' },
 ]) // 表格
 const certificateStatusList = ref([
   {
-    name: '全部',
-    id: 'status01',
-    value: '',
-  },
-  {
     name: '已失效',
-    id: 'status02',
+    id: '1',
     value: '1',
   },
   {
     name: '正常',
-    id: 'status02',
+    id: '0',
     value: '0',
   },
 ])
@@ -131,12 +126,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '详情',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 // 编辑
 const update = (row: StaffType) => {
@@ -151,12 +140,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '编辑',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 
 // 删除
@@ -233,11 +216,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 // 表格被选中的行
 const selectList = ref<StaffType[]>([])
@@ -331,18 +309,6 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
-            <el-option
-              v-for="item in deptList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select> -->
-          <!-- <com-tree-select
-            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
-            placeholder="工作部门" :tree-props="deptProps"
-          /> -->
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
@@ -364,8 +330,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index c750426..f2a2afc 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
+import dayjs from 'dayjs'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
 import { getUserList, roleAssign } from '@/api/system/user'
@@ -12,12 +13,13 @@
 import { toTreeList } from '@/utils/structure'
 import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
-import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
+const infoId = ref('') // id
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm: { [key: string]: string | any } = ref({
   account: '',
@@ -71,6 +73,8 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
+    console.log('0000', ruleForm.value.birthday)
+
     // 获取性别 第17位  奇数为男 偶数为女
     // ruleForm.value.sex
     if (Number(IdCard.substring(16, 17)) % 2) {
@@ -93,12 +97,10 @@
 const selectWhether = ref([
   { name: '是', value: '0' },
   { name: '否', value: '1' },
-])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
-const PubList = ref<TreeStructure[]>([])
-const PubListTree = ref([])
+])// 字典
+// ----------------------------------------------组织列表-------------------------------
+const PubList = ref<TreeStructure[]>([]) // 组织列表
+const PubListTree = ref([]) // 组织列表树
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
@@ -107,6 +109,7 @@
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
+// ----------------------------------------字典--------------------------------------------
 const sexList = ref<{ id: string; value: string; name: string }[]>()
 // 获取性别
 const getSexList = () => {
@@ -157,6 +160,7 @@
     administrationJobList.value = response.data
   })
 }
+// --------------------------------------------------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -248,35 +252,37 @@
       {
         text: '发证单位',
         value: 'certificateCompany',
-        id: 'zs01',
+        id: 'certificateCompany',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '证书号',
         value: 'certificateNo',
-        id: 'zs02',
+        id: 'certificateNo',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '证书名称',
         value: 'certificateName',
-        id: 'zs03',
+        id: 'certificateName',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '发证日期',
         value: 'certificateDate',
-        id: 'zs04',
+        id: 'certificateDate',
+        width: '120',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        id: 'zs05',
+        width: '120',
+        id: 'validDate',
         required: true,
         isDate: true, // 是否日期
       },
@@ -289,115 +295,126 @@
     column: [
       {
         text: '培训时间',
-        value: 'a1',
+        value: 'trainTime',
+        width: '180',
         id: 'zs01',
-        required: true,
+        required: false,
         isDate: true, // 是否日期
       },
       {
-        text: '培训班名称',
-        value: 'a2',
+        text: '培训名称',
+        value: 'planName',
         id: 'zs02',
-        required: true,
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '类别',
         value: 'a3',
         id: 'zs03',
-        required: true,
+        required: false,
         isSelect: true, // 是否下拉框
       },
       {
         text: '计划编号',
-        value: 'a4',
-        id: 'zs04',
-        required: true,
+        value: 'planNo',
+        width: '160',
+        id: 'planNo',
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '培训对象',
-        value: 'a5',
-        id: 'zs05',
-        required: true,
+        value: 'name',
+        id: 'name',
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '培训结果',
-        value: 'a6',
-        id: 'zs05',
-        required: true,
+        value: 'examResult',
+        id: 'examResult',
+        required: false,
         isDate: false, // 是否日期
       },
     ],
   },
-  {
-    name: '业务记录',
-    data: [] as any[],
-    deepData: [] as any[],
-    column: [
-      {
-        text: '样品编号',
-        value: 'b1',
-        id: 'zs01',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '样品名称',
-        value: 'b2',
-        id: 'zs02',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '委托书编号',
-        value: 'b3',
-        id: 'zs03',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '合同编号',
-        value: 'b4',
-        id: 'zs04',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '检定时间',
-        value: 'b5',
-        id: 'zs05',
-        required: true,
-        isDate: true, // 是否日期
-      },
-      {
-        text: '检定结果',
-        value: 'b6',
-        id: 'zs05',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '业务额',
-        value: 'b7',
-        id: 'zs05',
-        required: true,
-        isDate: false, // 是否日期
-      },
-    ],
-  },
+  // {
+  //   name: '业务记录',
+  //   data: [] as any[],
+  //   deepData: [] as any[],
+  //   column: [
+  //     {
+  //       text: '样品编号',
+  //       value: 'b1',
+  //       id: 'zs01',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '样品名称',
+  //       value: 'b2',
+  //       id: 'zs02',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '委托书编号',
+  //       value: 'b3',
+  //       id: 'zs03',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '合同编号',
+  //       value: 'b4',
+  //       id: 'zs04',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '检定时间',
+  //       value: 'b5',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: true, // 是否日期
+  //     },
+  //     {
+  //       text: '检定结果',
+  //       value: 'b6',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '业务额',
+  //       value: 'b7',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //   ],
+  // },
 ])
 const current = ref('证书基本信息')
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
-
+watch(current, () => {
+  if (current.value === '计量工作培训记录') {
+    getStaffCultivateLog({ id: infoId.value }).then((res) => {
+      changeList.value[1].data = res.data.rows
+    })
+  }
+  // if (current.value === '业务记录') {
+  //   console.log('暂时没有接口')
+  // }
+})
 // 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
+function checkCertificateList() {
+  for (let index = 0; index < changeList.value[0].data.length; index++) {
+    const item = changeList.value[0].data[index]
+    for (const prop of changeList.value[0].column) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
         ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
@@ -426,7 +443,7 @@
 // 添加行
 const addRow = () => {
   // certificateRef.value.initDialog({ title: '添加' })
-  if (checkPersonList()) {
+  if (checkCertificateList()) {
     setAllRowReadable()
     currentShow.value.data.push({
       ...addObj[current.value],
@@ -478,15 +495,30 @@
   console.log(certificateList, '最终需要提交的数组')
   return certificateList
 }
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (changeList.value[0].data.length) {
+    for (const key in ruleForm.value) {
+      if (ruleForm.value[key] === '') {
+        ruleForm.value[key] = null
+      }
+    }
+    if (!checkCertificateList()) {
+      return false
+    }
+  }
+  else {
+    ElMessage.warning('请先填写证书信息')
+    return false
+  }
   if (!formEl) { return }
   // 当前选中的证书基本信息列表
   const currentData = currentShow.value.data
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -498,59 +530,99 @@
           item.id = ''
           return item
         })
-        if (changeList.value[0].data.length) {
-          for (const key in ruleForm.value) {
-            if (ruleForm.value[key] === '') {
-              ruleForm.value[key] = null
-            }
-          }
-          // changeList.value[0].data
-          // handleRecord(changeList.value[0].deepData
-          (title.value === '新建'
-            ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
-            : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
-            if (res.code == 200) {
-              // formEl?.resetFields()
-              // ElMessage.success('提交成功')
-              // resetFormData()
-              // $router.go(-1)
-              // 获取当前用户角色
-              getRoleTreeListByUser(userInfoData.value.id).then((res) => {
-                console.log(res.data, '角色列表')
-                // 当前用户 角色 id
-                const roleIds: string[] = []
-                // 挑选 计量人员 角色id
-                let metering = ''
-                const data = res.data
-                data.forEach((item: any) => {
-                  // 当前用户角色
-                  if (item.checked) {
-                    roleIds.push(item.id)
-                  }
-                  // 计量人员角色
-                  if (item.name === '计量人员') {
-                    metering = item.id
-                  }
-                })
-                // 判断当前用户是否 计量人员角色
-                if (roleIds.every(item => item !== metering)) {
-                  roleIds.push(metering)
+
+        // changeList.value[0].data
+        // handleRecord(changeList.value[0].deepData
+        if (title.value === '新建') {
+          getStaffAdd({
+            ...ruleForm.value,
+            certificateList: changeList.value[0].data,
+            birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}`,
+          }).then((res) => {
+            // 获取当前用户角色
+            getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+              console.log(res.data, '角色列表')
+              // 当前用户 角色 id
+              const roleIds: string[] = []
+              // 挑选 计量人员 角色id
+              let metering = ''
+              const data = res.data
+              data.forEach((item: any) => {
+                // 当前用户角色
+                if (item.checked) {
+                  roleIds.push(item.id)
                 }
-                // 设置当前用户角色
-                roleAssign(userInfoData.value.id, roleIds).then((res) => {
-                  console.log('分配计量人员角色成功')
-                  formEl?.resetFields()
-                  ElMessage.success('提交成功')
-                  resetFormData()
-                  $router.go(-1)
-                })
+                // 计量人员角色
+                if (item.name === '计量人员') {
+                  metering = item.id
+                }
               })
-            }
+              // 判断当前用户是否 计量人员角色
+              if (roleIds.every(item => item !== metering)) {
+                roleIds.push(metering)
+              }
+              // 设置当前用户角色
+              roleAssign(userInfoData.value.id, roleIds).then((res) => {
+                console.log('分配计量人员角色成功')
+                formEl?.resetFields()
+                ElMessage.success('保存成功')
+                resetFormData()
+                $router.go(-1)
+              })
+            })
           })
         }
         else {
-          ElMessage.warning('请先填写证书信息')
+          getStaffupdate({
+            ...ruleForm.value,
+            certificateList: changeList.value[0].data,
+            birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}`,
+          }).then((res) => {
+            if (res.code == 200) {
+              ElMessage.success('保存成功')
+              $router.go(-1)
+            }
+          })
         }
+
+        //   if (res.code == 200) {
+        //     // formEl?.resetFields()
+        //     ElMessage.success('保存成功')
+        //     // resetFormData()
+        //     // $router.go(-1)
+        //     // 获取当前用户角色
+        //     getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+        //       console.log(res.data, '角色列表')
+        //       // 当前用户 角色 id
+        //       const roleIds: string[] = []
+        //       // 挑选 计量人员 角色id
+        //       let metering = ''
+        //       const data = res.data
+        //       data.forEach((item: any) => {
+        //         // 当前用户角色
+        //         if (item.checked) {
+        //           roleIds.push(item.id)
+        //         }
+        //         // 计量人员角色
+        //         if (item.name === '计量人员') {
+        //           metering = item.id
+        //         }
+        //       })
+        //       // 判断当前用户是否 计量人员角色
+        //       if (roleIds.every(item => item !== metering)) {
+        //         roleIds.push(metering)
+        //       }
+        //       // 设置当前用户角色
+        //       roleAssign(userInfoData.value.id, roleIds).then((res) => {
+        //         console.log('分配计量人员角色成功')
+        //         formEl?.resetFields()
+        //         ElMessage.success('保存成功')
+        //         resetFormData()
+        //         $router.go(-1)
+        //       })
+        //     })
+        //   }
+        // })
       })
     }
   })
@@ -564,6 +636,7 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  infoId.value = row.id // 主键
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
@@ -581,7 +654,13 @@
     getStaffDetail({ ...row }).then((res) => {
       if (res.code === 200) {
         ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        changeList.value[0].data = res.data.certificateList.map((item: { certificateDate: string; validDate: string }) => {
+          return {
+            ...item,
+            certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+          }
+        }) // 证书基本信息
         changeList.value[0].deepData = lodash.cloneDeep(res.data.certificateList)
         staffId.value = changeList.value[0].deepData[0]?.staffId
       }
@@ -607,8 +686,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`计量人员-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-          完成
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
@@ -636,7 +715,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" disabled @focus="selectPerson">
                 <template #append>
                   <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
                     选择
@@ -647,19 +726,11 @@
             <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
-                placeholder="出生年月" :disabled="title === '详情'"
+                placeholder="出生年月" disabled
                 style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <!-- <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
-              /> -->
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -676,7 +747,7 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" disabled style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -725,27 +796,24 @@
     </detail-page>
     <detail-block-switch :title="current">
       <template #menu>
-        <el-radio-group v-model="current">
+        <el-radio-group v-if="title === '详情'" v-model="current">
           <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
             {{ item.name }}
           </el-radio-button>
         </el-radio-group>
       </template>
       <template #btns>
-        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+        <el-button v-if="title !== '详情' && current === '证书基本信息'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button v-if="title !== '详情' && current === '证书基本信息'" type="info" @click="removeRow">
           删除行
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
       </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="current === '证书基本信息' && title !== '详情'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.value" :label="item.text" align="center">
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :width="item.width" :prop="item.value" :label="item.text" align="center">
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
@@ -760,9 +828,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <!-- 选择用户列表组件 -->
-      <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
     </detail-block-switch>
+    <!-- 选择用户列表组件 -->
+    <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 35ab7ea..9d8359b 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -1,4 +1,4 @@
-<!-- 计量人员新增 -->
+<!-- 证书记录新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
@@ -45,26 +45,27 @@
 }) // 表单
 const title = ref('')
 const name = ref('')
-// 身份证号码验证规则
-// const validateIDcard = (rule: any, value: any, callback: any) => {
-//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-//   if (rr.test(value)) {
-//     callback()
-//   }
-//   else {
-//     callback(new Error('验证失败'))
-//   }
-// }
+// 自定义校验规则--要求检完时间不能比预计送达时间大
+const requireOverTimeValid = (rule: any, value: any, callback: any) => {
+  if (!value) {
+    return callback(new Error('有效日期必填'))
+  }
+  if (new Date(baseInfo.value.certificateDate).getTime() >= new Date(baseInfo.value.validDate).getTime()) {
+    return callback(new Error('有效日期应大于发证日期'))
+  }
+  callback()
+}
 const rules = ref({
-  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  staffNo: [{ required: true, message: '人员编号必填', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
 }) // 表单验证规则
+
 const rules2 = ref({
-  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
-  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
-  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '发证单位必填', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期必填', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: 'blur' }],
+  validDate: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -151,16 +152,12 @@
   ruleFormRef1.value?.clearValidate('staffNo')
 }
 // 提交
-const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  // 日期判断 证书有效期大于发证日期
-  if ((baseInfo.value.certificateDate && new Date(baseInfo.value.certificateDate).getTime()) >= (baseInfo.value.validDate && new Date(baseInfo.value.validDate).getTime())) {
-    ElMessage.warning('证书有效期应该大于发证日期!')
-  }
+const saveForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   if (!formEl1 || !formEl2) { return }
 
   Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认提交吗？',
+      '确认保存吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -237,8 +234,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title=" `${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
-          完成
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef1, ruleFormRef2)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
           关闭
@@ -248,9 +245,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title !== '新建'" @focus="selectPerson">
-                <template #append>
-                  <el-button size="small" :disabled="title !== '新建'" @click="selectPerson">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" disabled @focus="selectPerson">
+                <template v-if="title === '新建' || title === '编辑'" #append>
+                  <el-button size="small" @click="selectPerson">
                     选择
                   </el-button>
                 </template>
@@ -259,17 +256,17 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="meterStaff.name">
-              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title !== '新建'" />
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title !== '新建'" />
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" disabled style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -278,21 +275,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文化程度" prop="meterStaff.education">
-              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" disabled style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="meterStaff.technologyJob">
-              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" disabled style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="meterStaff.administrationJob">
-              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" disabled style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -301,28 +298,18 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title !== '新建'" style="width: 100%;" />
-              <!-- <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
-                placeholder="选择组织机构"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              /> -->
+              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title !== '新建'" />
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="从事日期" prop="workDate">
               <el-date-picker
-                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title !== '新建'"
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 303f239..02672dc 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -29,9 +29,9 @@
 const select = ref(-1)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '姓名', value: 'name' },
-  { text: '账户', value: 'account' },
-  { text: '所在部门', value: 'deptName' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '账户', value: 'account', align: 'center' },
+  { text: '所在部门', value: 'deptName', align: 'center' },
 ])
 // 所在部门
 const deptProps = reactive({
@@ -114,7 +114,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -137,16 +137,16 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-          <el-table-column label="序号" width="55" align="center">
+          <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 label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
         </template>
       </normal-table>
     </div>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index ecda4cf..1636ee9 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -28,7 +28,7 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '160' },
   { text: '姓名', value: 'name', align: 'center' },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
@@ -37,7 +37,7 @@
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '120' },
   { text: '技术考核', value: 'technologyExam', align: 'center' },
 ]) // 表格
 
@@ -82,11 +82,6 @@
     },
     path: '/person/detail',
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '详情',
-  // })
 }
 // 编辑
 const update = (row: StaffType) => {
@@ -97,11 +92,6 @@
     },
     path: '/person/detail',
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '编辑',
-  // })
 }
 
 // 删除
@@ -170,6 +160,8 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
   getList()
 }
 // 模板下载
@@ -178,10 +170,6 @@
 }
 // 新增
 const add = () => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  // })
   $router.push({
     query: {
       title: '新建',
@@ -192,28 +180,37 @@
 // 表格被选中的行
 const selectList = ref<StaffType[]>([])
 // 表格多选
-const multiSelect = (row: StaffType[]) => {
-  selectList.value = row
+const multiSelect = (e: any) => {
+  selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
+  if (list.value.length > 0) {
+    const params = {
+      staffNo: searchQuery.staffNo, // 人员编号
+      name: searchQuery.name, // 姓名
+      deptId: searchQuery.deptId, // 工作部门
+      major: searchQuery.major, // 计量专业
+      verifierCertificateNo: searchQuery.verifierCertificateNo, // 证书号
+      certificateStatus: searchQuery.certificateStatus, // 证书状态
+      limit: 20,
+      offset: 1,
+      ids: selectList.value,
+    }
+    exportList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '计量人员列表.xlsx')
     })
   }
-  exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    exportFile(res.data, '计量人员列表')
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
 }
 // 打印
 function printList() {
@@ -310,8 +307,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 50cf032..a9841f0 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -131,3 +131,11 @@
     data,
   })
 }
+// 工作培训记录
+export function getStaffCultivateLog(data: { id: string }) {
+  return request({
+    url: '/staff/staffCultivateLog',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 0dcebfc..925992b 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -94,8 +94,11 @@
         message: '请选择至少一个实验室',
         type: 'warning',
       })
+      return false
     }
     else {
+      console.log('111111', checkoutList.value)
+
       emits('confirmCheckout', checkoutList.value)
     }
   }
@@ -105,6 +108,7 @@
         message: '请选择检定实验室',
         type: 'warning',
       })
+      return false
     }
     else {
       const checkValue = list.value.find(item => item.id == singleChecked.value)
@@ -127,7 +131,7 @@
 
 <template>
   <div class="choose-lab-dialog">
-    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -161,23 +165,25 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
+          :is-showmulti-select="multi"
+          :height="300"
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
-          <template v-if="!multi" #preColumns>
+          <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 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 d342a64..6d6b9e7 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -6,7 +6,7 @@
 // 任务分发弹窗
 
 // 自定义方法：close关闭弹窗
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', 'saveOver'])
 const dialogVisible = ref(false) // 弹窗显示
 const sampleId = ref('') // 样品id
 const orderId = ref('') // 委托单id
@@ -75,11 +75,15 @@
 // 保存流程按钮点击
 const saveProcess = () => {
   processConfigRef.value.saveProcess()
-  emit('close')
 }
 function cancel() {
   dialogVisible.value = false
 }
+// 保存流程成功
+const saveOver = () => {
+  dialogVisible.value = false
+  emit('close')
+}
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
 </script>
@@ -111,7 +115,7 @@
     <el-button 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="cancel" />
+    <process-config v-if="orderId" :key="Math.random()" ref="processConfigRef" :type="type" :order-id="orderId" :sample-id="sampleId" :list="sampleDetail.measureProcessList" @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 bb66076..a67552a 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -108,6 +108,13 @@
     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}个流程：检定环节不能为空`)
+    return false
+  }
+
   // 处理顺序
   for (const key in form.measureProcessList) {
     form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 07b2296..f995313 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -115,7 +115,7 @@
   ruleForm.createUserId = ''
   effectiveStatusName.value = ''
 }
-// 提交
+// 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e19a555..1c03550 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -12,12 +12,16 @@
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
 const ruleForm = ref({
   organizeType: '', // 类型
   organizeName: '', // 名称
   organizeNo: '', // 编号
   deptId: '', // 部门
   director: '', // 负责人
+  phone: '', // 联系方式
   administrationJob: '', // 行政职务
   technologyJob: '', // 技术职务
   meterMajor: '', // 计量专业
@@ -37,11 +41,12 @@
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
-  organizeName: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
-  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
-  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: ['blur', 'change'] }],
-  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: ['blur', 'change'] }],
-  isLab: [{ required: true, message: '是否为实验室不能为空', trigger: ['blur', 'change'] }],
+  organizeName: [{ required: true, message: '名称必填', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  phone: [{ required: true, message: '联系方式必填', trigger: ['blur', 'change'] }],
+  administrationJob: [{ required: true, message: '行政职务必填', trigger: ['blur', 'change'] }],
+  technologyJob: [{ required: true, message: '技术职务必填', trigger: ['blur', 'change'] }],
+  isLab: [{ required: true, message: '是否为实验室必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 // 获取计量人员列表
@@ -49,12 +54,15 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    // deptId: ruleForm.value.deptId, // 所属科室, // 所在部门
+    deptId: '', // 所属科室, // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
     if (res.code === 200) {
       userList.value = res.data.records
+      usePersonList.value = res.data.records
+      usePersonOptions.value = res.data.records
     }
   })
 }
@@ -95,13 +103,13 @@
     }
   })
 }
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -113,7 +121,7 @@
         updateApi(form).then((res) => {
           if (res.code == 200) {
             formEl?.resetFields()
-            ElMessage.success('提交成功')
+            ElMessage.success('保存成功')
             $router.go(-1)
           }
         })
@@ -450,6 +458,22 @@
     }
   })
 }
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,7 +484,7 @@
   ruleForm.value.deptId = row.deptId
   ruleForm.value.labCapacity = row.labCapacity ? row.labCapacity.split(',') : []
   ruleForm.value.meterMajor = row.meterMajor
-  getuser()
+  getuser() // 获取计量人员列表
   getAdministrationJob()
   getDepartmentList()
   getuserInfoList()
@@ -507,8 +531,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="title">
       <template #btns>
-        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-          提交
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
@@ -609,9 +633,28 @@
         <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              <el-select
+                v-model="ruleForm.director"
+                :disabled="title.split('-')[2] === '详情'"
+                :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="directorChange"
+              >
+                <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <!-- <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式" prop="phone">
+              <el-input v-model.trim="ruleForm.phone" :placeholder="title.split('-')[2] === '详情' ? '' : '联系方式'" :disabled="title.split('-')[2] === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 33e63c8..44cad86 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -8,6 +8,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { dictType } from '@/global'
 const props = defineProps({
   name: {
     type: String,
@@ -52,39 +53,39 @@
   {
     name: '计量组织-部门',
     columns: [
-      { text: '部门编号', value: 'organizeNo', align: 'center' },
+      { text: '部门编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '部门名称', value: 'organizeName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-科室',
     columns: [
-      { text: '科室编号', value: 'organizeNo', align: 'center' },
+      { text: '科室编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '科室名称', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '技术职务', value: 'technologyJobName', align: 'center' },
       { text: '行政职务', value: 'administrationJobName', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
   {
     name: '计量组织-工程组',
     columns: [
-      { text: '工程组编号', value: 'organizeNo', align: 'center' },
+      { text: '工程组编号', value: 'organizeNo', align: 'center', width: '160' },
       { text: '工程组名', value: 'organizeName', align: 'center' },
       { text: '计量专业', value: 'meterMajorName', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
       { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
-      { text: '创建日期', value: 'createTime', align: 'center' },
+      { text: '创建日期', value: 'createTime', align: 'center', width: '120' },
     ],
   },
 ])
@@ -92,11 +93,19 @@
   return columnsData.value.filter((item: { name: string;columns: TableColumn[] }) => item.name === props.name)[0].columns
 })
 const list = ref<rowType[]>([]) // 表格数据
-// 获取类型
-const getType = async () => {
-  const res = await getDictByCode('deptType')
-  searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取类型
+  getDictByCode('deptType').then((res) => {
+    searchQuery.organizeType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+  })
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
 }
+
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
@@ -119,6 +128,17 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  console.log('00000', props.name, props.authority)
+
+  if (props.authority === 'bm') {
+    searchQuery.organizeType = '2'
+  }
+  if (props.authority === 'ks') {
+    searchQuery.organizeType = '3'
+  }
+  if (props.authority === 'gcz') {
+    searchQuery.organizeType = '4'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
@@ -155,8 +175,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
@@ -168,11 +186,6 @@
       path: $route.path.split('/')[2],
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: `${props.name}-编辑`,
-  // })
 }
 // 搜索
 const search = () => {
@@ -236,15 +249,13 @@
     ElMessage('无可打印内容')
   }
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-}
-onMounted(() => {
+
+onMounted(async () => {
+  await getDict()
   getDepartmentList()
-  getType().then((_) => {
-    getList()
-  })
+  // getType().then((_) => {
+  getList()
+  // })
 })
 </script>
 
@@ -261,7 +272,9 @@
           <el-input v-model="searchQuery.organizeName" :placeholder="`${props.name.split('-')[1]}名称`" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="专业" clearable class="w-50 m-2 " />
+          <el-select v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.meterMajor" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
@@ -282,22 +295,11 @@
             end-placeholder="创建结束时间"
             clearable
           />
-          <!-- <el-date-picker
-            v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="创建时间"
-          /> -->
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button> -->
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
@@ -319,7 +321,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="110">
+            <el-table-column label="操作" align="center" width="110" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index c75b5c1..85fdc44 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -40,32 +40,27 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
-  { text: '人员编号', value: 'staffNo', align: 'center' },
-  { text: '姓名', value: 'name', align: 'center', width: 90 },
-  { text: '性别', value: 'sex', align: 'center', width: 90 },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '160' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center', width: '70' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'validDate', align: 'center' },
-  { text: '证书状况', value: 'certificateStatus', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '110' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '110' },
+  { text: '证书状况', value: 'certificateStatusName', align: 'center' },
 ]) // 表格
 const certificateStatusList = ref([
   {
-    name: '全部',
-    id: 'status01',
-    value: '',
-  },
-  {
     name: '已失效',
-    id: 'status02',
+    id: '1',
     value: '1',
   },
   {
     name: '正常',
-    id: 'status02',
+    id: '0',
     value: '0',
   },
 ])
@@ -131,12 +126,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '详情',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 // 编辑
 const update = (row: StaffType) => {
@@ -151,12 +140,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '编辑',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 
 // 删除
@@ -233,11 +216,6 @@
       name: props.isRemind ? '证书状况' : '证书记录',
     },
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  //   name: props.isRemind ? '证书状况' : '证书记录',
-  // })
 }
 // 表格被选中的行
 const selectList = ref<StaffType[]>([])
@@ -331,18 +309,6 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
-            <el-option
-              v-for="item in deptList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select> -->
-          <!-- <com-tree-select
-            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
-            placeholder="工作部门" :tree-props="deptProps"
-          /> -->
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
@@ -364,8 +330,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index c750426..f2a2afc 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
+import dayjs from 'dayjs'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
 import { getUserList, roleAssign } from '@/api/system/user'
@@ -12,12 +13,13 @@
 import { toTreeList } from '@/utils/structure'
 import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
-import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
+const infoId = ref('') // id
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm: { [key: string]: string | any } = ref({
   account: '',
@@ -71,6 +73,8 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
+    console.log('0000', ruleForm.value.birthday)
+
     // 获取性别 第17位  奇数为男 偶数为女
     // ruleForm.value.sex
     if (Number(IdCard.substring(16, 17)) % 2) {
@@ -93,12 +97,10 @@
 const selectWhether = ref([
   { name: '是', value: '0' },
   { name: '否', value: '1' },
-])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
-const PubList = ref<TreeStructure[]>([])
-const PubListTree = ref([])
+])// 字典
+// ----------------------------------------------组织列表-------------------------------
+const PubList = ref<TreeStructure[]>([]) // 组织列表
+const PubListTree = ref([]) // 组织列表树
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
@@ -107,6 +109,7 @@
     PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
+// ----------------------------------------字典--------------------------------------------
 const sexList = ref<{ id: string; value: string; name: string }[]>()
 // 获取性别
 const getSexList = () => {
@@ -157,6 +160,7 @@
     administrationJobList.value = response.data
   })
 }
+// --------------------------------------------------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -248,35 +252,37 @@
       {
         text: '发证单位',
         value: 'certificateCompany',
-        id: 'zs01',
+        id: 'certificateCompany',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '证书号',
         value: 'certificateNo',
-        id: 'zs02',
+        id: 'certificateNo',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '证书名称',
         value: 'certificateName',
-        id: 'zs03',
+        id: 'certificateName',
         required: true,
         isDate: false, // 是否日期
       },
       {
         text: '发证日期',
         value: 'certificateDate',
-        id: 'zs04',
+        id: 'certificateDate',
+        width: '120',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        id: 'zs05',
+        width: '120',
+        id: 'validDate',
         required: true,
         isDate: true, // 是否日期
       },
@@ -289,115 +295,126 @@
     column: [
       {
         text: '培训时间',
-        value: 'a1',
+        value: 'trainTime',
+        width: '180',
         id: 'zs01',
-        required: true,
+        required: false,
         isDate: true, // 是否日期
       },
       {
-        text: '培训班名称',
-        value: 'a2',
+        text: '培训名称',
+        value: 'planName',
         id: 'zs02',
-        required: true,
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '类别',
         value: 'a3',
         id: 'zs03',
-        required: true,
+        required: false,
         isSelect: true, // 是否下拉框
       },
       {
         text: '计划编号',
-        value: 'a4',
-        id: 'zs04',
-        required: true,
+        value: 'planNo',
+        width: '160',
+        id: 'planNo',
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '培训对象',
-        value: 'a5',
-        id: 'zs05',
-        required: true,
+        value: 'name',
+        id: 'name',
+        required: false,
         isDate: false, // 是否日期
       },
       {
         text: '培训结果',
-        value: 'a6',
-        id: 'zs05',
-        required: true,
+        value: 'examResult',
+        id: 'examResult',
+        required: false,
         isDate: false, // 是否日期
       },
     ],
   },
-  {
-    name: '业务记录',
-    data: [] as any[],
-    deepData: [] as any[],
-    column: [
-      {
-        text: '样品编号',
-        value: 'b1',
-        id: 'zs01',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '样品名称',
-        value: 'b2',
-        id: 'zs02',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '委托书编号',
-        value: 'b3',
-        id: 'zs03',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '合同编号',
-        value: 'b4',
-        id: 'zs04',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '检定时间',
-        value: 'b5',
-        id: 'zs05',
-        required: true,
-        isDate: true, // 是否日期
-      },
-      {
-        text: '检定结果',
-        value: 'b6',
-        id: 'zs05',
-        required: true,
-        isDate: false, // 是否日期
-      },
-      {
-        text: '业务额',
-        value: 'b7',
-        id: 'zs05',
-        required: true,
-        isDate: false, // 是否日期
-      },
-    ],
-  },
+  // {
+  //   name: '业务记录',
+  //   data: [] as any[],
+  //   deepData: [] as any[],
+  //   column: [
+  //     {
+  //       text: '样品编号',
+  //       value: 'b1',
+  //       id: 'zs01',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '样品名称',
+  //       value: 'b2',
+  //       id: 'zs02',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '委托书编号',
+  //       value: 'b3',
+  //       id: 'zs03',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '合同编号',
+  //       value: 'b4',
+  //       id: 'zs04',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '检定时间',
+  //       value: 'b5',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: true, // 是否日期
+  //     },
+  //     {
+  //       text: '检定结果',
+  //       value: 'b6',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //     {
+  //       text: '业务额',
+  //       value: 'b7',
+  //       id: 'zs05',
+  //       required: false,
+  //       isDate: false, // 是否日期
+  //     },
+  //   ],
+  // },
 ])
 const current = ref('证书基本信息')
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
-
+watch(current, () => {
+  if (current.value === '计量工作培训记录') {
+    getStaffCultivateLog({ id: infoId.value }).then((res) => {
+      changeList.value[1].data = res.data.rows
+    })
+  }
+  // if (current.value === '业务记录') {
+  //   console.log('暂时没有接口')
+  // }
+})
 // 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
+function checkCertificateList() {
+  for (let index = 0; index < changeList.value[0].data.length; index++) {
+    const item = changeList.value[0].data[index]
+    for (const prop of changeList.value[0].column) {
       // 检查必填
       if (prop.required && !item[prop.value]) {
         ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
@@ -426,7 +443,7 @@
 // 添加行
 const addRow = () => {
   // certificateRef.value.initDialog({ title: '添加' })
-  if (checkPersonList()) {
+  if (checkCertificateList()) {
     setAllRowReadable()
     currentShow.value.data.push({
       ...addObj[current.value],
@@ -478,15 +495,30 @@
   console.log(certificateList, '最终需要提交的数组')
   return certificateList
 }
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (changeList.value[0].data.length) {
+    for (const key in ruleForm.value) {
+      if (ruleForm.value[key] === '') {
+        ruleForm.value[key] = null
+      }
+    }
+    if (!checkCertificateList()) {
+      return false
+    }
+  }
+  else {
+    ElMessage.warning('请先填写证书信息')
+    return false
+  }
   if (!formEl) { return }
   // 当前选中的证书基本信息列表
   const currentData = currentShow.value.data
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -498,59 +530,99 @@
           item.id = ''
           return item
         })
-        if (changeList.value[0].data.length) {
-          for (const key in ruleForm.value) {
-            if (ruleForm.value[key] === '') {
-              ruleForm.value[key] = null
-            }
-          }
-          // changeList.value[0].data
-          // handleRecord(changeList.value[0].deepData
-          (title.value === '新建'
-            ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
-            : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
-            if (res.code == 200) {
-              // formEl?.resetFields()
-              // ElMessage.success('提交成功')
-              // resetFormData()
-              // $router.go(-1)
-              // 获取当前用户角色
-              getRoleTreeListByUser(userInfoData.value.id).then((res) => {
-                console.log(res.data, '角色列表')
-                // 当前用户 角色 id
-                const roleIds: string[] = []
-                // 挑选 计量人员 角色id
-                let metering = ''
-                const data = res.data
-                data.forEach((item: any) => {
-                  // 当前用户角色
-                  if (item.checked) {
-                    roleIds.push(item.id)
-                  }
-                  // 计量人员角色
-                  if (item.name === '计量人员') {
-                    metering = item.id
-                  }
-                })
-                // 判断当前用户是否 计量人员角色
-                if (roleIds.every(item => item !== metering)) {
-                  roleIds.push(metering)
+
+        // changeList.value[0].data
+        // handleRecord(changeList.value[0].deepData
+        if (title.value === '新建') {
+          getStaffAdd({
+            ...ruleForm.value,
+            certificateList: changeList.value[0].data,
+            birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}`,
+          }).then((res) => {
+            // 获取当前用户角色
+            getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+              console.log(res.data, '角色列表')
+              // 当前用户 角色 id
+              const roleIds: string[] = []
+              // 挑选 计量人员 角色id
+              let metering = ''
+              const data = res.data
+              data.forEach((item: any) => {
+                // 当前用户角色
+                if (item.checked) {
+                  roleIds.push(item.id)
                 }
-                // 设置当前用户角色
-                roleAssign(userInfoData.value.id, roleIds).then((res) => {
-                  console.log('分配计量人员角色成功')
-                  formEl?.resetFields()
-                  ElMessage.success('提交成功')
-                  resetFormData()
-                  $router.go(-1)
-                })
+                // 计量人员角色
+                if (item.name === '计量人员') {
+                  metering = item.id
+                }
               })
-            }
+              // 判断当前用户是否 计量人员角色
+              if (roleIds.every(item => item !== metering)) {
+                roleIds.push(metering)
+              }
+              // 设置当前用户角色
+              roleAssign(userInfoData.value.id, roleIds).then((res) => {
+                console.log('分配计量人员角色成功')
+                formEl?.resetFields()
+                ElMessage.success('保存成功')
+                resetFormData()
+                $router.go(-1)
+              })
+            })
           })
         }
         else {
-          ElMessage.warning('请先填写证书信息')
+          getStaffupdate({
+            ...ruleForm.value,
+            certificateList: changeList.value[0].data,
+            birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}`,
+          }).then((res) => {
+            if (res.code == 200) {
+              ElMessage.success('保存成功')
+              $router.go(-1)
+            }
+          })
         }
+
+        //   if (res.code == 200) {
+        //     // formEl?.resetFields()
+        //     ElMessage.success('保存成功')
+        //     // resetFormData()
+        //     // $router.go(-1)
+        //     // 获取当前用户角色
+        //     getRoleTreeListByUser(userInfoData.value.id).then((res) => {
+        //       console.log(res.data, '角色列表')
+        //       // 当前用户 角色 id
+        //       const roleIds: string[] = []
+        //       // 挑选 计量人员 角色id
+        //       let metering = ''
+        //       const data = res.data
+        //       data.forEach((item: any) => {
+        //         // 当前用户角色
+        //         if (item.checked) {
+        //           roleIds.push(item.id)
+        //         }
+        //         // 计量人员角色
+        //         if (item.name === '计量人员') {
+        //           metering = item.id
+        //         }
+        //       })
+        //       // 判断当前用户是否 计量人员角色
+        //       if (roleIds.every(item => item !== metering)) {
+        //         roleIds.push(metering)
+        //       }
+        //       // 设置当前用户角色
+        //       roleAssign(userInfoData.value.id, roleIds).then((res) => {
+        //         console.log('分配计量人员角色成功')
+        //         formEl?.resetFields()
+        //         ElMessage.success('保存成功')
+        //         resetFormData()
+        //         $router.go(-1)
+        //       })
+        //     })
+        //   }
+        // })
       })
     }
   })
@@ -564,6 +636,7 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  infoId.value = row.id // 主键
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
@@ -581,7 +654,13 @@
     getStaffDetail({ ...row }).then((res) => {
       if (res.code === 200) {
         ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        changeList.value[0].data = res.data.certificateList.map((item: { certificateDate: string; validDate: string }) => {
+          return {
+            ...item,
+            certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+          }
+        }) // 证书基本信息
         changeList.value[0].deepData = lodash.cloneDeep(res.data.certificateList)
         staffId.value = changeList.value[0].deepData[0]?.staffId
       }
@@ -607,8 +686,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`计量人员-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-          完成
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
@@ -636,7 +715,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" disabled @focus="selectPerson">
                 <template #append>
                   <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
                     选择
@@ -647,19 +726,11 @@
             <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
-                placeholder="出生年月" :disabled="title === '详情'"
+                placeholder="出生年月" disabled
                 style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <!-- <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
-              /> -->
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -676,7 +747,7 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" disabled style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -725,27 +796,24 @@
     </detail-page>
     <detail-block-switch :title="current">
       <template #menu>
-        <el-radio-group v-model="current">
+        <el-radio-group v-if="title === '详情'" v-model="current">
           <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
             {{ item.name }}
           </el-radio-button>
         </el-radio-group>
       </template>
       <template #btns>
-        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+        <el-button v-if="title !== '详情' && current === '证书基本信息'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button v-if="title !== '详情' && current === '证书基本信息'" type="info" @click="removeRow">
           删除行
         </el-button>
-        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
       </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="current === '证书基本信息' && title !== '详情'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.value" :label="item.text" align="center">
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :width="item.width" :prop="item.value" :label="item.text" align="center">
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
@@ -760,9 +828,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <!-- 选择用户列表组件 -->
-      <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
     </detail-block-switch>
+    <!-- 选择用户列表组件 -->
+    <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 35ab7ea..9d8359b 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -1,4 +1,4 @@
-<!-- 计量人员新增 -->
+<!-- 证书记录新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
@@ -45,26 +45,27 @@
 }) // 表单
 const title = ref('')
 const name = ref('')
-// 身份证号码验证规则
-// const validateIDcard = (rule: any, value: any, callback: any) => {
-//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-//   if (rr.test(value)) {
-//     callback()
-//   }
-//   else {
-//     callback(new Error('验证失败'))
-//   }
-// }
+// 自定义校验规则--要求检完时间不能比预计送达时间大
+const requireOverTimeValid = (rule: any, value: any, callback: any) => {
+  if (!value) {
+    return callback(new Error('有效日期必填'))
+  }
+  if (new Date(baseInfo.value.certificateDate).getTime() >= new Date(baseInfo.value.validDate).getTime()) {
+    return callback(new Error('有效日期应大于发证日期'))
+  }
+  callback()
+}
 const rules = ref({
-  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  staffNo: [{ required: true, message: '人员编号必填', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
 }) // 表单验证规则
+
 const rules2 = ref({
-  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
-  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
-  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '发证单位必填', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期必填', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称必填', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号必填', trigger: 'blur' }],
+  validDate: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -151,16 +152,12 @@
   ruleFormRef1.value?.clearValidate('staffNo')
 }
 // 提交
-const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  // 日期判断 证书有效期大于发证日期
-  if ((baseInfo.value.certificateDate && new Date(baseInfo.value.certificateDate).getTime()) >= (baseInfo.value.validDate && new Date(baseInfo.value.validDate).getTime())) {
-    ElMessage.warning('证书有效期应该大于发证日期!')
-  }
+const saveForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   if (!formEl1 || !formEl2) { return }
 
   Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认提交吗？',
+      '确认保存吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -237,8 +234,8 @@
   <app-container style="overflow: hidden;">
     <detail-page :title=" `${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
-          完成
+        <el-button v-if="title !== '详情'" type="primary" @click="saveForm(ruleFormRef1, ruleFormRef2)">
+          保存
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
           关闭
@@ -248,9 +245,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title !== '新建'" @focus="selectPerson">
-                <template #append>
-                  <el-button size="small" :disabled="title !== '新建'" @click="selectPerson">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" disabled @focus="selectPerson">
+                <template v-if="title === '新建' || title === '编辑'" #append>
+                  <el-button size="small" @click="selectPerson">
                     选择
                   </el-button>
                 </template>
@@ -259,17 +256,17 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="meterStaff.name">
-              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title !== '新建'" />
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title !== '新建'" />
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" disabled style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -278,21 +275,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文化程度" prop="meterStaff.education">
-              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" disabled style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="meterStaff.technologyJob">
-              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" disabled style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="meterStaff.administrationJob">
-              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title !== '新建'" style="width: 100%;">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" disabled style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -301,28 +298,18 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title !== '新建'" style="width: 100%;" />
-              <!-- <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
-                placeholder="选择组织机构"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              /> -->
+              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title !== '新建'" />
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="从事日期" prop="workDate">
               <el-date-picker
-                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title !== '新建'"
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" disabled
                 placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 303f239..02672dc 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -29,9 +29,9 @@
 const select = ref(-1)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '姓名', value: 'name' },
-  { text: '账户', value: 'account' },
-  { text: '所在部门', value: 'deptName' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '账户', value: 'account', align: 'center' },
+  { text: '所在部门', value: 'deptName', align: 'center' },
 ])
 // 所在部门
 const deptProps = reactive({
@@ -114,7 +114,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -137,16 +137,16 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-          <el-table-column label="序号" width="55" align="center">
+          <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 label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
         </template>
       </normal-table>
     </div>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index ecda4cf..1636ee9 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -28,7 +28,7 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '160' },
   { text: '姓名', value: 'name', align: 'center' },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
@@ -37,7 +37,7 @@
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '120' },
   { text: '技术考核', value: 'technologyExam', align: 'center' },
 ]) // 表格
 
@@ -82,11 +82,6 @@
     },
     path: '/person/detail',
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '详情',
-  // })
 }
 // 编辑
 const update = (row: StaffType) => {
@@ -97,11 +92,6 @@
     },
     path: '/person/detail',
   })
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   ...row,
-  //   title: '编辑',
-  // })
 }
 
 // 删除
@@ -170,6 +160,8 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
   getList()
 }
 // 模板下载
@@ -178,10 +170,6 @@
 }
 // 新增
 const add = () => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  // })
   $router.push({
     query: {
       title: '新建',
@@ -192,28 +180,37 @@
 // 表格被选中的行
 const selectList = ref<StaffType[]>([])
 // 表格多选
-const multiSelect = (row: StaffType[]) => {
-  selectList.value = row
+const multiSelect = (e: any) => {
+  selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (selectList.value.length) {
-    selectList.value.forEach((item) => {
-      searchQuery.ids?.push(item.id as string)
+  if (list.value.length > 0) {
+    const params = {
+      staffNo: searchQuery.staffNo, // 人员编号
+      name: searchQuery.name, // 姓名
+      deptId: searchQuery.deptId, // 工作部门
+      major: searchQuery.major, // 计量专业
+      verifierCertificateNo: searchQuery.verifierCertificateNo, // 证书号
+      certificateStatus: searchQuery.certificateStatus, // 证书状态
+      limit: 20,
+      offset: 1,
+      ids: selectList.value,
+    }
+    exportList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '计量人员列表.xlsx')
     })
   }
-  exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    exportFile(res.data, '计量人员列表')
-    loading.close()
-    searchQuery.ids = []
-  }).catch((_) => {
-    loading.close()
-  })
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
 }
 // 打印
 function printList() {
@@ -310,8 +307,8 @@
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
           <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
-          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
-          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <!-- <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" /> -->
+          <!-- <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" /> -->
           <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" icon="icon-print" title="打印" @click="printList" />
         </template>
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index c3f8165..98b9e49 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,4 @@
+<!-- 证书到期提醒列表 -->
 <script lang="ts" setup name="remind">
 import list from './certificateLog.vue'
 </script>