diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 3ee3331..0ea0555 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -118,3 +118,7 @@
 .el-button.is-link + .el-button.is-link {
   margin-left: 3px;
 }
+
+.full-width-input {
+  width: 100% !important;
+}

diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 3ee3331..0ea0555 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -118,3 +118,7 @@
 .el-button.is-link + .el-button.is-link {
   margin-left: 3px;
 }
+
+.full-width-input {
+  width: 100% !important;
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 046291a..1c14871 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -27,7 +27,7 @@
     },
   },
   // loading状态
-  loading: {
+  listLoading: {
     type: Boolean,
     default: false,
   },
@@ -163,7 +163,7 @@
     console.log('selectClick')
     if (selection.length > 1) {
       const del_row = selection.shift()
-      table.value.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
     }
   }
 }
@@ -174,7 +174,7 @@
     <el-table
       id="print"
       ref="table"
-      v-loading="loading"
+      v-loading="listLoading"
       :data="data"
       height="height"
       border
@@ -185,7 +185,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="55" />
+      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />

diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 3ee3331..0ea0555 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -118,3 +118,7 @@
 .el-button.is-link + .el-button.is-link {
   margin-left: 3px;
 }
+
+.full-width-input {
+  width: 100% !important;
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 046291a..1c14871 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -27,7 +27,7 @@
     },
   },
   // loading状态
-  loading: {
+  listLoading: {
     type: Boolean,
     default: false,
   },
@@ -163,7 +163,7 @@
     console.log('selectClick')
     if (selection.length > 1) {
       const del_row = selection.shift()
-      table.value.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
     }
   }
 }
@@ -174,7 +174,7 @@
     <el-table
       id="print"
       ref="table"
-      v-loading="loading"
+      v-loading="listLoading"
       :data="data"
       height="height"
       border
@@ -185,7 +185,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="55" />
+      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 3676c67..ad8790d 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -266,7 +266,7 @@
   {
     path: '/price',
     component: Layout,
-    redirect: '/measure/measurePrice/list',
+    redirect: '/price/list',
     name: 'MeasurePrice',
     meta: {
       title: '价格库',
@@ -284,6 +284,19 @@
           auth: '/measure/measurePrice/list',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'measurePriceAdd',
+        component: () => import('@/views/measure/price/priceAdd.vue'),
+        meta: {
+          title: '新建价格',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/measure/price/add',
+          activeMenu: '/price/list',
+        },
+      },
     ],
   },
 ]

diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 3ee3331..0ea0555 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -118,3 +118,7 @@
 .el-button.is-link + .el-button.is-link {
   margin-left: 3px;
 }
+
+.full-width-input {
+  width: 100% !important;
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 046291a..1c14871 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -27,7 +27,7 @@
     },
   },
   // loading状态
-  loading: {
+  listLoading: {
     type: Boolean,
     default: false,
   },
@@ -163,7 +163,7 @@
     console.log('selectClick')
     if (selection.length > 1) {
       const del_row = selection.shift()
-      table.value.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
     }
   }
 }
@@ -174,7 +174,7 @@
     <el-table
       id="print"
       ref="table"
-      v-loading="loading"
+      v-loading="listLoading"
       :data="data"
       height="height"
       border
@@ -185,7 +185,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="55" />
+      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 3676c67..ad8790d 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -266,7 +266,7 @@
   {
     path: '/price',
     component: Layout,
-    redirect: '/measure/measurePrice/list',
+    redirect: '/price/list',
     name: 'MeasurePrice',
     meta: {
       title: '价格库',
@@ -284,6 +284,19 @@
           auth: '/measure/measurePrice/list',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'measurePriceAdd',
+        component: () => import('@/views/measure/price/priceAdd.vue'),
+        meta: {
+          title: '新建价格',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/measure/price/add',
+          activeMenu: '/price/list',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
new file mode 100644
index 0000000..bb58885
--- /dev/null
+++ b/src/utils/validate.ts
@@ -0,0 +1,55 @@
+/**
+ * 判断是否为空
+ * @param val 待判断值
+ * @returns 是否合法
+ */
+export const isRequired = (val: string): boolean => {
+  return val !== ''
+}
+
+//
+/**
+ * 判断是否为整数
+ * @param value
+ * @returns 是否合法
+ */
+export const isInteger = (value: any) => {
+  return Number.isInteger(Number(value))
+}
+
+/**
+ * 判断是否为ip
+ * @param ip 待判断
+ * @returns 是否合法
+ */
+export const isIp = (ip: string): boolean => {
+  var rep = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+  return rep.test(ip)
+}
+
+/**
+ * 判断端口是否合法
+ * @param port 待判断端口
+ * @returns 是否合法
+ */
+export const isPort = (port: number | string): boolean => {
+  if (!isInteger(port) || port > 65535 || port < 1) {
+    return false
+  }
+  return true
+}
+
+//
+/**
+ * 判断整数范围
+ * @param value 待判断数值
+ * @param max 最大值
+ * @param min 最小值
+ * @returns 是否符合数值范围
+ */
+export const isInRange = (value: number, max = 20, min = -10): boolean => {
+  if (!isInteger(value) || value > max || min < -10) {
+    return false
+  }
+  return true
+}

diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 3ee3331..0ea0555 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -118,3 +118,7 @@
 .el-button.is-link + .el-button.is-link {
   margin-left: 3px;
 }
+
+.full-width-input {
+  width: 100% !important;
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 046291a..1c14871 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -27,7 +27,7 @@
     },
   },
   // loading状态
-  loading: {
+  listLoading: {
     type: Boolean,
     default: false,
   },
@@ -163,7 +163,7 @@
     console.log('selectClick')
     if (selection.length > 1) {
       const del_row = selection.shift()
-      table.value.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
     }
   }
 }
@@ -174,7 +174,7 @@
     <el-table
       id="print"
       ref="table"
-      v-loading="loading"
+      v-loading="listLoading"
       :data="data"
       height="height"
       border
@@ -185,7 +185,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="55" />
+      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 3676c67..ad8790d 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -266,7 +266,7 @@
   {
     path: '/price',
     component: Layout,
-    redirect: '/measure/measurePrice/list',
+    redirect: '/price/list',
     name: 'MeasurePrice',
     meta: {
       title: '价格库',
@@ -284,6 +284,19 @@
           auth: '/measure/measurePrice/list',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'measurePriceAdd',
+        component: () => import('@/views/measure/price/priceAdd.vue'),
+        meta: {
+          title: '新建价格',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/measure/price/add',
+          activeMenu: '/price/list',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
new file mode 100644
index 0000000..bb58885
--- /dev/null
+++ b/src/utils/validate.ts
@@ -0,0 +1,55 @@
+/**
+ * 判断是否为空
+ * @param val 待判断值
+ * @returns 是否合法
+ */
+export const isRequired = (val: string): boolean => {
+  return val !== ''
+}
+
+//
+/**
+ * 判断是否为整数
+ * @param value
+ * @returns 是否合法
+ */
+export const isInteger = (value: any) => {
+  return Number.isInteger(Number(value))
+}
+
+/**
+ * 判断是否为ip
+ * @param ip 待判断
+ * @returns 是否合法
+ */
+export const isIp = (ip: string): boolean => {
+  var rep = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+  return rep.test(ip)
+}
+
+/**
+ * 判断端口是否合法
+ * @param port 待判断端口
+ * @returns 是否合法
+ */
+export const isPort = (port: number | string): boolean => {
+  if (!isInteger(port) || port > 65535 || port < 1) {
+    return false
+  }
+  return true
+}
+
+//
+/**
+ * 判断整数范围
+ * @param value 待判断数值
+ * @param max 最大值
+ * @param min 最小值
+ * @returns 是否符合数值范围
+ */
+export const isInRange = (value: number, max = 20, min = -10): boolean => {
+  if (!isInteger(value) || value > max || min < -10) {
+    return false
+  }
+  return true
+}
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index b6d4f2f..cbed390 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,92 +2,42 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType, optionsType } from './list_interface'
+import { useRoute, useRouter } from 'vue-router'
+import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  checkType: '',
-  // model: '',
-  priceItem: '',
-  priceName: '',
-  priceNo: '',
-  priceType: '',
-  offset: 1,
-  limit: 10,
+  checkType: '', // 检校类型
+  priceItem: '', // 项目
+  priceName: '', // 价格名称
+  priceNo: '', // 价格编号
+  priceType: '', // 类别
+  offset: 1, // 页码
+  limit: 20, // 分页数量
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
-const total = ref(20)
+const total = ref(0)
 // 表头
-const columns = ref([
-  {
-    text: '价格编号',
-    value: 'priceNo',
-    width: '160',
-    align: 'center',
-  },
-  {
-    text: '价格名称',
-    value: 'priceName',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '检校类型',
-    value: 'checkType',
-    width: '90',
-    align: 'center',
-  },
-  // {
-  //   text: '型号',
-  //   value: 'model',
-  // },
-  {
-    text: '类别',
-    value: 'priceType',
-    align: 'center',
-  },
-  {
-    text: '项目',
-    value: 'priceItem',
-    align: 'center',
-  },
-  {
-    text: '标准价格（元)',
-    value: 'price',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '业务员折扣权限',
-    value: 'operatorDiscountPermission',
-    width: '130',
-    align: 'center',
-  },
-  {
-    text: '负责人折扣权限',
-    value: 'directorDiscountPermission',
-    width: '130',
-    align: 'center',
-  },
-  {
-    text: '依据标准',
-    value: 'priceStandard',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    width: '120',
-    align: 'center',
-  },
-])
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
+  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+  { text: '价格名称', value: 'priceName', align: 'center' },
+  { text: '检校类型', value: 'checkType', align: 'center' },
+  { text: '类别', value: 'priceType', align: 'center' },
+  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
+  { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
+  { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
+  { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
+  { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
+]
 
 // 选中的内容
 const checkoutList = ref([])
@@ -95,19 +45,22 @@
 const fileRef = ref()
 // 删除id
 const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
 const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
 const priceItemOptions = ref<optionsType[]>([])
+// 确认框是否显示
 const isPopconfirmShow = ref(false)
-// 点击按钮
-const buttonType = ref('')
+
+// 列表加载状态
 const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
+// 查询列表
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    listQuery.value.offset = 1
+  }
   loadingTable.value = true
   getPriceList(listQuery.value).then((response) => {
     list.value = response.data.records
@@ -120,19 +73,14 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  priceName: string
-}
+
+const $router = useRouter()
 // 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  buttonType.value = value
-  infoId.value = row.id
-  show.value = false
+const handleEdit = (row: priceForm, pageType: 'edit' | 'detail') => {
+  $router.push(`/price/${pageType}/${row.id}`)
 }
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: priceForm) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -144,7 +92,7 @@
     },
   )
     .then(() => {
-      getDeletePrice({ id: row.id as string }).then((res) => {
+      getDeletePrice({ id: row.id }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -157,8 +105,9 @@
 }
 // 点击搜索
 const searchList = () => {
-  fetchData(true)
+  fetchData()
 }
+// 确认删除
 const confirmEvent = () => {
   getDeletePrice({ id: deleteId.value }).then((res) => {
     if (res.code === 200) {
@@ -168,9 +117,7 @@
     }
   })
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -197,13 +144,9 @@
     priceNo: '',
     priceType: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
+  fetchData()
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
@@ -272,9 +215,9 @@
 const uploadAll = () => {
   upload()
 }
+
 const add = () => {
-  buttonType.value = '新建'
-  show.value = false
+  $router.push('/price/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -282,7 +225,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '价格列表', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
@@ -291,7 +234,7 @@
 </script>
 
 <template>
-  <div v-if="show">
+  <div>
     <app-container>
       <search-area
         :need-clear="true"
@@ -317,7 +260,6 @@
             clearable
             placeholder="检校类型"
             size="default"
-            :disabled="buttonType === '详情'"
           >
             <el-option
               v-for="item in checkTypeOptions"
@@ -333,7 +275,6 @@
             clearable
             placeholder="类别"
             size="default"
-            :disabled="buttonType === '详情'"
           >
             <el-option
               v-for="item in priceTypeOptions"
@@ -349,7 +290,6 @@
             clearable
             placeholder="项目"
             size="default"
-            :disabled="buttonType === '详情'"
           >
             <el-option
               v-for="item in priceItemOptions"
@@ -374,14 +314,14 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="160">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  @click="handleEdit(row, 'edit')"
                 >
                   编辑
                 </el-button>
@@ -389,7 +329,7 @@
                   size="small"
                   link
                   type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
+                  @click="handleEdit(row, 'detail')"
                 >
                   详情
                 </el-button>
@@ -398,7 +338,7 @@
                   size="small"
                   link
                   type="danger"
-                  @click="handleDelete(row.$index, row)"
+                  @click="handleDelete(row)"
                 >
                   删除
                 </el-button>
@@ -410,7 +350,7 @@
     </app-container>
     <el-dialog
       v-model="isPopconfirmShow"
-      title="确认框"
+      title="确认操作"
       width="30%"
     >
       <span>确定删除吗?</span>
@@ -424,21 +364,9 @@
       </template>
     </el-dialog>
   </div>
-
-  <list-price-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    @close="close"
-  />
 </template>
 
 <style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-
 :deep .search-item {
   width: 11.5vw !important;
 }

diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 3ee3331..0ea0555 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -118,3 +118,7 @@
 .el-button.is-link + .el-button.is-link {
   margin-left: 3px;
 }
+
+.full-width-input {
+  width: 100% !important;
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 046291a..1c14871 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -27,7 +27,7 @@
     },
   },
   // loading状态
-  loading: {
+  listLoading: {
     type: Boolean,
     default: false,
   },
@@ -163,7 +163,7 @@
     console.log('selectClick')
     if (selection.length > 1) {
       const del_row = selection.shift()
-      table.value.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
     }
   }
 }
@@ -174,7 +174,7 @@
     <el-table
       id="print"
       ref="table"
-      v-loading="loading"
+      v-loading="listLoading"
       :data="data"
       height="height"
       border
@@ -185,7 +185,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="55" />
+      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 3676c67..ad8790d 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -266,7 +266,7 @@
   {
     path: '/price',
     component: Layout,
-    redirect: '/measure/measurePrice/list',
+    redirect: '/price/list',
     name: 'MeasurePrice',
     meta: {
       title: '价格库',
@@ -284,6 +284,19 @@
           auth: '/measure/measurePrice/list',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'measurePriceAdd',
+        component: () => import('@/views/measure/price/priceAdd.vue'),
+        meta: {
+          title: '新建价格',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/measure/price/add',
+          activeMenu: '/price/list',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
new file mode 100644
index 0000000..bb58885
--- /dev/null
+++ b/src/utils/validate.ts
@@ -0,0 +1,55 @@
+/**
+ * 判断是否为空
+ * @param val 待判断值
+ * @returns 是否合法
+ */
+export const isRequired = (val: string): boolean => {
+  return val !== ''
+}
+
+//
+/**
+ * 判断是否为整数
+ * @param value
+ * @returns 是否合法
+ */
+export const isInteger = (value: any) => {
+  return Number.isInteger(Number(value))
+}
+
+/**
+ * 判断是否为ip
+ * @param ip 待判断
+ * @returns 是否合法
+ */
+export const isIp = (ip: string): boolean => {
+  var rep = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+  return rep.test(ip)
+}
+
+/**
+ * 判断端口是否合法
+ * @param port 待判断端口
+ * @returns 是否合法
+ */
+export const isPort = (port: number | string): boolean => {
+  if (!isInteger(port) || port > 65535 || port < 1) {
+    return false
+  }
+  return true
+}
+
+//
+/**
+ * 判断整数范围
+ * @param value 待判断数值
+ * @param max 最大值
+ * @param min 最小值
+ * @returns 是否符合数值范围
+ */
+export const isInRange = (value: number, max = 20, min = -10): boolean => {
+  if (!isInteger(value) || value > max || min < -10) {
+    return false
+  }
+  return true
+}
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index b6d4f2f..cbed390 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,92 +2,42 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType, optionsType } from './list_interface'
+import { useRoute, useRouter } from 'vue-router'
+import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  checkType: '',
-  // model: '',
-  priceItem: '',
-  priceName: '',
-  priceNo: '',
-  priceType: '',
-  offset: 1,
-  limit: 10,
+  checkType: '', // 检校类型
+  priceItem: '', // 项目
+  priceName: '', // 价格名称
+  priceNo: '', // 价格编号
+  priceType: '', // 类别
+  offset: 1, // 页码
+  limit: 20, // 分页数量
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
-const total = ref(20)
+const total = ref(0)
 // 表头
-const columns = ref([
-  {
-    text: '价格编号',
-    value: 'priceNo',
-    width: '160',
-    align: 'center',
-  },
-  {
-    text: '价格名称',
-    value: 'priceName',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '检校类型',
-    value: 'checkType',
-    width: '90',
-    align: 'center',
-  },
-  // {
-  //   text: '型号',
-  //   value: 'model',
-  // },
-  {
-    text: '类别',
-    value: 'priceType',
-    align: 'center',
-  },
-  {
-    text: '项目',
-    value: 'priceItem',
-    align: 'center',
-  },
-  {
-    text: '标准价格（元)',
-    value: 'price',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '业务员折扣权限',
-    value: 'operatorDiscountPermission',
-    width: '130',
-    align: 'center',
-  },
-  {
-    text: '负责人折扣权限',
-    value: 'directorDiscountPermission',
-    width: '130',
-    align: 'center',
-  },
-  {
-    text: '依据标准',
-    value: 'priceStandard',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    width: '120',
-    align: 'center',
-  },
-])
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
+  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+  { text: '价格名称', value: 'priceName', align: 'center' },
+  { text: '检校类型', value: 'checkType', align: 'center' },
+  { text: '类别', value: 'priceType', align: 'center' },
+  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
+  { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
+  { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
+  { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
+  { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
+]
 
 // 选中的内容
 const checkoutList = ref([])
@@ -95,19 +45,22 @@
 const fileRef = ref()
 // 删除id
 const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
 const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
 const priceItemOptions = ref<optionsType[]>([])
+// 确认框是否显示
 const isPopconfirmShow = ref(false)
-// 点击按钮
-const buttonType = ref('')
+
+// 列表加载状态
 const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
+// 查询列表
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    listQuery.value.offset = 1
+  }
   loadingTable.value = true
   getPriceList(listQuery.value).then((response) => {
     list.value = response.data.records
@@ -120,19 +73,14 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  priceName: string
-}
+
+const $router = useRouter()
 // 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  buttonType.value = value
-  infoId.value = row.id
-  show.value = false
+const handleEdit = (row: priceForm, pageType: 'edit' | 'detail') => {
+  $router.push(`/price/${pageType}/${row.id}`)
 }
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: priceForm) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -144,7 +92,7 @@
     },
   )
     .then(() => {
-      getDeletePrice({ id: row.id as string }).then((res) => {
+      getDeletePrice({ id: row.id }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -157,8 +105,9 @@
 }
 // 点击搜索
 const searchList = () => {
-  fetchData(true)
+  fetchData()
 }
+// 确认删除
 const confirmEvent = () => {
   getDeletePrice({ id: deleteId.value }).then((res) => {
     if (res.code === 200) {
@@ -168,9 +117,7 @@
     }
   })
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -197,13 +144,9 @@
     priceNo: '',
     priceType: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
+  fetchData()
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
@@ -272,9 +215,9 @@
 const uploadAll = () => {
   upload()
 }
+
 const add = () => {
-  buttonType.value = '新建'
-  show.value = false
+  $router.push('/price/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -282,7 +225,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '价格列表', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
@@ -291,7 +234,7 @@
 </script>
 
 <template>
-  <div v-if="show">
+  <div>
     <app-container>
       <search-area
         :need-clear="true"
@@ -317,7 +260,6 @@
             clearable
             placeholder="检校类型"
             size="default"
-            :disabled="buttonType === '详情'"
           >
             <el-option
               v-for="item in checkTypeOptions"
@@ -333,7 +275,6 @@
             clearable
             placeholder="类别"
             size="default"
-            :disabled="buttonType === '详情'"
           >
             <el-option
               v-for="item in priceTypeOptions"
@@ -349,7 +290,6 @@
             clearable
             placeholder="项目"
             size="default"
-            :disabled="buttonType === '详情'"
           >
             <el-option
               v-for="item in priceItemOptions"
@@ -374,14 +314,14 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="160">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  @click="handleEdit(row, 'edit')"
                 >
                   编辑
                 </el-button>
@@ -389,7 +329,7 @@
                   size="small"
                   link
                   type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
+                  @click="handleEdit(row, 'detail')"
                 >
                   详情
                 </el-button>
@@ -398,7 +338,7 @@
                   size="small"
                   link
                   type="danger"
-                  @click="handleDelete(row.$index, row)"
+                  @click="handleDelete(row)"
                 >
                   删除
                 </el-button>
@@ -410,7 +350,7 @@
     </app-container>
     <el-dialog
       v-model="isPopconfirmShow"
-      title="确认框"
+      title="确认操作"
       width="30%"
     >
       <span>确定删除吗?</span>
@@ -424,21 +364,9 @@
       </template>
     </el-dialog>
   </div>
-
-  <list-price-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    @close="close"
-  />
 </template>
 
 <style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-
 :deep .search-item {
   width: 11.5vw !important;
 }
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index b75af64..f4c394f 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -28,24 +28,36 @@
   name: string
   value: string
 }
-
-export interface formInlineType {
-  checkType: string
-  createTime: string
-  directorDiscountPermission: string
-  historicalPriceList: []
-  id: string
-  isDel: number
-  model: string
-  operatorDiscountPermission: string
-  price: string
-  priceDescription: string
-  priceItem: string
-  priceLimit: string
-  priceName: string
-  priceNo: string
-  priceStandard: string
-  priceType: string
-  remark: string
-  updateTime: string
+// 历史价格对象
+export interface historyPriceItem {
+  createTime: string // 创建时间
+  enableTime: string // 启用时间
+  endTime: string // 结束时间
+  id: string | number // 主键id
+  price: number // 定价
+  priced: string // 价格表id
+  priceNo: string // 价格编号
+  updateStaff: string // 修改人员
+  updateTime: string // 更新时间
+}
+// 价格表单对象类型
+export interface priceForm {
+  checkType: string // 校验类型-字典value
+  createTime: string // 创建时间
+  directorDiscountPermission: string // 负责人折扣权限-字典value
+  historicalPriceList?: historyPriceItem[] // 历史价格列表
+  id: string // 主键id
+  isDel: number // 删除标记
+  model: string // 型号
+  operatorDiscountPermission: string // 业务员折扣权限-字典value
+  price: string // 标准价格(元)
+  priceDescription: string // 说明
+  priceItem: string //	项目-字典value
+  priceLimit: string //	限制范围
+  priceName: string // 价格名称
+  priceNo: string // 价格编号
+  priceStandard: string // 依据标准-计量规程文件名
+  priceType: string // 价格类别-字典value
+  remark: string // 备注
+  updateTime: string // 更新时间
 }

diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 3ee3331..0ea0555 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -118,3 +118,7 @@
 .el-button.is-link + .el-button.is-link {
   margin-left: 3px;
 }
+
+.full-width-input {
+  width: 100% !important;
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 046291a..1c14871 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -27,7 +27,7 @@
     },
   },
   // loading状态
-  loading: {
+  listLoading: {
     type: Boolean,
     default: false,
   },
@@ -163,7 +163,7 @@
     console.log('selectClick')
     if (selection.length > 1) {
       const del_row = selection.shift()
-      table.value.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+      table.value?.toggleRowSelection(del_row, false) // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
     }
   }
 }
@@ -174,7 +174,7 @@
     <el-table
       id="print"
       ref="table"
-      v-loading="loading"
+      v-loading="listLoading"
       :data="data"
       height="height"
       border
@@ -185,7 +185,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect" type="selection" width="55" />
+      <el-table-column v-if="isShowmultiSelect" type="selection" width="38" />
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 3676c67..ad8790d 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -266,7 +266,7 @@
   {
     path: '/price',
     component: Layout,
-    redirect: '/measure/measurePrice/list',
+    redirect: '/price/list',
     name: 'MeasurePrice',
     meta: {
       title: '价格库',
@@ -284,6 +284,19 @@
           auth: '/measure/measurePrice/list',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'measurePriceAdd',
+        component: () => import('@/views/measure/price/priceAdd.vue'),
+        meta: {
+          title: '新建价格',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/measure/price/add',
+          activeMenu: '/price/list',
+        },
+      },
     ],
   },
 ]
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
new file mode 100644
index 0000000..bb58885
--- /dev/null
+++ b/src/utils/validate.ts
@@ -0,0 +1,55 @@
+/**
+ * 判断是否为空
+ * @param val 待判断值
+ * @returns 是否合法
+ */
+export const isRequired = (val: string): boolean => {
+  return val !== ''
+}
+
+//
+/**
+ * 判断是否为整数
+ * @param value
+ * @returns 是否合法
+ */
+export const isInteger = (value: any) => {
+  return Number.isInteger(Number(value))
+}
+
+/**
+ * 判断是否为ip
+ * @param ip 待判断
+ * @returns 是否合法
+ */
+export const isIp = (ip: string): boolean => {
+  var rep = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+  return rep.test(ip)
+}
+
+/**
+ * 判断端口是否合法
+ * @param port 待判断端口
+ * @returns 是否合法
+ */
+export const isPort = (port: number | string): boolean => {
+  if (!isInteger(port) || port > 65535 || port < 1) {
+    return false
+  }
+  return true
+}
+
+//
+/**
+ * 判断整数范围
+ * @param value 待判断数值
+ * @param max 最大值
+ * @param min 最小值
+ * @returns 是否符合数值范围
+ */
+export const isInRange = (value: number, max = 20, min = -10): boolean => {
+  if (!isInteger(value) || value > max || min < -10) {
+    return false
+  }
+  return true
+}
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index b6d4f2f..cbed390 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,92 +2,42 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType, optionsType } from './list_interface'
+import { useRoute, useRouter } from 'vue-router'
+import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  checkType: '',
-  // model: '',
-  priceItem: '',
-  priceName: '',
-  priceNo: '',
-  priceType: '',
-  offset: 1,
-  limit: 10,
+  checkType: '', // 检校类型
+  priceItem: '', // 项目
+  priceName: '', // 价格名称
+  priceNo: '', // 价格编号
+  priceType: '', // 类别
+  offset: 1, // 页码
+  limit: 20, // 分页数量
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
-const total = ref(20)
+const total = ref(0)
 // 表头
-const columns = ref([
-  {
-    text: '价格编号',
-    value: 'priceNo',
-    width: '160',
-    align: 'center',
-  },
-  {
-    text: '价格名称',
-    value: 'priceName',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '检校类型',
-    value: 'checkType',
-    width: '90',
-    align: 'center',
-  },
-  // {
-  //   text: '型号',
-  //   value: 'model',
-  // },
-  {
-    text: '类别',
-    value: 'priceType',
-    align: 'center',
-  },
-  {
-    text: '项目',
-    value: 'priceItem',
-    align: 'center',
-  },
-  {
-    text: '标准价格（元)',
-    value: 'price',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '业务员折扣权限',
-    value: 'operatorDiscountPermission',
-    width: '130',
-    align: 'center',
-  },
-  {
-    text: '负责人折扣权限',
-    value: 'directorDiscountPermission',
-    width: '130',
-    align: 'center',
-  },
-  {
-    text: '依据标准',
-    value: 'priceStandard',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    width: '120',
-    align: 'center',
-  },
-])
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
+  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+  { text: '价格名称', value: 'priceName', align: 'center' },
+  { text: '检校类型', value: 'checkType', align: 'center' },
+  { text: '类别', value: 'priceType', align: 'center' },
+  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
+  { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
+  { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
+  { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
+  { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
+]
 
 // 选中的内容
 const checkoutList = ref([])
@@ -95,19 +45,22 @@
 const fileRef = ref()
 // 删除id
 const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
 const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
 const priceItemOptions = ref<optionsType[]>([])
+// 确认框是否显示
 const isPopconfirmShow = ref(false)
-// 点击按钮
-const buttonType = ref('')
+
+// 列表加载状态
 const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
+// 查询列表
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    listQuery.value.offset = 1
+  }
   loadingTable.value = true
   getPriceList(listQuery.value).then((response) => {
     list.value = response.data.records
@@ -120,19 +73,14 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  priceName: string
-}
+
+const $router = useRouter()
 // 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  buttonType.value = value
-  infoId.value = row.id
-  show.value = false
+const handleEdit = (row: priceForm, pageType: 'edit' | 'detail') => {
+  $router.push(`/price/${pageType}/${row.id}`)
 }
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: priceForm) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -144,7 +92,7 @@
     },
   )
     .then(() => {
-      getDeletePrice({ id: row.id as string }).then((res) => {
+      getDeletePrice({ id: row.id }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -157,8 +105,9 @@
 }
 // 点击搜索
 const searchList = () => {
-  fetchData(true)
+  fetchData()
 }
+// 确认删除
 const confirmEvent = () => {
   getDeletePrice({ id: deleteId.value }).then((res) => {
     if (res.code === 200) {
@@ -168,9 +117,7 @@
     }
   })
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -197,13 +144,9 @@
     priceNo: '',
     priceType: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
+  fetchData()
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
@@ -272,9 +215,9 @@
 const uploadAll = () => {
   upload()
 }
+
 const add = () => {
-  buttonType.value = '新建'
-  show.value = false
+  $router.push('/price/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -282,7 +225,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '价格列表', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
@@ -291,7 +234,7 @@
 </script>
 
 <template>
-  <div v-if="show">
+  <div>
     <app-container>
       <search-area
         :need-clear="true"
@@ -317,7 +260,6 @@
             clearable
             placeholder="检校类型"
             size="default"
-            :disabled="buttonType === '详情'"
           >
             <el-option
               v-for="item in checkTypeOptions"
@@ -333,7 +275,6 @@
             clearable
             placeholder="类别"
             size="default"
-            :disabled="buttonType === '详情'"
           >
             <el-option
               v-for="item in priceTypeOptions"
@@ -349,7 +290,6 @@
             clearable
             placeholder="项目"
             size="default"
-            :disabled="buttonType === '详情'"
           >
             <el-option
               v-for="item in priceItemOptions"
@@ -374,14 +314,14 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="160">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  @click="handleEdit(row, 'edit')"
                 >
                   编辑
                 </el-button>
@@ -389,7 +329,7 @@
                   size="small"
                   link
                   type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
+                  @click="handleEdit(row, 'detail')"
                 >
                   详情
                 </el-button>
@@ -398,7 +338,7 @@
                   size="small"
                   link
                   type="danger"
-                  @click="handleDelete(row.$index, row)"
+                  @click="handleDelete(row)"
                 >
                   删除
                 </el-button>
@@ -410,7 +350,7 @@
     </app-container>
     <el-dialog
       v-model="isPopconfirmShow"
-      title="确认框"
+      title="确认操作"
       width="30%"
     >
       <span>确定删除吗?</span>
@@ -424,21 +364,9 @@
       </template>
     </el-dialog>
   </div>
-
-  <list-price-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    @close="close"
-  />
 </template>
 
 <style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-
 :deep .search-item {
   width: 11.5vw !important;
 }
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index b75af64..f4c394f 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -28,24 +28,36 @@
   name: string
   value: string
 }
-
-export interface formInlineType {
-  checkType: string
-  createTime: string
-  directorDiscountPermission: string
-  historicalPriceList: []
-  id: string
-  isDel: number
-  model: string
-  operatorDiscountPermission: string
-  price: string
-  priceDescription: string
-  priceItem: string
-  priceLimit: string
-  priceName: string
-  priceNo: string
-  priceStandard: string
-  priceType: string
-  remark: string
-  updateTime: string
+// 历史价格对象
+export interface historyPriceItem {
+  createTime: string // 创建时间
+  enableTime: string // 启用时间
+  endTime: string // 结束时间
+  id: string | number // 主键id
+  price: number // 定价
+  priced: string // 价格表id
+  priceNo: string // 价格编号
+  updateStaff: string // 修改人员
+  updateTime: string // 更新时间
+}
+// 价格表单对象类型
+export interface priceForm {
+  checkType: string // 校验类型-字典value
+  createTime: string // 创建时间
+  directorDiscountPermission: string // 负责人折扣权限-字典value
+  historicalPriceList?: historyPriceItem[] // 历史价格列表
+  id: string // 主键id
+  isDel: number // 删除标记
+  model: string // 型号
+  operatorDiscountPermission: string // 业务员折扣权限-字典value
+  price: string // 标准价格(元)
+  priceDescription: string // 说明
+  priceItem: string //	项目-字典value
+  priceLimit: string //	限制范围
+  priceName: string // 价格名称
+  priceNo: string // 价格编号
+  priceStandard: string // 依据标准-计量规程文件名
+  priceType: string // 价格类别-字典value
+  remark: string // 备注
+  updateTime: string // 更新时间
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 33627d7..1195962 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,27 +1,35 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { formInlineType, optionsType } from './list_interface'
+import { ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { useRoute } from 'vue-router'
+import type { optionsType, priceForm } from './list_interface'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-})
-const emit = defineEmits(['close'])
-const formInline: Ref<formInlineType> = ref({
+
+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 defaultForm: priceForm = {
   checkType: '',
-  createTime: null,
+  createTime: '',
   directorDiscountPermission: '',
   historicalPriceList: [],
-  id: null,
+  id: '',
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
@@ -30,14 +38,15 @@
   priceItem: '',
   priceLimit: '',
   priceName: '',
-  priceNo: null,
+  priceNo: '',
   priceStandard: '',
   priceType: '',
   remark: '',
-  updateTime: null,
-})
+  updateTime: '',
+}
+const formInline: Ref<priceForm> = ref({ ...defaultForm })
 const ruleFormRef = ref<FormInstance>()
-const rules = ref({
+const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: 'blur' }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: 'blur' }],
   priceType: [{ required: true, message: '类别不能为空', trigger: 'blur' }],
@@ -52,13 +61,16 @@
 const priceItemOptions = ref<optionsType[]>([])
 const operatorDiscountPermissionOptions = ref<optionsType[]>([])
 const directorDiscountPermissionOptions = ref<optionsType[]>([])
+const $router = useRouter()
 const close = () => {
-  emit('close')
+  $router.back()
 }
-// 获取详情信息
+// 获取detail信息
 const getInfo = () => {
-  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+  loading.value = true
+  getQueryPriceInfo({ id: infoId.value }).then((res) => {
     formInline.value = res.data
+    loading.value = false
   })
 }
 // 获取下拉框数据
@@ -87,6 +99,14 @@
 getOptions('operatorDiscountPermission')
 getOptions('directorDiscountPermission')
 
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
 // 点击提交/导出按钮
 const getAddList = async (formEl: FormInstance | undefined, type: string) => {
   if (!formEl) { return }
@@ -101,47 +121,44 @@
       type: 'warning',
     },
       ).then(() => {
-        if (type === '提交' && props.buttonType !== '编辑') {
+        if (type === '提交' && pageType.value !== 'edit') {
+          buttonLoading.value = true
           getPriceAddList(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
             }
-          })
+            buttonLoading.value = false
+          }).catch(_ => buttonLoading.value = false)
         }
-        else if (type === '提交' && props.buttonType === '编辑') {
-          formInline.value.id = props.infoId
+        else if (type === '提交' && pageType.value === 'edit') {
+          formInline.value.id = infoId.value
+          buttonLoading.value = true
           getUpdatePriceInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
             }
-          })
+            buttonLoading.value = false
+          }).catch(_ => buttonLoading.value = false)
         }
         else {
           // 打印
-          const printObj = ref({
-            id: 'print', // 需要打印元素的id
-            popTitle: '证书报告模板', // 打印配置页上方的标题
-            extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-            preview: false, // 是否启动预览模式，默认是false
-            standard: '',
-            extarCss: '',
-          })
+
         }
       })
     }
   })
 }
-if (props.buttonType !== '新建') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`价格列表-${buttonType}`">
+    <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(ruleFormRef, buttonType === '详情' ? '打印' : '提交')">
-          {{ buttonType === '详情' ? '打印' : '提交' }}
+        <el-button v-print="pageType === '' ? printObj : ''" type="primary" :loading="buttonLoading" :disabled="loading" @click="getAddList(ruleFormRef, pageType === 'detail' ? '打印' : '提交')">
+          {{ pageType === 'detail' ? '打印' : '提交' }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -149,6 +166,7 @@
       </template>
       <el-form
         ref="ruleFormRef"
+        v-loading="loading"
         :model="formInline"
         label-width="auto"
         class="demo-form-inline"
@@ -161,7 +179,8 @@
               <el-input
                 v-model.trim="formInline.priceName"
                 placeholder="价格名称"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
               />
             </el-form-item>
           </el-col>
@@ -171,8 +190,8 @@
                 v-model.trim="formInline.checkType"
                 clearable
                 placeholder="请选择检校类型"
-                style="width: 200%;"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
               >
                 <el-option
                   v-for="item in checkTypeOptions"
@@ -189,7 +208,8 @@
                 v-model.trim="formInline.priceType"
                 clearable
                 placeholder="请选择类别"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
               >
                 <el-option
                   v-for="item in priceTypeOptions"
@@ -206,7 +226,8 @@
                 v-model.trim="formInline.priceItem"
                 clearable
                 placeholder="请选择项目"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
               >
                 <el-option
                   v-for="item in priceItemOptions"
@@ -225,7 +246,7 @@
                 v-model.trim="formInline.priceStandard"
                 clearable
                 placeholder="依据标准"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -235,7 +256,7 @@
                 v-model.trim="formInline.price"
                 clearable
                 placeholder="标准价格（元)"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -244,13 +265,13 @@
               <el-input
                 v-model="formInline.priceLimit"
                 placeholder="限制范围"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="说明:">
-              <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+              <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="pageType === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -261,8 +282,8 @@
                 v-model.trim="formInline.operatorDiscountPermission"
                 clearable
                 placeholder="请选择业务员折扣权限"
-                style="width: 200%;"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
               >
                 <el-option
                   v-for="item in operatorDiscountPermissionOptions"
@@ -280,9 +301,9 @@
               <el-select
                 v-model.trim="formInline.directorDiscountPermission"
                 clearable
-                style="width: 200%;"
                 placeholder="请选择负责人折扣权限"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
+                class="full-width-input"
               >
                 <el-option
                   v-for="item in directorDiscountPermissionOptions"
@@ -297,7 +318,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
-              <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+              <el-input v-model="formInline.remark" placeholder="备注" :disabled="pageType === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -307,71 +328,5 @@
 </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;
-  }
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.el-select {
-  width: 9vw;
-  margin-right: 15px;
-}
-
-.info-dizhi .el-input {
-  width: 20vw;
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.info-appendix span {
-  margin-right: 25px;
-}
-
-.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>