diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 2fc1181..759009e 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -202,6 +202,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PlanAdd',
+        component: () => import('@/views/measure/train/planAdd.vue'),
+        meta: {
+          title: '培训计划',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/plan',
+        },
+      },
+      {
         path: 'trainPlanApprove',
         name: 'TrainPlanApprove',
         component: () => import('@/views/measure/train/trainPlanApprove.vue'),
@@ -221,6 +233,18 @@
           auth: '/measure/train/trainLog',
         },
       },
+      {
+        path: 'trainLog/:type/:id?',
+        name: 'planlogAdd',
+        component: () => import('@/views/measure/train/trainLogAdd.vue'),
+        meta: {
+          title: '培训记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/trainLog',
+        },
+      },
     ],
   },
   {

diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 2fc1181..759009e 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -202,6 +202,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PlanAdd',
+        component: () => import('@/views/measure/train/planAdd.vue'),
+        meta: {
+          title: '培训计划',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/plan',
+        },
+      },
+      {
         path: 'trainPlanApprove',
         name: 'TrainPlanApprove',
         component: () => import('@/views/measure/train/trainPlanApprove.vue'),
@@ -221,6 +233,18 @@
           auth: '/measure/train/trainLog',
         },
       },
+      {
+        path: 'trainLog/:type/:id?',
+        name: 'planlogAdd',
+        component: () => import('@/views/measure/train/trainLogAdd.vue'),
+        meta: {
+          title: '培训记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/trainLog',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index f4c394f..9e1df00 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -43,10 +43,10 @@
 // 价格表单对象类型
 export interface priceForm {
   checkType: string // 校验类型-字典value
-  createTime: string // 创建时间
+  createTime: null | string // 创建时间
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
-  id: string // 主键id
+  id: null | string // 主键id
   isDel: number // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
@@ -59,5 +59,5 @@
   priceStandard: string // 依据标准-计量规程文件名
   priceType: string // 价格类别-字典value
   remark: string // 备注
-  updateTime: string // 更新时间
+  updateTime: null | string // 更新时间
 }

diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 2fc1181..759009e 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -202,6 +202,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PlanAdd',
+        component: () => import('@/views/measure/train/planAdd.vue'),
+        meta: {
+          title: '培训计划',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/plan',
+        },
+      },
+      {
         path: 'trainPlanApprove',
         name: 'TrainPlanApprove',
         component: () => import('@/views/measure/train/trainPlanApprove.vue'),
@@ -221,6 +233,18 @@
           auth: '/measure/train/trainLog',
         },
       },
+      {
+        path: 'trainLog/:type/:id?',
+        name: 'planlogAdd',
+        component: () => import('@/views/measure/train/trainLogAdd.vue'),
+        meta: {
+          title: '培训记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/trainLog',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index f4c394f..9e1df00 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -43,10 +43,10 @@
 // 价格表单对象类型
 export interface priceForm {
   checkType: string // 校验类型-字典value
-  createTime: string // 创建时间
+  createTime: null | string // 创建时间
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
-  id: string // 主键id
+  id: null | string // 主键id
   isDel: number // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
@@ -59,5 +59,5 @@
   priceStandard: string // 依据标准-计量规程文件名
   priceType: string // 价格类别-字典value
   remark: string // 备注
-  updateTime: string // 更新时间
+  updateTime: null | string // 更新时间
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 1195962..a776302 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -26,10 +26,10 @@
 }
 const defaultForm: priceForm = {
   checkType: '',
-  createTime: '',
+  createTime: null,
   directorDiscountPermission: '',
   historicalPriceList: [],
-  id: '',
+  id: null,
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
@@ -42,7 +42,7 @@
   priceStandard: '',
   priceType: '',
   remark: '',
-  updateTime: '',
+  updateTime: null,
 }
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
 const ruleFormRef = ref<FormInstance>()

diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 2fc1181..759009e 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -202,6 +202,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PlanAdd',
+        component: () => import('@/views/measure/train/planAdd.vue'),
+        meta: {
+          title: '培训计划',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/plan',
+        },
+      },
+      {
         path: 'trainPlanApprove',
         name: 'TrainPlanApprove',
         component: () => import('@/views/measure/train/trainPlanApprove.vue'),
@@ -221,6 +233,18 @@
           auth: '/measure/train/trainLog',
         },
       },
+      {
+        path: 'trainLog/:type/:id?',
+        name: 'planlogAdd',
+        component: () => import('@/views/measure/train/trainLogAdd.vue'),
+        meta: {
+          title: '培训记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/trainLog',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index f4c394f..9e1df00 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -43,10 +43,10 @@
 // 价格表单对象类型
 export interface priceForm {
   checkType: string // 校验类型-字典value
-  createTime: string // 创建时间
+  createTime: null | string // 创建时间
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
-  id: string // 主键id
+  id: null | string // 主键id
   isDel: number // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
@@ -59,5 +59,5 @@
   priceStandard: string // 依据标准-计量规程文件名
   priceType: string // 价格类别-字典value
   remark: string // 备注
-  updateTime: string // 更新时间
+  updateTime: null | string // 更新时间
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 1195962..a776302 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -26,10 +26,10 @@
 }
 const defaultForm: priceForm = {
   checkType: '',
-  createTime: '',
+  createTime: null,
   directorDiscountPermission: '',
   historicalPriceList: [],
-  id: '',
+  id: null,
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
@@ -42,7 +42,7 @@
   priceStandard: '',
   priceType: '',
   remark: '',
-  updateTime: '',
+  updateTime: null,
 }
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
 const ruleFormRef = ref<FormInstance>()
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 5c99aa8..1467017 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -3,10 +3,8 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistType } from './plan_interface'
-import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
 import { getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
-import QrDialog from '@/components/QrDialog/index.vue'
 const listQuery: Ref<IlistQuery> = ref({
   trainTime: '',
   createTime: '',
@@ -27,6 +25,8 @@
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
+// 初始化路由
+const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -163,11 +163,9 @@
   id: string
   planName: string
 }
-const handleEdit = (index: string, row: rowReturn, type: string) => {
-  console.log(row)
-  infoId.value = row.id
-  buttonType.value = type
-  show.value = false
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/train/${pageType}/${row.id}`)
 }
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
@@ -197,9 +195,7 @@
   checkoutList.value = e
 }
 const add = () => {
-  infoId.value = ''
-  buttonType.value = '新建'
-  show.value = false
+  $router.push('/train/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -226,10 +222,6 @@
   }
   fetchData(true)
 }
-const qrDialog = ref()
-function showQrDialog(row) {
-  qrDialog.value.initDialog(row.id, row.planName)
-}
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -311,7 +303,7 @@
                   size="small"
                   type="primary"
                   link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  @click="handleEdit(row, 'edit')"
                 >
                   编辑
                 </el-button>
@@ -319,7 +311,7 @@
                   size="small"
                   link
                   type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
+                  @click="handleEdit(row, 'detail')"
                 >
                   详情
                 </el-button>
@@ -336,7 +328,6 @@
                   size="small"
                   link
                   type="primary"
-                  @click="showQrDialog(row)"
                 >
                   二维码
                 </el-button>
@@ -346,18 +337,5 @@
         </normal-table>
       </table-container>
     </app-container>
-    <qr-dialog ref="qrDialog" />
   </div>
-  <plan-add
-    v-else :info-id="infoId"
-    :button-type="buttonType"
-    @close="close"
-  />
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>

diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 2fc1181..759009e 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -202,6 +202,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PlanAdd',
+        component: () => import('@/views/measure/train/planAdd.vue'),
+        meta: {
+          title: '培训计划',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/plan',
+        },
+      },
+      {
         path: 'trainPlanApprove',
         name: 'TrainPlanApprove',
         component: () => import('@/views/measure/train/trainPlanApprove.vue'),
@@ -221,6 +233,18 @@
           auth: '/measure/train/trainLog',
         },
       },
+      {
+        path: 'trainLog/:type/:id?',
+        name: 'planlogAdd',
+        component: () => import('@/views/measure/train/trainLogAdd.vue'),
+        meta: {
+          title: '培训记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/trainLog',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index f4c394f..9e1df00 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -43,10 +43,10 @@
 // 价格表单对象类型
 export interface priceForm {
   checkType: string // 校验类型-字典value
-  createTime: string // 创建时间
+  createTime: null | string // 创建时间
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
-  id: string // 主键id
+  id: null | string // 主键id
   isDel: number // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
@@ -59,5 +59,5 @@
   priceStandard: string // 依据标准-计量规程文件名
   priceType: string // 价格类别-字典value
   remark: string // 备注
-  updateTime: string // 更新时间
+  updateTime: null | string // 更新时间
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 1195962..a776302 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -26,10 +26,10 @@
 }
 const defaultForm: priceForm = {
   checkType: '',
-  createTime: '',
+  createTime: null,
   directorDiscountPermission: '',
   historicalPriceList: [],
-  id: '',
+  id: null,
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
@@ -42,7 +42,7 @@
   priceStandard: '',
   priceType: '',
   remark: '',
-  updateTime: '',
+  updateTime: null,
 }
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
 const ruleFormRef = ref<FormInstance>()
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 5c99aa8..1467017 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -3,10 +3,8 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistType } from './plan_interface'
-import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
 import { getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
-import QrDialog from '@/components/QrDialog/index.vue'
 const listQuery: Ref<IlistQuery> = ref({
   trainTime: '',
   createTime: '',
@@ -27,6 +25,8 @@
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
+// 初始化路由
+const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -163,11 +163,9 @@
   id: string
   planName: string
 }
-const handleEdit = (index: string, row: rowReturn, type: string) => {
-  console.log(row)
-  infoId.value = row.id
-  buttonType.value = type
-  show.value = false
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/train/${pageType}/${row.id}`)
 }
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
@@ -197,9 +195,7 @@
   checkoutList.value = e
 }
 const add = () => {
-  infoId.value = ''
-  buttonType.value = '新建'
-  show.value = false
+  $router.push('/train/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -226,10 +222,6 @@
   }
   fetchData(true)
 }
-const qrDialog = ref()
-function showQrDialog(row) {
-  qrDialog.value.initDialog(row.id, row.planName)
-}
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -311,7 +303,7 @@
                   size="small"
                   type="primary"
                   link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  @click="handleEdit(row, 'edit')"
                 >
                   编辑
                 </el-button>
@@ -319,7 +311,7 @@
                   size="small"
                   link
                   type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
+                  @click="handleEdit(row, 'detail')"
                 >
                   详情
                 </el-button>
@@ -336,7 +328,6 @@
                   size="small"
                   link
                   type="primary"
-                  @click="showQrDialog(row)"
                 >
                   二维码
                 </el-button>
@@ -346,18 +337,5 @@
         </normal-table>
       </table-container>
     </app-container>
-    <qr-dialog ref="qrDialog" />
   </div>
-  <plan-add
-    v-else :info-id="infoId"
-    :button-type="buttonType"
-    @close="close"
-  />
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 76ed102..e1457c8 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -10,17 +10,23 @@
   getListDetail,
   getListUpdate,
 } from '@/api/system/plan'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-})
-const emit = defineEmits(['close'])
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const formInline = ref({
   createTime: null,
   deptId: null,
@@ -72,9 +78,18 @@
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
   trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
 }) // 表单验证规则
+// 新增校验规则
+const addRules = ref({
+  name: [{ required: true, message: '学员名称不能为空', trigger: 'blur' }],
+  company: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职称不能为空', trigger: 'blur' }],
+  signTime: [{ required: true, message: '签到时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 初始化router
+const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const userListRef = ref()
 // 选择人员
@@ -115,13 +130,13 @@
   console.log(object)
   formInline.value.director = object.name
 }
-if (props.infoId && props.infoId !== '') {
-  getListDetail({ id: props.infoId }).then((res) => {
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
   })
 }
 const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
-  if (buttonType === '提交' && props.buttonType !== '编辑') {
+  if (buttonType === '提交' && pageType.value !== 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
@@ -143,12 +158,12 @@
       }
     })
   }
-  else if (buttonType === '提交' && props.buttonType === '编辑') {
+  else if (buttonType === '提交' && pageType.value === 'edit') {
     formInline.value.trainStaffList.map((item) => {
       delete item.updateTime
       delete item.createTime
     })
-    formInline.value.id = props.infoId
+    formInline.value.id = infoId.value
     getListUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -171,16 +186,16 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`培训计划-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-print="buttonType === '详情' ? printObj : ''"
+          v-print="pageType === 'detail' ? printObj : ''"
           type="primary"
-          @click="getAddList(ruleFormRef, buttonType === '详情' ? '打印' : '提交')"
+          @click="getAddList(ruleFormRef, pageType === 'detail' ? '打印' : '提交')"
         >
-          {{ buttonType === '详情' ? '打印' : '提交' }}
+          {{ pageType === 'detail' ? '打印' : '提交' }}
         </el-button>
-        <el-button v-if=" buttonType === '编辑'" type="primary">
+        <el-button v-if=" pageType === 'edit'" type="primary">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -200,8 +215,8 @@
             <el-form-item label="计划编号:" prop="planNo">
               <el-input
                 v-model="formInline.planNo"
-                :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -209,8 +224,8 @@
             <el-form-item label="培训名称:" prop="planName">
               <el-input
                 v-model="formInline.planName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -218,8 +233,8 @@
             <el-form-item label="培训对象:" prop="trainPerson">
               <el-input
                 v-model="formInline.trainPerson"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -227,8 +242,8 @@
             <el-form-item label="培训人数:" prop="trainNumber">
               <el-input
                 v-model="formInline.trainNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -242,7 +257,7 @@
                 placeholder="培训时间"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -250,8 +265,8 @@
             <el-form-item label="培训学时:" prop="trainHour">
               <el-input
                 v-model="formInline.trainHour"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -264,8 +279,8 @@
             <el-form-item label="实施单位:" prop="effectiveCompany">
               <el-input
                 v-model="formInline.effectiveCompany"
-                :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入实施单位'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -275,11 +290,11 @@
             <el-form-item label="负责人:" prop="director">
               <el-input
                 v-model="formInline.director"
-                :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
+                :disabled="pageType === 'detail'"
               >
                 <template #append>
-                  <el-button size="small" :disabled="buttonType === '详情'" @click="selectPerson">
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="selectPerson">
                     选择
                   </el-button>
                 </template>
@@ -290,8 +305,8 @@
             <el-form-item label="培训地点:" prop="trainAddress">
               <el-input
                 v-model="formInline.trainAddress"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -299,8 +314,8 @@
             <el-form-item label="培训内容:" prop="trainContent">
               <el-input
                 v-model="formInline.trainContent"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -310,8 +325,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model="formInline.remark"
-                :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -320,10 +335,10 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
+        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
       </template>
@@ -349,7 +364,6 @@
     title="添加人员信息"
     width="30%"
     :before-close="handleClose"
-    center
   >
     <el-form
       ref="addPersonListForm"
@@ -357,84 +371,40 @@
       label-width="100px"
       :model="addPersonList"
       style="max-width: 460px;"
+      :rules="addRules"
     >
-      <el-form-item label="学员名称">
+      <el-form-item label="学员名称" prop="name">
         <el-input v-model="addPersonList.name" />
       </el-form-item>
-      <el-form-item label="单位名称">
+      <el-form-item label="单位名称" prop="company">
         <el-input v-model="addPersonList.company" />
       </el-form-item>
-      <el-form-item label="技术职称">
+      <el-form-item label="技术职称" prop="technologyJob">
         <el-input v-model="addPersonList.technologyJob" />
       </el-form-item>
-      <el-form-item label="签到时间">
+      <el-form-item label="签到时间" prop="signTime">
         <el-date-picker
           v-model="addPersonList.signTime"
           type="datetime"
           placeholder="签到时间"
           format="YYYY/MM/DD HH:mm:ss"
           value-format="YYYY-MM-DD h:m:s"
-          :disabled="buttonType === '详情'"
+          :disabled="pageType === 'detail'"
         />
       </el-form-item>
     </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="addPushList">
+          完成
+        </el-button>
+        <el-button @click="dialogVisible = false">
+          取消
+        </el-button>
+      </div>
+    </template>
   </el-dialog>
   <!-- 选择用户列表组件 -->
   <user-list-dialog ref="userListRef" @add="confirmPerson" />
 </template>
 
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>

diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 2fc1181..759009e 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -202,6 +202,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PlanAdd',
+        component: () => import('@/views/measure/train/planAdd.vue'),
+        meta: {
+          title: '培训计划',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/plan',
+        },
+      },
+      {
         path: 'trainPlanApprove',
         name: 'TrainPlanApprove',
         component: () => import('@/views/measure/train/trainPlanApprove.vue'),
@@ -221,6 +233,18 @@
           auth: '/measure/train/trainLog',
         },
       },
+      {
+        path: 'trainLog/:type/:id?',
+        name: 'planlogAdd',
+        component: () => import('@/views/measure/train/trainLogAdd.vue'),
+        meta: {
+          title: '培训记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/trainLog',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index f4c394f..9e1df00 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -43,10 +43,10 @@
 // 价格表单对象类型
 export interface priceForm {
   checkType: string // 校验类型-字典value
-  createTime: string // 创建时间
+  createTime: null | string // 创建时间
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
-  id: string // 主键id
+  id: null | string // 主键id
   isDel: number // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
@@ -59,5 +59,5 @@
   priceStandard: string // 依据标准-计量规程文件名
   priceType: string // 价格类别-字典value
   remark: string // 备注
-  updateTime: string // 更新时间
+  updateTime: null | string // 更新时间
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 1195962..a776302 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -26,10 +26,10 @@
 }
 const defaultForm: priceForm = {
   checkType: '',
-  createTime: '',
+  createTime: null,
   directorDiscountPermission: '',
   historicalPriceList: [],
-  id: '',
+  id: null,
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
@@ -42,7 +42,7 @@
   priceStandard: '',
   priceType: '',
   remark: '',
-  updateTime: '',
+  updateTime: null,
 }
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
 const ruleFormRef = ref<FormInstance>()
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 5c99aa8..1467017 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -3,10 +3,8 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistType } from './plan_interface'
-import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
 import { getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
-import QrDialog from '@/components/QrDialog/index.vue'
 const listQuery: Ref<IlistQuery> = ref({
   trainTime: '',
   createTime: '',
@@ -27,6 +25,8 @@
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
+// 初始化路由
+const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -163,11 +163,9 @@
   id: string
   planName: string
 }
-const handleEdit = (index: string, row: rowReturn, type: string) => {
-  console.log(row)
-  infoId.value = row.id
-  buttonType.value = type
-  show.value = false
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/train/${pageType}/${row.id}`)
 }
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
@@ -197,9 +195,7 @@
   checkoutList.value = e
 }
 const add = () => {
-  infoId.value = ''
-  buttonType.value = '新建'
-  show.value = false
+  $router.push('/train/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -226,10 +222,6 @@
   }
   fetchData(true)
 }
-const qrDialog = ref()
-function showQrDialog(row) {
-  qrDialog.value.initDialog(row.id, row.planName)
-}
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -311,7 +303,7 @@
                   size="small"
                   type="primary"
                   link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  @click="handleEdit(row, 'edit')"
                 >
                   编辑
                 </el-button>
@@ -319,7 +311,7 @@
                   size="small"
                   link
                   type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
+                  @click="handleEdit(row, 'detail')"
                 >
                   详情
                 </el-button>
@@ -336,7 +328,6 @@
                   size="small"
                   link
                   type="primary"
-                  @click="showQrDialog(row)"
                 >
                   二维码
                 </el-button>
@@ -346,18 +337,5 @@
         </normal-table>
       </table-container>
     </app-container>
-    <qr-dialog ref="qrDialog" />
   </div>
-  <plan-add
-    v-else :info-id="infoId"
-    :button-type="buttonType"
-    @close="close"
-  />
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 76ed102..e1457c8 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -10,17 +10,23 @@
   getListDetail,
   getListUpdate,
 } from '@/api/system/plan'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-})
-const emit = defineEmits(['close'])
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const formInline = ref({
   createTime: null,
   deptId: null,
@@ -72,9 +78,18 @@
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
   trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
 }) // 表单验证规则
+// 新增校验规则
+const addRules = ref({
+  name: [{ required: true, message: '学员名称不能为空', trigger: 'blur' }],
+  company: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职称不能为空', trigger: 'blur' }],
+  signTime: [{ required: true, message: '签到时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 初始化router
+const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const userListRef = ref()
 // 选择人员
@@ -115,13 +130,13 @@
   console.log(object)
   formInline.value.director = object.name
 }
-if (props.infoId && props.infoId !== '') {
-  getListDetail({ id: props.infoId }).then((res) => {
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
   })
 }
 const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
-  if (buttonType === '提交' && props.buttonType !== '编辑') {
+  if (buttonType === '提交' && pageType.value !== 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
@@ -143,12 +158,12 @@
       }
     })
   }
-  else if (buttonType === '提交' && props.buttonType === '编辑') {
+  else if (buttonType === '提交' && pageType.value === 'edit') {
     formInline.value.trainStaffList.map((item) => {
       delete item.updateTime
       delete item.createTime
     })
-    formInline.value.id = props.infoId
+    formInline.value.id = infoId.value
     getListUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -171,16 +186,16 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`培训计划-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-print="buttonType === '详情' ? printObj : ''"
+          v-print="pageType === 'detail' ? printObj : ''"
           type="primary"
-          @click="getAddList(ruleFormRef, buttonType === '详情' ? '打印' : '提交')"
+          @click="getAddList(ruleFormRef, pageType === 'detail' ? '打印' : '提交')"
         >
-          {{ buttonType === '详情' ? '打印' : '提交' }}
+          {{ pageType === 'detail' ? '打印' : '提交' }}
         </el-button>
-        <el-button v-if=" buttonType === '编辑'" type="primary">
+        <el-button v-if=" pageType === 'edit'" type="primary">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -200,8 +215,8 @@
             <el-form-item label="计划编号:" prop="planNo">
               <el-input
                 v-model="formInline.planNo"
-                :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -209,8 +224,8 @@
             <el-form-item label="培训名称:" prop="planName">
               <el-input
                 v-model="formInline.planName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -218,8 +233,8 @@
             <el-form-item label="培训对象:" prop="trainPerson">
               <el-input
                 v-model="formInline.trainPerson"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -227,8 +242,8 @@
             <el-form-item label="培训人数:" prop="trainNumber">
               <el-input
                 v-model="formInline.trainNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -242,7 +257,7 @@
                 placeholder="培训时间"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -250,8 +265,8 @@
             <el-form-item label="培训学时:" prop="trainHour">
               <el-input
                 v-model="formInline.trainHour"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -264,8 +279,8 @@
             <el-form-item label="实施单位:" prop="effectiveCompany">
               <el-input
                 v-model="formInline.effectiveCompany"
-                :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入实施单位'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -275,11 +290,11 @@
             <el-form-item label="负责人:" prop="director">
               <el-input
                 v-model="formInline.director"
-                :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
+                :disabled="pageType === 'detail'"
               >
                 <template #append>
-                  <el-button size="small" :disabled="buttonType === '详情'" @click="selectPerson">
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="selectPerson">
                     选择
                   </el-button>
                 </template>
@@ -290,8 +305,8 @@
             <el-form-item label="培训地点:" prop="trainAddress">
               <el-input
                 v-model="formInline.trainAddress"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -299,8 +314,8 @@
             <el-form-item label="培训内容:" prop="trainContent">
               <el-input
                 v-model="formInline.trainContent"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -310,8 +325,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model="formInline.remark"
-                :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -320,10 +335,10 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
+        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
       </template>
@@ -349,7 +364,6 @@
     title="添加人员信息"
     width="30%"
     :before-close="handleClose"
-    center
   >
     <el-form
       ref="addPersonListForm"
@@ -357,84 +371,40 @@
       label-width="100px"
       :model="addPersonList"
       style="max-width: 460px;"
+      :rules="addRules"
     >
-      <el-form-item label="学员名称">
+      <el-form-item label="学员名称" prop="name">
         <el-input v-model="addPersonList.name" />
       </el-form-item>
-      <el-form-item label="单位名称">
+      <el-form-item label="单位名称" prop="company">
         <el-input v-model="addPersonList.company" />
       </el-form-item>
-      <el-form-item label="技术职称">
+      <el-form-item label="技术职称" prop="technologyJob">
         <el-input v-model="addPersonList.technologyJob" />
       </el-form-item>
-      <el-form-item label="签到时间">
+      <el-form-item label="签到时间" prop="signTime">
         <el-date-picker
           v-model="addPersonList.signTime"
           type="datetime"
           placeholder="签到时间"
           format="YYYY/MM/DD HH:mm:ss"
           value-format="YYYY-MM-DD h:m:s"
-          :disabled="buttonType === '详情'"
+          :disabled="pageType === 'detail'"
         />
       </el-form-item>
     </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="addPushList">
+          完成
+        </el-button>
+        <el-button @click="dialogVisible = false">
+          取消
+        </el-button>
+      </div>
+    </template>
   </el-dialog>
   <!-- 选择用户列表组件 -->
   <user-list-dialog ref="userListRef" @add="confirmPerson" />
 </template>
 
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 91500cc..fcdd8c6 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -23,6 +23,8 @@
 // 主管部门下拉框
 const options = ref([])
 const loadingTable = ref(false)
+// 初始化路由
+const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -137,29 +139,20 @@
   loading.close()
 }
 const { proxy } = getCurrentInstance() as any
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
 }
-const handleEdit = (index: string, row: rowReturn, type: string) => {
-  console.log(row)
-  infoId.value = row.id
-  buttonType.value = type
-  show.value = false
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/train/trainLog/${pageType}/${row.id}`)
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
 const add = () => {
-  infoId.value = ''
-  buttonType.value = '新建'
-  show.value = false
+  $router.push('/train/trainLog/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -254,7 +247,7 @@
                   size="small"
                   type="primary"
                   link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  @click="handleEdit(row, 'edit')"
                 >
                   编辑
                 </el-button>
@@ -262,7 +255,7 @@
                   size="small"
                   link
                   type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
+                  @click="handleEdit(row, 'detail')"
                 >
                   详情
                 </el-button>
@@ -273,16 +266,5 @@
       </table-container>
     </app-container>
   </div>
-  <plan-add
-    v-else :info-id="infoId"
-    :button-type="buttonType"
-    @close="close"
-  />
 </template>
 
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>

diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 2fc1181..759009e 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -202,6 +202,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PlanAdd',
+        component: () => import('@/views/measure/train/planAdd.vue'),
+        meta: {
+          title: '培训计划',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/plan',
+        },
+      },
+      {
         path: 'trainPlanApprove',
         name: 'TrainPlanApprove',
         component: () => import('@/views/measure/train/trainPlanApprove.vue'),
@@ -221,6 +233,18 @@
           auth: '/measure/train/trainLog',
         },
       },
+      {
+        path: 'trainLog/:type/:id?',
+        name: 'planlogAdd',
+        component: () => import('@/views/measure/train/trainLogAdd.vue'),
+        meta: {
+          title: '培训记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/train/trainLog',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index f4c394f..9e1df00 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -43,10 +43,10 @@
 // 价格表单对象类型
 export interface priceForm {
   checkType: string // 校验类型-字典value
-  createTime: string // 创建时间
+  createTime: null | string // 创建时间
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
-  id: string // 主键id
+  id: null | string // 主键id
   isDel: number // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
@@ -59,5 +59,5 @@
   priceStandard: string // 依据标准-计量规程文件名
   priceType: string // 价格类别-字典value
   remark: string // 备注
-  updateTime: string // 更新时间
+  updateTime: null | string // 更新时间
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 1195962..a776302 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -26,10 +26,10 @@
 }
 const defaultForm: priceForm = {
   checkType: '',
-  createTime: '',
+  createTime: null,
   directorDiscountPermission: '',
   historicalPriceList: [],
-  id: '',
+  id: null,
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
@@ -42,7 +42,7 @@
   priceStandard: '',
   priceType: '',
   remark: '',
-  updateTime: '',
+  updateTime: null,
 }
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
 const ruleFormRef = ref<FormInstance>()
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 5c99aa8..1467017 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -3,10 +3,8 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistType } from './plan_interface'
-import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
 import { getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
-import QrDialog from '@/components/QrDialog/index.vue'
 const listQuery: Ref<IlistQuery> = ref({
   trainTime: '',
   createTime: '',
@@ -27,6 +25,8 @@
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
+// 初始化路由
+const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -163,11 +163,9 @@
   id: string
   planName: string
 }
-const handleEdit = (index: string, row: rowReturn, type: string) => {
-  console.log(row)
-  infoId.value = row.id
-  buttonType.value = type
-  show.value = false
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/train/${pageType}/${row.id}`)
 }
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
@@ -197,9 +195,7 @@
   checkoutList.value = e
 }
 const add = () => {
-  infoId.value = ''
-  buttonType.value = '新建'
-  show.value = false
+  $router.push('/train/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -226,10 +222,6 @@
   }
   fetchData(true)
 }
-const qrDialog = ref()
-function showQrDialog(row) {
-  qrDialog.value.initDialog(row.id, row.planName)
-}
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -311,7 +303,7 @@
                   size="small"
                   type="primary"
                   link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  @click="handleEdit(row, 'edit')"
                 >
                   编辑
                 </el-button>
@@ -319,7 +311,7 @@
                   size="small"
                   link
                   type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
+                  @click="handleEdit(row, 'detail')"
                 >
                   详情
                 </el-button>
@@ -336,7 +328,6 @@
                   size="small"
                   link
                   type="primary"
-                  @click="showQrDialog(row)"
                 >
                   二维码
                 </el-button>
@@ -346,18 +337,5 @@
         </normal-table>
       </table-container>
     </app-container>
-    <qr-dialog ref="qrDialog" />
   </div>
-  <plan-add
-    v-else :info-id="infoId"
-    :button-type="buttonType"
-    @close="close"
-  />
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 76ed102..e1457c8 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -10,17 +10,23 @@
   getListDetail,
   getListUpdate,
 } from '@/api/system/plan'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-})
-const emit = defineEmits(['close'])
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const formInline = ref({
   createTime: null,
   deptId: null,
@@ -72,9 +78,18 @@
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
   trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
 }) // 表单验证规则
+// 新增校验规则
+const addRules = ref({
+  name: [{ required: true, message: '学员名称不能为空', trigger: 'blur' }],
+  company: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职称不能为空', trigger: 'blur' }],
+  signTime: [{ required: true, message: '签到时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 初始化router
+const $router = useRouter()
 // 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const userListRef = ref()
 // 选择人员
@@ -115,13 +130,13 @@
   console.log(object)
   formInline.value.director = object.name
 }
-if (props.infoId && props.infoId !== '') {
-  getListDetail({ id: props.infoId }).then((res) => {
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
   })
 }
 const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
-  if (buttonType === '提交' && props.buttonType !== '编辑') {
+  if (buttonType === '提交' && pageType.value !== 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
@@ -143,12 +158,12 @@
       }
     })
   }
-  else if (buttonType === '提交' && props.buttonType === '编辑') {
+  else if (buttonType === '提交' && pageType.value === 'edit') {
     formInline.value.trainStaffList.map((item) => {
       delete item.updateTime
       delete item.createTime
     })
-    formInline.value.id = props.infoId
+    formInline.value.id = infoId.value
     getListUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -171,16 +186,16 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`培训计划-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-print="buttonType === '详情' ? printObj : ''"
+          v-print="pageType === 'detail' ? printObj : ''"
           type="primary"
-          @click="getAddList(ruleFormRef, buttonType === '详情' ? '打印' : '提交')"
+          @click="getAddList(ruleFormRef, pageType === 'detail' ? '打印' : '提交')"
         >
-          {{ buttonType === '详情' ? '打印' : '提交' }}
+          {{ pageType === 'detail' ? '打印' : '提交' }}
         </el-button>
-        <el-button v-if=" buttonType === '编辑'" type="primary">
+        <el-button v-if=" pageType === 'edit'" type="primary">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -200,8 +215,8 @@
             <el-form-item label="计划编号:" prop="planNo">
               <el-input
                 v-model="formInline.planNo"
-                :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -209,8 +224,8 @@
             <el-form-item label="培训名称:" prop="planName">
               <el-input
                 v-model="formInline.planName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -218,8 +233,8 @@
             <el-form-item label="培训对象:" prop="trainPerson">
               <el-input
                 v-model="formInline.trainPerson"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -227,8 +242,8 @@
             <el-form-item label="培训人数:" prop="trainNumber">
               <el-input
                 v-model="formInline.trainNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -242,7 +257,7 @@
                 placeholder="培训时间"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -250,8 +265,8 @@
             <el-form-item label="培训学时:" prop="trainHour">
               <el-input
                 v-model="formInline.trainHour"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -264,8 +279,8 @@
             <el-form-item label="实施单位:" prop="effectiveCompany">
               <el-input
                 v-model="formInline.effectiveCompany"
-                :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入实施单位'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -275,11 +290,11 @@
             <el-form-item label="负责人:" prop="director">
               <el-input
                 v-model="formInline.director"
-                :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
+                :disabled="pageType === 'detail'"
               >
                 <template #append>
-                  <el-button size="small" :disabled="buttonType === '详情'" @click="selectPerson">
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="selectPerson">
                     选择
                   </el-button>
                 </template>
@@ -290,8 +305,8 @@
             <el-form-item label="培训地点:" prop="trainAddress">
               <el-input
                 v-model="formInline.trainAddress"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -299,8 +314,8 @@
             <el-form-item label="培训内容:" prop="trainContent">
               <el-input
                 v-model="formInline.trainContent"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -310,8 +325,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model="formInline.remark"
-                :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -320,10 +335,10 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
+        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
       </template>
@@ -349,7 +364,6 @@
     title="添加人员信息"
     width="30%"
     :before-close="handleClose"
-    center
   >
     <el-form
       ref="addPersonListForm"
@@ -357,84 +371,40 @@
       label-width="100px"
       :model="addPersonList"
       style="max-width: 460px;"
+      :rules="addRules"
     >
-      <el-form-item label="学员名称">
+      <el-form-item label="学员名称" prop="name">
         <el-input v-model="addPersonList.name" />
       </el-form-item>
-      <el-form-item label="单位名称">
+      <el-form-item label="单位名称" prop="company">
         <el-input v-model="addPersonList.company" />
       </el-form-item>
-      <el-form-item label="技术职称">
+      <el-form-item label="技术职称" prop="technologyJob">
         <el-input v-model="addPersonList.technologyJob" />
       </el-form-item>
-      <el-form-item label="签到时间">
+      <el-form-item label="签到时间" prop="signTime">
         <el-date-picker
           v-model="addPersonList.signTime"
           type="datetime"
           placeholder="签到时间"
           format="YYYY/MM/DD HH:mm:ss"
           value-format="YYYY-MM-DD h:m:s"
-          :disabled="buttonType === '详情'"
+          :disabled="pageType === 'detail'"
         />
       </el-form-item>
     </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="addPushList">
+          完成
+        </el-button>
+        <el-button @click="dialogVisible = false">
+          取消
+        </el-button>
+      </div>
+    </template>
   </el-dialog>
   <!-- 选择用户列表组件 -->
   <user-list-dialog ref="userListRef" @add="confirmPerson" />
 </template>
 
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 91500cc..fcdd8c6 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -23,6 +23,8 @@
 // 主管部门下拉框
 const options = ref([])
 const loadingTable = ref(false)
+// 初始化路由
+const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -137,29 +139,20 @@
   loading.close()
 }
 const { proxy } = getCurrentInstance() as any
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
 }
-const handleEdit = (index: string, row: rowReturn, type: string) => {
-  console.log(row)
-  infoId.value = row.id
-  buttonType.value = type
-  show.value = false
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/train/trainLog/${pageType}/${row.id}`)
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
 const add = () => {
-  infoId.value = ''
-  buttonType.value = '新建'
-  show.value = false
+  $router.push('/train/trainLog/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -254,7 +247,7 @@
                   size="small"
                   type="primary"
                   link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  @click="handleEdit(row, 'edit')"
                 >
                   编辑
                 </el-button>
@@ -262,7 +255,7 @@
                   size="small"
                   link
                   type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
+                  @click="handleEdit(row, 'detail')"
                 >
                   详情
                 </el-button>
@@ -273,16 +266,5 @@
       </table-container>
     </app-container>
   </div>
-  <plan-add
-    v-else :info-id="infoId"
-    :button-type="buttonType"
-    @close="close"
-  />
 </template>
 
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index 32422e1..64ddd58 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="PlanAdd">
+<script lang="ts" setup name="planlogAdd">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions } from './plan_interface'
@@ -12,17 +12,23 @@
   getPlanIdList,
 } from '@/api/system/plan'
 
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-})
-const emit = defineEmits(['close'])
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const { name } = useUserStore()
 const ruleFormRef = ref<FormInstance>()
 const formInline = ref({
@@ -49,10 +55,10 @@
 const trainList = ref([])
 const columns = [
   // { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'company' },
-  { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime' },
-  { text: '考核结果', value: 'examResult' },
+  { text: '单位名称', value: 'company', required: true },
+  { text: '技术职称', value: 'technologyJob', required: true },
+  { text: '签到时间', value: 'signTime', required: true },
+  { text: '考核结果', value: 'examResult', required: true },
 ]
 // 校验规则
 const rules = ref({
@@ -98,8 +104,11 @@
   })
 }
 getDept()
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const addRoow = () => {
   if (formInline.value.planId === '') {
@@ -146,8 +155,8 @@
 const addPersonListChange = (e: any) => {
   addPersonList.value = ListDetail.value.filter(item => item.staffId === e)[0]
 }
-if (props.infoId && props.infoId !== '') {
-  getListLogDetail({ id: props.infoId }).then((res) => {
+if (infoId.value && infoId.value !== '') {
+  getListLogDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
     trainList.value = formInline.value.trainStaffList
   })
@@ -157,7 +166,7 @@
   row.isNameShow = true
 }
 const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
-  if (buttonType === '提交' && props.buttonType !== '编辑') {
+  if (buttonType === '提交' && pageType.value !== 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
@@ -179,13 +188,13 @@
       }
     })
   }
-  else if (buttonType === '提交' && props.buttonType === '编辑') {
+  else if (buttonType === '提交' && pageType.value === 'edit') {
     formInline.value.trainStaffList = trainList.value
     formInline.value.trainStaffList.map((item) => {
       delete item.updateTime
       delete item.createTime
     })
-    formInline.value.id = props.infoId
+    formInline.value.id = infoId.value
     getListUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -224,19 +233,19 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训记录-${buttonType}`">
+    <detail-page :title="`培训记录-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if=" buttonType !== '详情'"
+          v-if=" pageType !== 'detail'"
           type="primary"
           @click="getAddList(ruleFormRef, '提交')"
         >
           提交
         </el-button>
-        <el-button v-if=" buttonType === '详情'" v-print="printObj" type="primary" @click="getAddList(ruleFormRef, '打印')">
+        <el-button v-if=" pageType === 'detail'" v-print="printObj" type="primary" @click="getAddList(ruleFormRef, '打印')">
           打印
         </el-button>
-        <el-button v-if=" buttonType === '详情'" type="primary" @click="buttonType = '编辑'">
+        <el-button v-if=" pageType === 'detail'" type="primary" @click="pageType = 'edit'">
           编辑
         </el-button>
         <el-button type="info" @click="close">
@@ -256,8 +265,8 @@
             <el-form-item label="编号:" prop="logNo">
               <el-input
                 v-model="formInline.logNo"
-                :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入编号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -265,8 +274,8 @@
             <el-form-item label="填表人:" prop="preparer">
               <el-input
                 v-model="formInline.preparer"
-                :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入填表人'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -278,7 +287,7 @@
                   clearable
                   placeholder="计划编号"
                   size="default"
-                  :disabled="buttonType === '详情'"
+                  :disabled="pageType === 'detail'"
                   @change="selectChange"
                 >
                   <el-option
@@ -295,8 +304,8 @@
             <el-form-item label="培训名称:" prop="trainName">
               <el-input
                 v-model="formInline.trainName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -306,8 +315,8 @@
             <el-form-item label="培训对象:" prop="trainPerson">
               <el-input
                 v-model="formInline.trainPerson"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -315,8 +324,8 @@
             <el-form-item label="培训人数:" prop="trainNumber">
               <el-input
                 v-model="formInline.trainNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -324,8 +333,8 @@
             <el-form-item label="培训学时:" prop="trainHour">
               <el-input
                 v-model="formInline.trainHour"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -337,7 +346,7 @@
                 placeholder="培训时间"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -347,8 +356,8 @@
             <el-form-item label="培训地点:" prop="trainAddress">
               <el-input
                 v-model="formInline.trainAddress"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -358,8 +367,8 @@
             <el-form-item label="培训效果:" prop="trainEffect">
               <el-input
                 v-model="formInline.trainEffect"
-                :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训效果'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -369,8 +378,8 @@
             <el-form-item label="存在问题:" prop="problems">
               <el-input
                 v-model="formInline.problems"
-                :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入存在问题'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -380,8 +389,8 @@
             <el-form-item label="改进措施:" prop="improveMethod">
               <el-input
                 v-model="formInline.improveMethod"
-                :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入改进措施'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -391,8 +400,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model="formInline.remark"
-                :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -401,10 +410,10 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" :disabled="buttonType === '详情'" @click="deleteList">
+        <el-button v-if="buttonType !== '详情'" type="info" :disabled="pageType === 'detail'" @click="deleteList">
           删除行
         </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" :disabled="buttonType === '详情'" @click="addRoow">
+        <el-button v-if="buttonType !== '详情'" type="primary" :disabled="pageType === 'detail'" @click="addRoow">
           增加行
         </el-button>
       </template>
@@ -417,18 +426,27 @@
         <el-table-column type="selection" width="55" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column align="center" label="学员名称">
+          <template #header>
+            <span style="color: red;">*</span><span>学员名称</span>
+          </template>
           <template #default="scope">
-            <span v-show="!scope.row.isNameShow" style="color: gray;" @dblclick="dblclickName(scope.row)">{{ scope.row.name || '双击选择' }}</span>
-            <el-input v-show="scope.row.isNameShow" v-model="scope.row.name" placeholder="请选择" class="input">
+            <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input">
               <template #append>
-                <el-button size="small" :disabled="buttonType === '详情'" @click="selectPerson(scope.$index)">
+                <el-button size="small" :disabled="pageType === 'detail'" @click="selectPerson(scope.$index)">
                   选择
                 </el-button>
               </template>
             </el-input>
           </template>
         </el-table-column>
-        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :prop="item.value" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
   </app-container>
@@ -436,55 +454,3 @@
   <user-list-dialog ref="userListRef" :list="formInline.trainStaffList" @add="confirmPerson" />
 </template>
 
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>