diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
index eb506ec..6527f2e 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="maintenanceAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -7,21 +7,34 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -33,109 +46,11 @@
   constructionStandardUnitName: '',
   contactInfo: '',
   createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
-  managerStateName: '',
-  measureMajor: null,
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: null,
-  standardLaboratoryName: '',
-  standardLevel: null,
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: null,
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: null,
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
-  createTime: '',
-  director: '',
-  meterMajor: '',
-  organizeName: '',
-  organizeNo: '',
-  organizeType: '2',
-  pdeptId: null,
-  offset: 1,
-  limit: 999999,
-}).then((res) => {
-  standardUsersDeptList.value = res.data.rows
-})
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
-  }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
-}
 // 数据
 const list = ref<object[]>([
   { name: '王五' },
 ])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -233,37 +148,17 @@
 ])
 // 标准配套设备更换表格分页
 const changePage = () => {}
-getStandardOwnerOptions()
 // 添加表格数据对象
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
-// 关闭
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
@@ -317,19 +212,9 @@
   phone: string
   director: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: object) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
-// 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
-}
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -338,7 +223,7 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 
@@ -372,13 +257,13 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 标准配套设备更换表格删除行
 const removeRow = () => {
@@ -407,11 +292,6 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -424,24 +304,23 @@
   }
   applyListClose()
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
 </script>
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        基本信息
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
+      <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -452,53 +331,17 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="标准代码:">
-              <el-input
-                v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
-                placeholder="标准名称"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目编号:" prop="projectNo">
-              <el-input
-                v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="组织机构代码:" prop="organizeNo">
-              <el-input
-                v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item
               label="建标单位名称:"
               prop="constructionStandardUnitName"
@@ -506,198 +349,27 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                placeholder="标准负责人"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="类 别:" prop="category">
-              <el-select
-                v-model="formInline.category"
-                clearable
-                placeholder="类别"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in checkTypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准等级:" prop="standardLevel">
-              <el-select
-                v-model.trim="formInline.standardLevel"
-                clearable
-                placeholder="标准等级"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardLevelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传递范围:" prop="transmitRange">
-              <el-select
-                v-model.trim="formInline.transmitRange"
-                clearable
-                placeholder="传递范围"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in transmitRangeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="投资总额:">
-              <el-input
-                v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="筹建日期:" prop="preparationDate">
-              <el-date-picker
-                v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准所在实验室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                placeholder="标准所在实验室"
-                size="default"
-                :disabled="buttonType === '查看'"
-                @clear="clearDeptList"
-              >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实验室负责人:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系方式:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="管理状态:" prop="managerState">
-              <el-select
-                v-model.trim="formInline.managerState"
-                clearable
-                placeholder="管理状态"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业:" prop="measureMajor">
-              <el-select
-                v-model.trim="formInline.measureMajor"
-                clearable
-                placeholder="计量专业"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in measureMajorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -709,54 +381,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="不确定度:" prop="uncertainty">
-              <el-input
-                v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="测量范围:" prop="mesureRange">
-              <el-input
-                v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <el-form-item label="环境条件" />
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
-              <el-input
-                v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
-              <el-input
-                v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -774,23 +399,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                placeholder="证书编号"
-                size="default"
-                disabled
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发证单位:">
               <el-input placeholder="发证单位" disabled />
             </el-form-item>
@@ -820,7 +428,7 @@
                 :on-change="handleFileChange"
                 :limit="1"
               >
-                <el-button :disabled="buttonType === '查看'">
+                <el-button :disabled="pageType === 'detail'">
                   上传
                 </el-button>
               </el-upload>
@@ -834,53 +442,53 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            批量选择
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+    </detail-page>
+    <div class="header">
+      <div class="title">
+        标准配套设备更换
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        申请文档
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          审批流程
-        </div>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        审批流程
       </div>
     </div>
   </app-container>
@@ -888,7 +496,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -909,69 +517,74 @@
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
-    :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
+    width="50%"
+    :before-close="handleClose"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
-      <el-button type="info" @click="applyListClose">
+      <el-button type="info" @click="handleClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
 </template>
 

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
index eb506ec..6527f2e 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="maintenanceAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -7,21 +7,34 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -33,109 +46,11 @@
   constructionStandardUnitName: '',
   contactInfo: '',
   createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
-  managerStateName: '',
-  measureMajor: null,
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: null,
-  standardLaboratoryName: '',
-  standardLevel: null,
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: null,
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: null,
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
-  createTime: '',
-  director: '',
-  meterMajor: '',
-  organizeName: '',
-  organizeNo: '',
-  organizeType: '2',
-  pdeptId: null,
-  offset: 1,
-  limit: 999999,
-}).then((res) => {
-  standardUsersDeptList.value = res.data.rows
-})
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
-  }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
-}
 // 数据
 const list = ref<object[]>([
   { name: '王五' },
 ])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -233,37 +148,17 @@
 ])
 // 标准配套设备更换表格分页
 const changePage = () => {}
-getStandardOwnerOptions()
 // 添加表格数据对象
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
-// 关闭
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
@@ -317,19 +212,9 @@
   phone: string
   director: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: object) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
-// 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
-}
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -338,7 +223,7 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 
@@ -372,13 +257,13 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 标准配套设备更换表格删除行
 const removeRow = () => {
@@ -407,11 +292,6 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -424,24 +304,23 @@
   }
   applyListClose()
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
 </script>
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        基本信息
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
+      <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -452,53 +331,17 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="标准代码:">
-              <el-input
-                v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
-                placeholder="标准名称"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目编号:" prop="projectNo">
-              <el-input
-                v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="组织机构代码:" prop="organizeNo">
-              <el-input
-                v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item
               label="建标单位名称:"
               prop="constructionStandardUnitName"
@@ -506,198 +349,27 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                placeholder="标准负责人"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="类 别:" prop="category">
-              <el-select
-                v-model="formInline.category"
-                clearable
-                placeholder="类别"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in checkTypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准等级:" prop="standardLevel">
-              <el-select
-                v-model.trim="formInline.standardLevel"
-                clearable
-                placeholder="标准等级"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardLevelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传递范围:" prop="transmitRange">
-              <el-select
-                v-model.trim="formInline.transmitRange"
-                clearable
-                placeholder="传递范围"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in transmitRangeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="投资总额:">
-              <el-input
-                v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="筹建日期:" prop="preparationDate">
-              <el-date-picker
-                v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准所在实验室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                placeholder="标准所在实验室"
-                size="default"
-                :disabled="buttonType === '查看'"
-                @clear="clearDeptList"
-              >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实验室负责人:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系方式:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="管理状态:" prop="managerState">
-              <el-select
-                v-model.trim="formInline.managerState"
-                clearable
-                placeholder="管理状态"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业:" prop="measureMajor">
-              <el-select
-                v-model.trim="formInline.measureMajor"
-                clearable
-                placeholder="计量专业"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in measureMajorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -709,54 +381,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="不确定度:" prop="uncertainty">
-              <el-input
-                v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="测量范围:" prop="mesureRange">
-              <el-input
-                v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <el-form-item label="环境条件" />
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
-              <el-input
-                v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
-              <el-input
-                v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -774,23 +399,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                placeholder="证书编号"
-                size="default"
-                disabled
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发证单位:">
               <el-input placeholder="发证单位" disabled />
             </el-form-item>
@@ -820,7 +428,7 @@
                 :on-change="handleFileChange"
                 :limit="1"
               >
-                <el-button :disabled="buttonType === '查看'">
+                <el-button :disabled="pageType === 'detail'">
                   上传
                 </el-button>
               </el-upload>
@@ -834,53 +442,53 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            批量选择
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+    </detail-page>
+    <div class="header">
+      <div class="title">
+        标准配套设备更换
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        申请文档
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          审批流程
-        </div>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        审批流程
       </div>
     </div>
   </app-container>
@@ -888,7 +496,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -909,69 +517,74 @@
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
-    :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
+    width="50%"
+    :before-close="handleClose"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
-      <el-button type="info" @click="applyListClose">
+      <el-button type="info" @click="handleClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
index eb506ec..6527f2e 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="maintenanceAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -7,21 +7,34 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -33,109 +46,11 @@
   constructionStandardUnitName: '',
   contactInfo: '',
   createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
-  managerStateName: '',
-  measureMajor: null,
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: null,
-  standardLaboratoryName: '',
-  standardLevel: null,
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: null,
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: null,
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
-  createTime: '',
-  director: '',
-  meterMajor: '',
-  organizeName: '',
-  organizeNo: '',
-  organizeType: '2',
-  pdeptId: null,
-  offset: 1,
-  limit: 999999,
-}).then((res) => {
-  standardUsersDeptList.value = res.data.rows
-})
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
-  }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
-}
 // 数据
 const list = ref<object[]>([
   { name: '王五' },
 ])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -233,37 +148,17 @@
 ])
 // 标准配套设备更换表格分页
 const changePage = () => {}
-getStandardOwnerOptions()
 // 添加表格数据对象
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
-// 关闭
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
@@ -317,19 +212,9 @@
   phone: string
   director: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: object) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
-// 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
-}
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -338,7 +223,7 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 
@@ -372,13 +257,13 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 标准配套设备更换表格删除行
 const removeRow = () => {
@@ -407,11 +292,6 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -424,24 +304,23 @@
   }
   applyListClose()
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
 </script>
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        基本信息
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
+      <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -452,53 +331,17 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="标准代码:">
-              <el-input
-                v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
-                placeholder="标准名称"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目编号:" prop="projectNo">
-              <el-input
-                v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="组织机构代码:" prop="organizeNo">
-              <el-input
-                v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item
               label="建标单位名称:"
               prop="constructionStandardUnitName"
@@ -506,198 +349,27 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                placeholder="标准负责人"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="类 别:" prop="category">
-              <el-select
-                v-model="formInline.category"
-                clearable
-                placeholder="类别"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in checkTypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准等级:" prop="standardLevel">
-              <el-select
-                v-model.trim="formInline.standardLevel"
-                clearable
-                placeholder="标准等级"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardLevelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传递范围:" prop="transmitRange">
-              <el-select
-                v-model.trim="formInline.transmitRange"
-                clearable
-                placeholder="传递范围"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in transmitRangeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="投资总额:">
-              <el-input
-                v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="筹建日期:" prop="preparationDate">
-              <el-date-picker
-                v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准所在实验室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                placeholder="标准所在实验室"
-                size="default"
-                :disabled="buttonType === '查看'"
-                @clear="clearDeptList"
-              >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实验室负责人:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系方式:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="管理状态:" prop="managerState">
-              <el-select
-                v-model.trim="formInline.managerState"
-                clearable
-                placeholder="管理状态"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业:" prop="measureMajor">
-              <el-select
-                v-model.trim="formInline.measureMajor"
-                clearable
-                placeholder="计量专业"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in measureMajorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -709,54 +381,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="不确定度:" prop="uncertainty">
-              <el-input
-                v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="测量范围:" prop="mesureRange">
-              <el-input
-                v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <el-form-item label="环境条件" />
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
-              <el-input
-                v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
-              <el-input
-                v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -774,23 +399,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                placeholder="证书编号"
-                size="default"
-                disabled
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发证单位:">
               <el-input placeholder="发证单位" disabled />
             </el-form-item>
@@ -820,7 +428,7 @@
                 :on-change="handleFileChange"
                 :limit="1"
               >
-                <el-button :disabled="buttonType === '查看'">
+                <el-button :disabled="pageType === 'detail'">
                   上传
                 </el-button>
               </el-upload>
@@ -834,53 +442,53 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            批量选择
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+    </detail-page>
+    <div class="header">
+      <div class="title">
+        标准配套设备更换
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        申请文档
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          审批流程
-        </div>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        审批流程
       </div>
     </div>
   </app-container>
@@ -888,7 +496,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -909,69 +517,74 @@
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
-    :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
+    width="50%"
+    :before-close="handleClose"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
-      <el-button type="info" @click="applyListClose">
+      <el-button type="info" @click="handleClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 2b8bef4..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
index eb506ec..6527f2e 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="maintenanceAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -7,21 +7,34 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -33,109 +46,11 @@
   constructionStandardUnitName: '',
   contactInfo: '',
   createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
-  managerStateName: '',
-  measureMajor: null,
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: null,
-  standardLaboratoryName: '',
-  standardLevel: null,
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: null,
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: null,
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
-  createTime: '',
-  director: '',
-  meterMajor: '',
-  organizeName: '',
-  organizeNo: '',
-  organizeType: '2',
-  pdeptId: null,
-  offset: 1,
-  limit: 999999,
-}).then((res) => {
-  standardUsersDeptList.value = res.data.rows
-})
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
-  }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
-}
 // 数据
 const list = ref<object[]>([
   { name: '王五' },
 ])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -233,37 +148,17 @@
 ])
 // 标准配套设备更换表格分页
 const changePage = () => {}
-getStandardOwnerOptions()
 // 添加表格数据对象
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
-// 关闭
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
@@ -317,19 +212,9 @@
   phone: string
   director: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: object) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
-// 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
-}
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -338,7 +223,7 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 
@@ -372,13 +257,13 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 标准配套设备更换表格删除行
 const removeRow = () => {
@@ -407,11 +292,6 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -424,24 +304,23 @@
   }
   applyListClose()
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
 </script>
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        基本信息
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
+      <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -452,53 +331,17 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="标准代码:">
-              <el-input
-                v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
-                placeholder="标准名称"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目编号:" prop="projectNo">
-              <el-input
-                v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="组织机构代码:" prop="organizeNo">
-              <el-input
-                v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item
               label="建标单位名称:"
               prop="constructionStandardUnitName"
@@ -506,198 +349,27 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                placeholder="标准负责人"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="类 别:" prop="category">
-              <el-select
-                v-model="formInline.category"
-                clearable
-                placeholder="类别"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in checkTypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准等级:" prop="standardLevel">
-              <el-select
-                v-model.trim="formInline.standardLevel"
-                clearable
-                placeholder="标准等级"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardLevelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传递范围:" prop="transmitRange">
-              <el-select
-                v-model.trim="formInline.transmitRange"
-                clearable
-                placeholder="传递范围"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in transmitRangeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="投资总额:">
-              <el-input
-                v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="筹建日期:" prop="preparationDate">
-              <el-date-picker
-                v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准所在实验室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                placeholder="标准所在实验室"
-                size="default"
-                :disabled="buttonType === '查看'"
-                @clear="clearDeptList"
-              >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实验室负责人:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系方式:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="管理状态:" prop="managerState">
-              <el-select
-                v-model.trim="formInline.managerState"
-                clearable
-                placeholder="管理状态"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业:" prop="measureMajor">
-              <el-select
-                v-model.trim="formInline.measureMajor"
-                clearable
-                placeholder="计量专业"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in measureMajorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -709,54 +381,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="不确定度:" prop="uncertainty">
-              <el-input
-                v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="测量范围:" prop="mesureRange">
-              <el-input
-                v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <el-form-item label="环境条件" />
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
-              <el-input
-                v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
-              <el-input
-                v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -774,23 +399,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                placeholder="证书编号"
-                size="default"
-                disabled
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发证单位:">
               <el-input placeholder="发证单位" disabled />
             </el-form-item>
@@ -820,7 +428,7 @@
                 :on-change="handleFileChange"
                 :limit="1"
               >
-                <el-button :disabled="buttonType === '查看'">
+                <el-button :disabled="pageType === 'detail'">
                   上传
                 </el-button>
               </el-upload>
@@ -834,53 +442,53 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            批量选择
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+    </detail-page>
+    <div class="header">
+      <div class="title">
+        标准配套设备更换
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        申请文档
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          审批流程
-        </div>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        审批流程
       </div>
     </div>
   </app-container>
@@ -888,7 +496,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -909,69 +517,74 @@
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
-    :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
+    width="50%"
+    :before-close="handleClose"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
-      <el-button type="info" @click="applyListClose">
+      <el-button type="info" @click="handleClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 2b8bef4..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index bbaaa1f..2792a21 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -115,7 +115,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
index eb506ec..6527f2e 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="maintenanceAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -7,21 +7,34 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -33,109 +46,11 @@
   constructionStandardUnitName: '',
   contactInfo: '',
   createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
-  managerStateName: '',
-  measureMajor: null,
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: null,
-  standardLaboratoryName: '',
-  standardLevel: null,
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: null,
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: null,
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
-  createTime: '',
-  director: '',
-  meterMajor: '',
-  organizeName: '',
-  organizeNo: '',
-  organizeType: '2',
-  pdeptId: null,
-  offset: 1,
-  limit: 999999,
-}).then((res) => {
-  standardUsersDeptList.value = res.data.rows
-})
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
-  }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
-}
 // 数据
 const list = ref<object[]>([
   { name: '王五' },
 ])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -233,37 +148,17 @@
 ])
 // 标准配套设备更换表格分页
 const changePage = () => {}
-getStandardOwnerOptions()
 // 添加表格数据对象
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
-// 关闭
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
@@ -317,19 +212,9 @@
   phone: string
   director: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: object) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
-// 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
-}
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -338,7 +223,7 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 
@@ -372,13 +257,13 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 标准配套设备更换表格删除行
 const removeRow = () => {
@@ -407,11 +292,6 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -424,24 +304,23 @@
   }
   applyListClose()
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
 </script>
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        基本信息
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
+      <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -452,53 +331,17 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="标准代码:">
-              <el-input
-                v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
-                placeholder="标准名称"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目编号:" prop="projectNo">
-              <el-input
-                v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="组织机构代码:" prop="organizeNo">
-              <el-input
-                v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item
               label="建标单位名称:"
               prop="constructionStandardUnitName"
@@ -506,198 +349,27 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                placeholder="标准负责人"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="类 别:" prop="category">
-              <el-select
-                v-model="formInline.category"
-                clearable
-                placeholder="类别"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in checkTypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准等级:" prop="standardLevel">
-              <el-select
-                v-model.trim="formInline.standardLevel"
-                clearable
-                placeholder="标准等级"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardLevelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传递范围:" prop="transmitRange">
-              <el-select
-                v-model.trim="formInline.transmitRange"
-                clearable
-                placeholder="传递范围"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in transmitRangeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="投资总额:">
-              <el-input
-                v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="筹建日期:" prop="preparationDate">
-              <el-date-picker
-                v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准所在实验室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                placeholder="标准所在实验室"
-                size="default"
-                :disabled="buttonType === '查看'"
-                @clear="clearDeptList"
-              >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实验室负责人:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系方式:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="管理状态:" prop="managerState">
-              <el-select
-                v-model.trim="formInline.managerState"
-                clearable
-                placeholder="管理状态"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业:" prop="measureMajor">
-              <el-select
-                v-model.trim="formInline.measureMajor"
-                clearable
-                placeholder="计量专业"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in measureMajorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -709,54 +381,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="不确定度:" prop="uncertainty">
-              <el-input
-                v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="测量范围:" prop="mesureRange">
-              <el-input
-                v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <el-form-item label="环境条件" />
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
-              <el-input
-                v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
-              <el-input
-                v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -774,23 +399,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                placeholder="证书编号"
-                size="default"
-                disabled
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发证单位:">
               <el-input placeholder="发证单位" disabled />
             </el-form-item>
@@ -820,7 +428,7 @@
                 :on-change="handleFileChange"
                 :limit="1"
               >
-                <el-button :disabled="buttonType === '查看'">
+                <el-button :disabled="pageType === 'detail'">
                   上传
                 </el-button>
               </el-upload>
@@ -834,53 +442,53 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            批量选择
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+    </detail-page>
+    <div class="header">
+      <div class="title">
+        标准配套设备更换
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        申请文档
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          审批流程
-        </div>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        审批流程
       </div>
     </div>
   </app-container>
@@ -888,7 +496,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -909,69 +517,74 @@
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
-    :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
+    width="50%"
+    :before-close="handleClose"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
-      <el-button type="info" @click="applyListClose">
+      <el-button type="info" @click="handleClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 2b8bef4..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index bbaaa1f..2792a21 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -115,7 +115,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
index eb506ec..6527f2e 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="maintenanceAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -7,21 +7,34 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -33,109 +46,11 @@
   constructionStandardUnitName: '',
   contactInfo: '',
   createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
-  managerStateName: '',
-  measureMajor: null,
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: null,
-  standardLaboratoryName: '',
-  standardLevel: null,
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: null,
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: null,
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
-  createTime: '',
-  director: '',
-  meterMajor: '',
-  organizeName: '',
-  organizeNo: '',
-  organizeType: '2',
-  pdeptId: null,
-  offset: 1,
-  limit: 999999,
-}).then((res) => {
-  standardUsersDeptList.value = res.data.rows
-})
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
-  }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
-}
 // 数据
 const list = ref<object[]>([
   { name: '王五' },
 ])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -233,37 +148,17 @@
 ])
 // 标准配套设备更换表格分页
 const changePage = () => {}
-getStandardOwnerOptions()
 // 添加表格数据对象
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
-// 关闭
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
@@ -317,19 +212,9 @@
   phone: string
   director: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: object) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
-// 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
-}
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -338,7 +223,7 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 
@@ -372,13 +257,13 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 标准配套设备更换表格删除行
 const removeRow = () => {
@@ -407,11 +292,6 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -424,24 +304,23 @@
   }
   applyListClose()
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
 </script>
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        基本信息
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
+      <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -452,53 +331,17 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="标准代码:">
-              <el-input
-                v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
-                placeholder="标准名称"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目编号:" prop="projectNo">
-              <el-input
-                v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="组织机构代码:" prop="organizeNo">
-              <el-input
-                v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item
               label="建标单位名称:"
               prop="constructionStandardUnitName"
@@ -506,198 +349,27 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                placeholder="标准负责人"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="类 别:" prop="category">
-              <el-select
-                v-model="formInline.category"
-                clearable
-                placeholder="类别"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in checkTypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准等级:" prop="standardLevel">
-              <el-select
-                v-model.trim="formInline.standardLevel"
-                clearable
-                placeholder="标准等级"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardLevelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传递范围:" prop="transmitRange">
-              <el-select
-                v-model.trim="formInline.transmitRange"
-                clearable
-                placeholder="传递范围"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in transmitRangeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="投资总额:">
-              <el-input
-                v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="筹建日期:" prop="preparationDate">
-              <el-date-picker
-                v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准所在实验室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                placeholder="标准所在实验室"
-                size="default"
-                :disabled="buttonType === '查看'"
-                @clear="clearDeptList"
-              >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实验室负责人:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系方式:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="管理状态:" prop="managerState">
-              <el-select
-                v-model.trim="formInline.managerState"
-                clearable
-                placeholder="管理状态"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业:" prop="measureMajor">
-              <el-select
-                v-model.trim="formInline.measureMajor"
-                clearable
-                placeholder="计量专业"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in measureMajorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -709,54 +381,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="不确定度:" prop="uncertainty">
-              <el-input
-                v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="测量范围:" prop="mesureRange">
-              <el-input
-                v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <el-form-item label="环境条件" />
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
-              <el-input
-                v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
-              <el-input
-                v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -774,23 +399,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                placeholder="证书编号"
-                size="default"
-                disabled
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发证单位:">
               <el-input placeholder="发证单位" disabled />
             </el-form-item>
@@ -820,7 +428,7 @@
                 :on-change="handleFileChange"
                 :limit="1"
               >
-                <el-button :disabled="buttonType === '查看'">
+                <el-button :disabled="pageType === 'detail'">
                   上传
                 </el-button>
               </el-upload>
@@ -834,53 +442,53 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            批量选择
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+    </detail-page>
+    <div class="header">
+      <div class="title">
+        标准配套设备更换
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        申请文档
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          审批流程
-        </div>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        审批流程
       </div>
     </div>
   </app-container>
@@ -888,7 +496,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -909,69 +517,74 @@
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
-    :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
+    width="50%"
+    :before-close="handleClose"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
-      <el-button type="info" @click="applyListClose">
+      <el-button type="info" @click="handleClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 2b8bef4..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index bbaaa1f..2792a21 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -115,7 +115,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e9ff0ce..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
@@ -58,6 +58,7 @@
     text: '标准所在部门',
     value: 'standardLaboratoryName',
     align: 'center',
+    width: '180',
   },
   {
     text: '负责人',

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
index eb506ec..6527f2e 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="maintenanceAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -7,21 +7,34 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -33,109 +46,11 @@
   constructionStandardUnitName: '',
   contactInfo: '',
   createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
-  managerStateName: '',
-  measureMajor: null,
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: null,
-  standardLaboratoryName: '',
-  standardLevel: null,
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: null,
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: null,
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
-  createTime: '',
-  director: '',
-  meterMajor: '',
-  organizeName: '',
-  organizeNo: '',
-  organizeType: '2',
-  pdeptId: null,
-  offset: 1,
-  limit: 999999,
-}).then((res) => {
-  standardUsersDeptList.value = res.data.rows
-})
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
-  }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
-}
 // 数据
 const list = ref<object[]>([
   { name: '王五' },
 ])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -233,37 +148,17 @@
 ])
 // 标准配套设备更换表格分页
 const changePage = () => {}
-getStandardOwnerOptions()
 // 添加表格数据对象
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
-// 关闭
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
@@ -317,19 +212,9 @@
   phone: string
   director: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: object) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
-// 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
-}
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -338,7 +223,7 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 
@@ -372,13 +257,13 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 标准配套设备更换表格删除行
 const removeRow = () => {
@@ -407,11 +292,6 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -424,24 +304,23 @@
   }
   applyListClose()
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
 </script>
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        基本信息
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
+      <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -452,53 +331,17 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="标准代码:">
-              <el-input
-                v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
-                placeholder="标准名称"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目编号:" prop="projectNo">
-              <el-input
-                v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="组织机构代码:" prop="organizeNo">
-              <el-input
-                v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item
               label="建标单位名称:"
               prop="constructionStandardUnitName"
@@ -506,198 +349,27 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                placeholder="标准负责人"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="类 别:" prop="category">
-              <el-select
-                v-model="formInline.category"
-                clearable
-                placeholder="类别"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in checkTypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准等级:" prop="standardLevel">
-              <el-select
-                v-model.trim="formInline.standardLevel"
-                clearable
-                placeholder="标准等级"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardLevelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传递范围:" prop="transmitRange">
-              <el-select
-                v-model.trim="formInline.transmitRange"
-                clearable
-                placeholder="传递范围"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in transmitRangeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="投资总额:">
-              <el-input
-                v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="筹建日期:" prop="preparationDate">
-              <el-date-picker
-                v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准所在实验室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                placeholder="标准所在实验室"
-                size="default"
-                :disabled="buttonType === '查看'"
-                @clear="clearDeptList"
-              >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实验室负责人:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系方式:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="管理状态:" prop="managerState">
-              <el-select
-                v-model.trim="formInline.managerState"
-                clearable
-                placeholder="管理状态"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业:" prop="measureMajor">
-              <el-select
-                v-model.trim="formInline.measureMajor"
-                clearable
-                placeholder="计量专业"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in measureMajorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -709,54 +381,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="不确定度:" prop="uncertainty">
-              <el-input
-                v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="测量范围:" prop="mesureRange">
-              <el-input
-                v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <el-form-item label="环境条件" />
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
-              <el-input
-                v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
-              <el-input
-                v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -774,23 +399,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                placeholder="证书编号"
-                size="default"
-                disabled
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发证单位:">
               <el-input placeholder="发证单位" disabled />
             </el-form-item>
@@ -820,7 +428,7 @@
                 :on-change="handleFileChange"
                 :limit="1"
               >
-                <el-button :disabled="buttonType === '查看'">
+                <el-button :disabled="pageType === 'detail'">
                   上传
                 </el-button>
               </el-upload>
@@ -834,53 +442,53 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            批量选择
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+    </detail-page>
+    <div class="header">
+      <div class="title">
+        标准配套设备更换
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        申请文档
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          审批流程
-        </div>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        审批流程
       </div>
     </div>
   </app-container>
@@ -888,7 +496,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -909,69 +517,74 @@
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
-    :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
+    width="50%"
+    :before-close="handleClose"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
-      <el-button type="info" @click="applyListClose">
+      <el-button type="info" @click="handleClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 2b8bef4..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index bbaaa1f..2792a21 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -115,7 +115,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e9ff0ce..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
@@ -58,6 +58,7 @@
     text: '标准所在部门',
     value: 'standardLaboratoryName',
     align: 'center',
+    width: '180',
   },
   {
     text: '负责人',
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index 24f12ed..207c39f 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -2,9 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import type { IlistType, IlistTypes } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -19,21 +19,28 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: '0',
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: '1',
+  supplierName: '',
+  supplierNo: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
 const list = ref([
-  { name: '张三' },
+  { name: '张三', id: '12' },
 ])
 // 总数
 const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
 // 表头
 const columns = ref([
   {
@@ -104,12 +111,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getSoucreList(listQuery.value).then((response) => {
+  getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
 }
+// fetchData(true)
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -119,25 +127,11 @@
   id: string
   supplierName: string
 }
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   buttonArray.value = value === '编辑' ? ['提交'] : ['同意', '驳回', '拒绝']
-//   buttonType.value = value
-//   infoId.value = row.id
-//   show.value = false
-// }
 const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-}
-// 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+// 点击删除或者取消
+const handleDelete = (row: rowReturn, pageType: string) => {
   ElMessageBox.confirm(
-    `确认删除${row.supplierName}吗？`,
+    `确认${pageType}${row.supplierName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -146,17 +140,43 @@
     },
   )
     .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
+      if (pageType === '删除') {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+      else {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '取消成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
+  }
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    applyShow.value = true
+  }
+  else {
+    handleDelete(row, pageType)
+  }
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -167,9 +187,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    approvalStatus: '',
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: '1',
+    supplierName: '',
+    supplierNo: '',
     offset: 1,
     limit: 20,
   }
@@ -243,6 +268,16 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
 watch(() => show.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -325,19 +360,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
index eb506ec..6527f2e 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="maintenanceAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -7,21 +7,34 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -33,109 +46,11 @@
   constructionStandardUnitName: '',
   contactInfo: '',
   createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
-  managerStateName: '',
-  measureMajor: null,
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: null,
-  standardLaboratoryName: '',
-  standardLevel: null,
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: null,
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: null,
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
-  createTime: '',
-  director: '',
-  meterMajor: '',
-  organizeName: '',
-  organizeNo: '',
-  organizeType: '2',
-  pdeptId: null,
-  offset: 1,
-  limit: 999999,
-}).then((res) => {
-  standardUsersDeptList.value = res.data.rows
-})
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
-  }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
-}
 // 数据
 const list = ref<object[]>([
   { name: '王五' },
 ])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -233,37 +148,17 @@
 ])
 // 标准配套设备更换表格分页
 const changePage = () => {}
-getStandardOwnerOptions()
 // 添加表格数据对象
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
-// 关闭
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
@@ -317,19 +212,9 @@
   phone: string
   director: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: object) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
-// 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
-}
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -338,7 +223,7 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 
@@ -372,13 +257,13 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 标准配套设备更换表格删除行
 const removeRow = () => {
@@ -407,11 +292,6 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -424,24 +304,23 @@
   }
   applyListClose()
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
 </script>
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        基本信息
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
+      <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -452,53 +331,17 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="标准代码:">
-              <el-input
-                v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
-                placeholder="标准名称"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目编号:" prop="projectNo">
-              <el-input
-                v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="组织机构代码:" prop="organizeNo">
-              <el-input
-                v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item
               label="建标单位名称:"
               prop="constructionStandardUnitName"
@@ -506,198 +349,27 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                placeholder="标准负责人"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="类 别:" prop="category">
-              <el-select
-                v-model="formInline.category"
-                clearable
-                placeholder="类别"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in checkTypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准等级:" prop="standardLevel">
-              <el-select
-                v-model.trim="formInline.standardLevel"
-                clearable
-                placeholder="标准等级"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardLevelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传递范围:" prop="transmitRange">
-              <el-select
-                v-model.trim="formInline.transmitRange"
-                clearable
-                placeholder="传递范围"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in transmitRangeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="投资总额:">
-              <el-input
-                v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="筹建日期:" prop="preparationDate">
-              <el-date-picker
-                v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准所在实验室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                placeholder="标准所在实验室"
-                size="default"
-                :disabled="buttonType === '查看'"
-                @clear="clearDeptList"
-              >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实验室负责人:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系方式:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="管理状态:" prop="managerState">
-              <el-select
-                v-model.trim="formInline.managerState"
-                clearable
-                placeholder="管理状态"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业:" prop="measureMajor">
-              <el-select
-                v-model.trim="formInline.measureMajor"
-                clearable
-                placeholder="计量专业"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in measureMajorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -709,54 +381,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="不确定度:" prop="uncertainty">
-              <el-input
-                v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="测量范围:" prop="mesureRange">
-              <el-input
-                v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <el-form-item label="环境条件" />
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
-              <el-input
-                v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
-              <el-input
-                v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -774,23 +399,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                placeholder="证书编号"
-                size="default"
-                disabled
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发证单位:">
               <el-input placeholder="发证单位" disabled />
             </el-form-item>
@@ -820,7 +428,7 @@
                 :on-change="handleFileChange"
                 :limit="1"
               >
-                <el-button :disabled="buttonType === '查看'">
+                <el-button :disabled="pageType === 'detail'">
                   上传
                 </el-button>
               </el-upload>
@@ -834,53 +442,53 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            批量选择
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+    </detail-page>
+    <div class="header">
+      <div class="title">
+        标准配套设备更换
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        申请文档
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          审批流程
-        </div>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        审批流程
       </div>
     </div>
   </app-container>
@@ -888,7 +496,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -909,69 +517,74 @@
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
-    :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
+    width="50%"
+    :before-close="handleClose"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
-      <el-button type="info" @click="applyListClose">
+      <el-button type="info" @click="handleClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 2b8bef4..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index bbaaa1f..2792a21 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -115,7 +115,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e9ff0ce..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
@@ -58,6 +58,7 @@
     text: '标准所在部门',
     value: 'standardLaboratoryName',
     align: 'center',
+    width: '180',
   },
   {
     text: '负责人',
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index 24f12ed..207c39f 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -2,9 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import type { IlistType, IlistTypes } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -19,21 +19,28 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: '0',
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: '1',
+  supplierName: '',
+  supplierNo: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
 const list = ref([
-  { name: '张三' },
+  { name: '张三', id: '12' },
 ])
 // 总数
 const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
 // 表头
 const columns = ref([
   {
@@ -104,12 +111,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getSoucreList(listQuery.value).then((response) => {
+  getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
 }
+// fetchData(true)
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -119,25 +127,11 @@
   id: string
   supplierName: string
 }
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   buttonArray.value = value === '编辑' ? ['提交'] : ['同意', '驳回', '拒绝']
-//   buttonType.value = value
-//   infoId.value = row.id
-//   show.value = false
-// }
 const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-}
-// 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+// 点击删除或者取消
+const handleDelete = (row: rowReturn, pageType: string) => {
   ElMessageBox.confirm(
-    `确认删除${row.supplierName}吗？`,
+    `确认${pageType}${row.supplierName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -146,17 +140,43 @@
     },
   )
     .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
+      if (pageType === '删除') {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+      else {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '取消成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
+  }
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    applyShow.value = true
+  }
+  else {
+    handleDelete(row, pageType)
+  }
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -167,9 +187,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    approvalStatus: '',
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: '1',
+    supplierName: '',
+    supplierNo: '',
     offset: 1,
     limit: 20,
   }
@@ -243,6 +268,16 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
 watch(() => show.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -325,19 +360,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
index f3eae25..289b3e4 100644
--- a/src/views/measure/source/components/listPageAdd.vue
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -3,7 +3,9 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IformInline, traceSupplierPerson } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -67,6 +69,7 @@
   traceSupplierPersonList: [],
 })
 const ruleFormRef = ref<FormInstance>()
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -74,6 +77,8 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
+// 控制审批弹窗开关
+const applyShow = ref(false)
 const rules = ref({
   supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
   supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
@@ -96,7 +101,6 @@
   phone: '',
 })
 const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -159,18 +163,38 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
-  dialogVisible.value = true
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
+  }
 }
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 删除行
 const deleteList = () => {
@@ -180,6 +204,7 @@
 }
 // 点击提交/导出按钮
 const getAddList = async (formEl: FormInstance | undefined, type: string) => {
+  console.log('6666')
   if (type === '提交' && pageType.value === 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -211,65 +236,52 @@
     })
   }
   else {
-    const params = {
-      businessContent: formInline.value.businessContent,
-      supplierName: formInline.value.supplierName,
-      supplierNo: formInline.value.supplierNo,
-    }
-    getSoucreLisListExport(params).then((res) => {
-      exportFile(res.data, '溯源供方详情')
+    applyShow.value = true
+  }
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
     })
   }
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const upload = () => {
+  fileRef.value.click()
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
 }
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
   }
 }
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
 if (pageType.value !== 'add') {
   getInfo()
 }
@@ -279,7 +291,7 @@
   <app-container>
     <detail-page :title="`培训计划审批-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, pageType === 'detail' ? '导出' : '提交')">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -300,9 +312,9 @@
               <el-input
                 v-model="formInline.supplierNo"
                 :placeholder="
-                  buttonType === '详情' ? '无' : '请输入溯源供方编号'
+                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
                 "
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -310,8 +322,8 @@
             <el-form-item label="税号:" prop="taxNumber">
               <el-input
                 v-model="formInline.taxNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入税号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -319,8 +331,8 @@
             <el-form-item label="邮编:">
               <el-input
                 v-model="formInline.postalCode"
-                :placeholder="buttonType === '详情' ? '无' : '请输入邮编'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -328,8 +340,8 @@
             <el-form-item label="手机:">
               <el-input
                 v-model="formInline.mobile"
-                :placeholder="buttonType === '详情' ? '无' : '请输入手机'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -339,8 +351,8 @@
             <el-form-item label="公司名称:" prop="supplierName">
               <el-input
                 v-model="formInline.supplierName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -348,8 +360,8 @@
             <el-form-item label="银行账户名:">
               <el-input
                 v-model="formInline.bankAccount"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -357,8 +369,8 @@
             <el-form-item label="负责人:">
               <el-input
                 v-model="formInline.director"
-                :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -366,8 +378,8 @@
             <el-form-item label="邮箱:">
               <el-input
                 v-model="formInline.mailbox"
-                :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -377,8 +389,8 @@
             <el-form-item label="公司简称:">
               <el-input
                 v-model="formInline.briefName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -386,8 +398,8 @@
             <el-form-item label="银行名称:">
               <el-input
                 v-model="formInline.bankName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -395,8 +407,8 @@
             <el-form-item label="电话:">
               <el-input
                 v-model="formInline.phone"
-                :placeholder="buttonType === '详情' ? '无' : '请输入电话'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -404,8 +416,8 @@
             <el-form-item label="网址:">
               <el-input
                 v-model="formInline.website"
-                :placeholder="buttonType === '详情' ? '无' : '请输入网址'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -415,8 +427,8 @@
             <el-form-item label="业务内容:" prop="businessContent">
               <el-input
                 v-model="formInline.businessContent"
-                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -424,8 +436,8 @@
             <el-form-item label="银行账号:">
               <el-input
                 v-model="formInline.bankAccountNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -433,8 +445,8 @@
             <el-form-item label="传真:">
               <el-input
                 v-model="formInline.fax"
-                :placeholder="buttonType === '详情' ? '无' : '请输入传真'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -445,7 +457,7 @@
               <el-select
                 v-model="formInline.companyCountry"
                 placeholder="国别"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option label="中国" value="中国" />
               </el-select>
@@ -454,7 +466,7 @@
               <el-select
                 v-model="formInline.companyProvince"
                 placeholder="省"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @click="getCompanyAddress('0')"
                 @change="changeProvince"
               >
@@ -470,7 +482,7 @@
               <el-select
                 v-model="formInline.companyCity"
                 placeholder="市"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @change="cityChange"
               >
                 <el-option
@@ -485,7 +497,7 @@
               <el-select
                 v-model="formInline.companyArea"
                 placeholder="区/县"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option
                   v-for="area in areaList"
@@ -499,7 +511,7 @@
               <el-input
                 v-model="formInline.companyAddress"
                 placeholder="公司详细地址"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-col>
           </el-form-item>
@@ -510,7 +522,7 @@
               <el-select
                 v-model="formInline.invoiceCountry"
                 placeholder="国别"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option label="中国" value="中国" />
               </el-select>
@@ -519,7 +531,7 @@
               <el-select
                 v-model="formInline.invoiceProvince"
                 placeholder="省"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @click="getinvoiceProvinceList('0')"
                 @change="changeInvoice"
               >
@@ -535,7 +547,7 @@
               <el-select
                 v-model="formInline.invoiceCity"
                 placeholder="市"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @change="invoiceCityChange"
               >
                 <el-option
@@ -550,7 +562,7 @@
               <el-select
                 v-model="formInline.invoiceArea"
                 placeholder="区/县"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option
                   v-for="area in areaInvoiceList"
@@ -564,7 +576,7 @@
               <el-input
                 v-model="formInline.invoiceAddress"
                 placeholder="开票详细地址"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-col>
           </el-form-item>
@@ -575,9 +587,9 @@
               <el-input
                 v-model="formInline.businessScope"
                 :placeholder="
-                  buttonType === '详情' ? '无' : '请输入公司业务范围'
+                  pageType === 'detail' ? '无' : '请输入公司业务范围'
                 "
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -587,8 +599,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>
@@ -596,63 +608,53 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button type="primary" :disabled="buttonType === '详情'">
-                  上传
-                </el-button>
-              </el-upload>
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
+              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
+        <el-button type="primary" @click="addRoow">
           增加行
         </el-button>
       </template>
-      <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
+      <el-table
+        :data="traceSupplierPersonList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
+      >
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
   </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
-        <el-input v-model="addPersonList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
index eb506ec..6527f2e 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="maintenanceAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -7,21 +7,34 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -33,109 +46,11 @@
   constructionStandardUnitName: '',
   contactInfo: '',
   createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
-  managerStateName: '',
-  measureMajor: null,
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: null,
-  standardLaboratoryName: '',
-  standardLevel: null,
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: null,
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: null,
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
-  createTime: '',
-  director: '',
-  meterMajor: '',
-  organizeName: '',
-  organizeNo: '',
-  organizeType: '2',
-  pdeptId: null,
-  offset: 1,
-  limit: 999999,
-}).then((res) => {
-  standardUsersDeptList.value = res.data.rows
-})
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
-  }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
-}
 // 数据
 const list = ref<object[]>([
   { name: '王五' },
 ])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -233,37 +148,17 @@
 ])
 // 标准配套设备更换表格分页
 const changePage = () => {}
-getStandardOwnerOptions()
 // 添加表格数据对象
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
-// 关闭
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
@@ -317,19 +212,9 @@
   phone: string
   director: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: object) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
-// 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
-}
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -338,7 +223,7 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 
@@ -372,13 +257,13 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 标准配套设备更换表格删除行
 const removeRow = () => {
@@ -407,11 +292,6 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -424,24 +304,23 @@
   }
   applyListClose()
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
 </script>
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        基本信息
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
+      <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -452,53 +331,17 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="标准代码:">
-              <el-input
-                v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
-                placeholder="标准名称"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目编号:" prop="projectNo">
-              <el-input
-                v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="组织机构代码:" prop="organizeNo">
-              <el-input
-                v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item
               label="建标单位名称:"
               prop="constructionStandardUnitName"
@@ -506,198 +349,27 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                placeholder="标准负责人"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="类 别:" prop="category">
-              <el-select
-                v-model="formInline.category"
-                clearable
-                placeholder="类别"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in checkTypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准等级:" prop="standardLevel">
-              <el-select
-                v-model.trim="formInline.standardLevel"
-                clearable
-                placeholder="标准等级"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardLevelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传递范围:" prop="transmitRange">
-              <el-select
-                v-model.trim="formInline.transmitRange"
-                clearable
-                placeholder="传递范围"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in transmitRangeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="投资总额:">
-              <el-input
-                v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="筹建日期:" prop="preparationDate">
-              <el-date-picker
-                v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准所在实验室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                placeholder="标准所在实验室"
-                size="default"
-                :disabled="buttonType === '查看'"
-                @clear="clearDeptList"
-              >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实验室负责人:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系方式:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="管理状态:" prop="managerState">
-              <el-select
-                v-model.trim="formInline.managerState"
-                clearable
-                placeholder="管理状态"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业:" prop="measureMajor">
-              <el-select
-                v-model.trim="formInline.measureMajor"
-                clearable
-                placeholder="计量专业"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in measureMajorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -709,54 +381,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="不确定度:" prop="uncertainty">
-              <el-input
-                v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="测量范围:" prop="mesureRange">
-              <el-input
-                v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <el-form-item label="环境条件" />
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
-              <el-input
-                v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
-              <el-input
-                v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -774,23 +399,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                placeholder="证书编号"
-                size="default"
-                disabled
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发证单位:">
               <el-input placeholder="发证单位" disabled />
             </el-form-item>
@@ -820,7 +428,7 @@
                 :on-change="handleFileChange"
                 :limit="1"
               >
-                <el-button :disabled="buttonType === '查看'">
+                <el-button :disabled="pageType === 'detail'">
                   上传
                 </el-button>
               </el-upload>
@@ -834,53 +442,53 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            批量选择
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+    </detail-page>
+    <div class="header">
+      <div class="title">
+        标准配套设备更换
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        申请文档
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          审批流程
-        </div>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        审批流程
       </div>
     </div>
   </app-container>
@@ -888,7 +496,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -909,69 +517,74 @@
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
-    :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
+    width="50%"
+    :before-close="handleClose"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
-      <el-button type="info" @click="applyListClose">
+      <el-button type="info" @click="handleClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 2b8bef4..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index bbaaa1f..2792a21 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -115,7 +115,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e9ff0ce..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
@@ -58,6 +58,7 @@
     text: '标准所在部门',
     value: 'standardLaboratoryName',
     align: 'center',
+    width: '180',
   },
   {
     text: '负责人',
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index 24f12ed..207c39f 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -2,9 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import type { IlistType, IlistTypes } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -19,21 +19,28 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: '0',
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: '1',
+  supplierName: '',
+  supplierNo: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
 const list = ref([
-  { name: '张三' },
+  { name: '张三', id: '12' },
 ])
 // 总数
 const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
 // 表头
 const columns = ref([
   {
@@ -104,12 +111,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getSoucreList(listQuery.value).then((response) => {
+  getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
 }
+// fetchData(true)
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -119,25 +127,11 @@
   id: string
   supplierName: string
 }
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   buttonArray.value = value === '编辑' ? ['提交'] : ['同意', '驳回', '拒绝']
-//   buttonType.value = value
-//   infoId.value = row.id
-//   show.value = false
-// }
 const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-}
-// 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+// 点击删除或者取消
+const handleDelete = (row: rowReturn, pageType: string) => {
   ElMessageBox.confirm(
-    `确认删除${row.supplierName}吗？`,
+    `确认${pageType}${row.supplierName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -146,17 +140,43 @@
     },
   )
     .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
+      if (pageType === '删除') {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+      else {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '取消成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
+  }
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    applyShow.value = true
+  }
+  else {
+    handleDelete(row, pageType)
+  }
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -167,9 +187,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    approvalStatus: '',
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: '1',
+    supplierName: '',
+    supplierNo: '',
     offset: 1,
     limit: 20,
   }
@@ -243,6 +268,16 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
 watch(() => show.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -325,19 +360,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
index f3eae25..289b3e4 100644
--- a/src/views/measure/source/components/listPageAdd.vue
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -3,7 +3,9 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IformInline, traceSupplierPerson } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -67,6 +69,7 @@
   traceSupplierPersonList: [],
 })
 const ruleFormRef = ref<FormInstance>()
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -74,6 +77,8 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
+// 控制审批弹窗开关
+const applyShow = ref(false)
 const rules = ref({
   supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
   supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
@@ -96,7 +101,6 @@
   phone: '',
 })
 const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -159,18 +163,38 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
-  dialogVisible.value = true
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
+  }
 }
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 删除行
 const deleteList = () => {
@@ -180,6 +204,7 @@
 }
 // 点击提交/导出按钮
 const getAddList = async (formEl: FormInstance | undefined, type: string) => {
+  console.log('6666')
   if (type === '提交' && pageType.value === 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -211,65 +236,52 @@
     })
   }
   else {
-    const params = {
-      businessContent: formInline.value.businessContent,
-      supplierName: formInline.value.supplierName,
-      supplierNo: formInline.value.supplierNo,
-    }
-    getSoucreLisListExport(params).then((res) => {
-      exportFile(res.data, '溯源供方详情')
+    applyShow.value = true
+  }
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
     })
   }
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const upload = () => {
+  fileRef.value.click()
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
 }
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
   }
 }
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
 if (pageType.value !== 'add') {
   getInfo()
 }
@@ -279,7 +291,7 @@
   <app-container>
     <detail-page :title="`培训计划审批-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, pageType === 'detail' ? '导出' : '提交')">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -300,9 +312,9 @@
               <el-input
                 v-model="formInline.supplierNo"
                 :placeholder="
-                  buttonType === '详情' ? '无' : '请输入溯源供方编号'
+                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
                 "
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -310,8 +322,8 @@
             <el-form-item label="税号:" prop="taxNumber">
               <el-input
                 v-model="formInline.taxNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入税号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -319,8 +331,8 @@
             <el-form-item label="邮编:">
               <el-input
                 v-model="formInline.postalCode"
-                :placeholder="buttonType === '详情' ? '无' : '请输入邮编'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -328,8 +340,8 @@
             <el-form-item label="手机:">
               <el-input
                 v-model="formInline.mobile"
-                :placeholder="buttonType === '详情' ? '无' : '请输入手机'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -339,8 +351,8 @@
             <el-form-item label="公司名称:" prop="supplierName">
               <el-input
                 v-model="formInline.supplierName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -348,8 +360,8 @@
             <el-form-item label="银行账户名:">
               <el-input
                 v-model="formInline.bankAccount"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -357,8 +369,8 @@
             <el-form-item label="负责人:">
               <el-input
                 v-model="formInline.director"
-                :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -366,8 +378,8 @@
             <el-form-item label="邮箱:">
               <el-input
                 v-model="formInline.mailbox"
-                :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -377,8 +389,8 @@
             <el-form-item label="公司简称:">
               <el-input
                 v-model="formInline.briefName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -386,8 +398,8 @@
             <el-form-item label="银行名称:">
               <el-input
                 v-model="formInline.bankName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -395,8 +407,8 @@
             <el-form-item label="电话:">
               <el-input
                 v-model="formInline.phone"
-                :placeholder="buttonType === '详情' ? '无' : '请输入电话'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -404,8 +416,8 @@
             <el-form-item label="网址:">
               <el-input
                 v-model="formInline.website"
-                :placeholder="buttonType === '详情' ? '无' : '请输入网址'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -415,8 +427,8 @@
             <el-form-item label="业务内容:" prop="businessContent">
               <el-input
                 v-model="formInline.businessContent"
-                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -424,8 +436,8 @@
             <el-form-item label="银行账号:">
               <el-input
                 v-model="formInline.bankAccountNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -433,8 +445,8 @@
             <el-form-item label="传真:">
               <el-input
                 v-model="formInline.fax"
-                :placeholder="buttonType === '详情' ? '无' : '请输入传真'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -445,7 +457,7 @@
               <el-select
                 v-model="formInline.companyCountry"
                 placeholder="国别"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option label="中国" value="中国" />
               </el-select>
@@ -454,7 +466,7 @@
               <el-select
                 v-model="formInline.companyProvince"
                 placeholder="省"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @click="getCompanyAddress('0')"
                 @change="changeProvince"
               >
@@ -470,7 +482,7 @@
               <el-select
                 v-model="formInline.companyCity"
                 placeholder="市"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @change="cityChange"
               >
                 <el-option
@@ -485,7 +497,7 @@
               <el-select
                 v-model="formInline.companyArea"
                 placeholder="区/县"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option
                   v-for="area in areaList"
@@ -499,7 +511,7 @@
               <el-input
                 v-model="formInline.companyAddress"
                 placeholder="公司详细地址"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-col>
           </el-form-item>
@@ -510,7 +522,7 @@
               <el-select
                 v-model="formInline.invoiceCountry"
                 placeholder="国别"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option label="中国" value="中国" />
               </el-select>
@@ -519,7 +531,7 @@
               <el-select
                 v-model="formInline.invoiceProvince"
                 placeholder="省"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @click="getinvoiceProvinceList('0')"
                 @change="changeInvoice"
               >
@@ -535,7 +547,7 @@
               <el-select
                 v-model="formInline.invoiceCity"
                 placeholder="市"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @change="invoiceCityChange"
               >
                 <el-option
@@ -550,7 +562,7 @@
               <el-select
                 v-model="formInline.invoiceArea"
                 placeholder="区/县"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option
                   v-for="area in areaInvoiceList"
@@ -564,7 +576,7 @@
               <el-input
                 v-model="formInline.invoiceAddress"
                 placeholder="开票详细地址"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-col>
           </el-form-item>
@@ -575,9 +587,9 @@
               <el-input
                 v-model="formInline.businessScope"
                 :placeholder="
-                  buttonType === '详情' ? '无' : '请输入公司业务范围'
+                  pageType === 'detail' ? '无' : '请输入公司业务范围'
                 "
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -587,8 +599,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>
@@ -596,63 +608,53 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button type="primary" :disabled="buttonType === '详情'">
-                  上传
-                </el-button>
-              </el-upload>
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
+              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
+        <el-button type="primary" @click="addRoow">
           增加行
         </el-button>
       </template>
-      <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
+      <el-table
+        :data="traceSupplierPersonList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
+      >
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
   </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
-        <el-input v-model="addPersonList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/source/components/manageBox.vue b/src/views/measure/source/components/manageBox.vue
new file mode 100644
index 0000000..c5ced8f
--- /dev/null
+++ b/src/views/measure/source/components/manageBox.vue
@@ -0,0 +1,99 @@
+<script lang="ts" setup name="Manage-Box">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+const props = defineProps({
+  applyShow: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
+interface IapplyList {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+const applyList: Ref<IapplyList> = ref({})
+const handleClose = () => {
+  emit('handleClose')
+}
+const applyListSubmit = () => {
+  emit('applyListSubmit', applyList.value)
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="props.applyShow"
+    title="审批操作"
+    width="50%"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="applyList"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" @click="applyListSubmit">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
index eb506ec..6527f2e 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="maintenanceAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -7,21 +7,34 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -33,109 +46,11 @@
   constructionStandardUnitName: '',
   contactInfo: '',
   createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
-  managerStateName: '',
-  measureMajor: null,
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: null,
-  standardLaboratoryName: '',
-  standardLevel: null,
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: null,
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: null,
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
-  createTime: '',
-  director: '',
-  meterMajor: '',
-  organizeName: '',
-  organizeNo: '',
-  organizeType: '2',
-  pdeptId: null,
-  offset: 1,
-  limit: 999999,
-}).then((res) => {
-  standardUsersDeptList.value = res.data.rows
-})
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
-  }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
-}
 // 数据
 const list = ref<object[]>([
   { name: '王五' },
 ])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -233,37 +148,17 @@
 ])
 // 标准配套设备更换表格分页
 const changePage = () => {}
-getStandardOwnerOptions()
 // 添加表格数据对象
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
-// 关闭
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
@@ -317,19 +212,9 @@
   phone: string
   director: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: object) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
-// 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
-}
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -338,7 +223,7 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 
@@ -372,13 +257,13 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 标准配套设备更换表格删除行
 const removeRow = () => {
@@ -407,11 +292,6 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -424,24 +304,23 @@
   }
   applyListClose()
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
 </script>
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        基本信息
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
+      <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -452,53 +331,17 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="标准代码:">
-              <el-input
-                v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
-                placeholder="标准名称"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目编号:" prop="projectNo">
-              <el-input
-                v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="组织机构代码:" prop="organizeNo">
-              <el-input
-                v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item
               label="建标单位名称:"
               prop="constructionStandardUnitName"
@@ -506,198 +349,27 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                placeholder="标准负责人"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="类 别:" prop="category">
-              <el-select
-                v-model="formInline.category"
-                clearable
-                placeholder="类别"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in checkTypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准等级:" prop="standardLevel">
-              <el-select
-                v-model.trim="formInline.standardLevel"
-                clearable
-                placeholder="标准等级"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardLevelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传递范围:" prop="transmitRange">
-              <el-select
-                v-model.trim="formInline.transmitRange"
-                clearable
-                placeholder="传递范围"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in transmitRangeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="投资总额:">
-              <el-input
-                v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="筹建日期:" prop="preparationDate">
-              <el-date-picker
-                v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准所在实验室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                placeholder="标准所在实验室"
-                size="default"
-                :disabled="buttonType === '查看'"
-                @clear="clearDeptList"
-              >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实验室负责人:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系方式:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="管理状态:" prop="managerState">
-              <el-select
-                v-model.trim="formInline.managerState"
-                clearable
-                placeholder="管理状态"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业:" prop="measureMajor">
-              <el-select
-                v-model.trim="formInline.measureMajor"
-                clearable
-                placeholder="计量专业"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in measureMajorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -709,54 +381,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="不确定度:" prop="uncertainty">
-              <el-input
-                v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="测量范围:" prop="mesureRange">
-              <el-input
-                v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <el-form-item label="环境条件" />
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
-              <el-input
-                v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
-              <el-input
-                v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -774,23 +399,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                placeholder="证书编号"
-                size="default"
-                disabled
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发证单位:">
               <el-input placeholder="发证单位" disabled />
             </el-form-item>
@@ -820,7 +428,7 @@
                 :on-change="handleFileChange"
                 :limit="1"
               >
-                <el-button :disabled="buttonType === '查看'">
+                <el-button :disabled="pageType === 'detail'">
                   上传
                 </el-button>
               </el-upload>
@@ -834,53 +442,53 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            批量选择
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+    </detail-page>
+    <div class="header">
+      <div class="title">
+        标准配套设备更换
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        申请文档
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          审批流程
-        </div>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        审批流程
       </div>
     </div>
   </app-container>
@@ -888,7 +496,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -909,69 +517,74 @@
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
-    :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
+    width="50%"
+    :before-close="handleClose"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
-      <el-button type="info" @click="applyListClose">
+      <el-button type="info" @click="handleClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 2b8bef4..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index bbaaa1f..2792a21 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -115,7 +115,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e9ff0ce..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
@@ -58,6 +58,7 @@
     text: '标准所在部门',
     value: 'standardLaboratoryName',
     align: 'center',
+    width: '180',
   },
   {
     text: '负责人',
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index 24f12ed..207c39f 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -2,9 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import type { IlistType, IlistTypes } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -19,21 +19,28 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: '0',
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: '1',
+  supplierName: '',
+  supplierNo: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
 const list = ref([
-  { name: '张三' },
+  { name: '张三', id: '12' },
 ])
 // 总数
 const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
 // 表头
 const columns = ref([
   {
@@ -104,12 +111,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getSoucreList(listQuery.value).then((response) => {
+  getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
 }
+// fetchData(true)
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -119,25 +127,11 @@
   id: string
   supplierName: string
 }
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   buttonArray.value = value === '编辑' ? ['提交'] : ['同意', '驳回', '拒绝']
-//   buttonType.value = value
-//   infoId.value = row.id
-//   show.value = false
-// }
 const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-}
-// 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+// 点击删除或者取消
+const handleDelete = (row: rowReturn, pageType: string) => {
   ElMessageBox.confirm(
-    `确认删除${row.supplierName}吗？`,
+    `确认${pageType}${row.supplierName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -146,17 +140,43 @@
     },
   )
     .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
+      if (pageType === '删除') {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+      else {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '取消成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
+  }
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    applyShow.value = true
+  }
+  else {
+    handleDelete(row, pageType)
+  }
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -167,9 +187,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    approvalStatus: '',
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: '1',
+    supplierName: '',
+    supplierNo: '',
     offset: 1,
     limit: 20,
   }
@@ -243,6 +268,16 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
 watch(() => show.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -325,19 +360,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
index f3eae25..289b3e4 100644
--- a/src/views/measure/source/components/listPageAdd.vue
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -3,7 +3,9 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IformInline, traceSupplierPerson } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -67,6 +69,7 @@
   traceSupplierPersonList: [],
 })
 const ruleFormRef = ref<FormInstance>()
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -74,6 +77,8 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
+// 控制审批弹窗开关
+const applyShow = ref(false)
 const rules = ref({
   supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
   supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
@@ -96,7 +101,6 @@
   phone: '',
 })
 const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -159,18 +163,38 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
-  dialogVisible.value = true
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
+  }
 }
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 删除行
 const deleteList = () => {
@@ -180,6 +204,7 @@
 }
 // 点击提交/导出按钮
 const getAddList = async (formEl: FormInstance | undefined, type: string) => {
+  console.log('6666')
   if (type === '提交' && pageType.value === 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -211,65 +236,52 @@
     })
   }
   else {
-    const params = {
-      businessContent: formInline.value.businessContent,
-      supplierName: formInline.value.supplierName,
-      supplierNo: formInline.value.supplierNo,
-    }
-    getSoucreLisListExport(params).then((res) => {
-      exportFile(res.data, '溯源供方详情')
+    applyShow.value = true
+  }
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
     })
   }
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const upload = () => {
+  fileRef.value.click()
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
 }
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
   }
 }
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
 if (pageType.value !== 'add') {
   getInfo()
 }
@@ -279,7 +291,7 @@
   <app-container>
     <detail-page :title="`培训计划审批-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, pageType === 'detail' ? '导出' : '提交')">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -300,9 +312,9 @@
               <el-input
                 v-model="formInline.supplierNo"
                 :placeholder="
-                  buttonType === '详情' ? '无' : '请输入溯源供方编号'
+                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
                 "
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -310,8 +322,8 @@
             <el-form-item label="税号:" prop="taxNumber">
               <el-input
                 v-model="formInline.taxNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入税号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -319,8 +331,8 @@
             <el-form-item label="邮编:">
               <el-input
                 v-model="formInline.postalCode"
-                :placeholder="buttonType === '详情' ? '无' : '请输入邮编'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -328,8 +340,8 @@
             <el-form-item label="手机:">
               <el-input
                 v-model="formInline.mobile"
-                :placeholder="buttonType === '详情' ? '无' : '请输入手机'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -339,8 +351,8 @@
             <el-form-item label="公司名称:" prop="supplierName">
               <el-input
                 v-model="formInline.supplierName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -348,8 +360,8 @@
             <el-form-item label="银行账户名:">
               <el-input
                 v-model="formInline.bankAccount"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -357,8 +369,8 @@
             <el-form-item label="负责人:">
               <el-input
                 v-model="formInline.director"
-                :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -366,8 +378,8 @@
             <el-form-item label="邮箱:">
               <el-input
                 v-model="formInline.mailbox"
-                :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -377,8 +389,8 @@
             <el-form-item label="公司简称:">
               <el-input
                 v-model="formInline.briefName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -386,8 +398,8 @@
             <el-form-item label="银行名称:">
               <el-input
                 v-model="formInline.bankName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -395,8 +407,8 @@
             <el-form-item label="电话:">
               <el-input
                 v-model="formInline.phone"
-                :placeholder="buttonType === '详情' ? '无' : '请输入电话'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -404,8 +416,8 @@
             <el-form-item label="网址:">
               <el-input
                 v-model="formInline.website"
-                :placeholder="buttonType === '详情' ? '无' : '请输入网址'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -415,8 +427,8 @@
             <el-form-item label="业务内容:" prop="businessContent">
               <el-input
                 v-model="formInline.businessContent"
-                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -424,8 +436,8 @@
             <el-form-item label="银行账号:">
               <el-input
                 v-model="formInline.bankAccountNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -433,8 +445,8 @@
             <el-form-item label="传真:">
               <el-input
                 v-model="formInline.fax"
-                :placeholder="buttonType === '详情' ? '无' : '请输入传真'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -445,7 +457,7 @@
               <el-select
                 v-model="formInline.companyCountry"
                 placeholder="国别"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option label="中国" value="中国" />
               </el-select>
@@ -454,7 +466,7 @@
               <el-select
                 v-model="formInline.companyProvince"
                 placeholder="省"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @click="getCompanyAddress('0')"
                 @change="changeProvince"
               >
@@ -470,7 +482,7 @@
               <el-select
                 v-model="formInline.companyCity"
                 placeholder="市"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @change="cityChange"
               >
                 <el-option
@@ -485,7 +497,7 @@
               <el-select
                 v-model="formInline.companyArea"
                 placeholder="区/县"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option
                   v-for="area in areaList"
@@ -499,7 +511,7 @@
               <el-input
                 v-model="formInline.companyAddress"
                 placeholder="公司详细地址"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-col>
           </el-form-item>
@@ -510,7 +522,7 @@
               <el-select
                 v-model="formInline.invoiceCountry"
                 placeholder="国别"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option label="中国" value="中国" />
               </el-select>
@@ -519,7 +531,7 @@
               <el-select
                 v-model="formInline.invoiceProvince"
                 placeholder="省"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @click="getinvoiceProvinceList('0')"
                 @change="changeInvoice"
               >
@@ -535,7 +547,7 @@
               <el-select
                 v-model="formInline.invoiceCity"
                 placeholder="市"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @change="invoiceCityChange"
               >
                 <el-option
@@ -550,7 +562,7 @@
               <el-select
                 v-model="formInline.invoiceArea"
                 placeholder="区/县"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option
                   v-for="area in areaInvoiceList"
@@ -564,7 +576,7 @@
               <el-input
                 v-model="formInline.invoiceAddress"
                 placeholder="开票详细地址"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-col>
           </el-form-item>
@@ -575,9 +587,9 @@
               <el-input
                 v-model="formInline.businessScope"
                 :placeholder="
-                  buttonType === '详情' ? '无' : '请输入公司业务范围'
+                  pageType === 'detail' ? '无' : '请输入公司业务范围'
                 "
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -587,8 +599,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>
@@ -596,63 +608,53 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button type="primary" :disabled="buttonType === '详情'">
-                  上传
-                </el-button>
-              </el-upload>
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
+              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
+        <el-button type="primary" @click="addRoow">
           增加行
         </el-button>
       </template>
-      <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
+      <el-table
+        :data="traceSupplierPersonList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
+      >
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
   </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
-        <el-input v-model="addPersonList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/source/components/manageBox.vue b/src/views/measure/source/components/manageBox.vue
new file mode 100644
index 0000000..c5ced8f
--- /dev/null
+++ b/src/views/measure/source/components/manageBox.vue
@@ -0,0 +1,99 @@
+<script lang="ts" setup name="Manage-Box">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+const props = defineProps({
+  applyShow: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
+interface IapplyList {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+const applyList: Ref<IapplyList> = ref({})
+const handleClose = () => {
+  emit('handleClose')
+}
+const applyListSubmit = () => {
+  emit('applyListSubmit', applyList.value)
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="props.applyShow"
+    title="审批操作"
+    width="50%"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="applyList"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" @click="applyListSubmit">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index c057976..5dd7a20 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -70,3 +70,16 @@
   traceSupplierPersonList: traceSupplierPerson []
 }
 
+export interface IlistTypes {
+  approvalStatus: string
+  businessContent: string
+  companyArea: string
+  companyCity: string
+  companyProvince: string
+  formId: string
+  supplierName: string
+  supplierNo: string
+  offset: number
+  limit: number
+}
+

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
index eb506ec..6527f2e 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="maintenanceAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -7,21 +7,34 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -33,109 +46,11 @@
   constructionStandardUnitName: '',
   contactInfo: '',
   createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
-  managerStateName: '',
-  measureMajor: null,
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: null,
-  standardLaboratoryName: '',
-  standardLevel: null,
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: null,
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: null,
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
-  createTime: '',
-  director: '',
-  meterMajor: '',
-  organizeName: '',
-  organizeNo: '',
-  organizeType: '2',
-  pdeptId: null,
-  offset: 1,
-  limit: 999999,
-}).then((res) => {
-  standardUsersDeptList.value = res.data.rows
-})
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
-  }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
-}
 // 数据
 const list = ref<object[]>([
   { name: '王五' },
 ])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -233,37 +148,17 @@
 ])
 // 标准配套设备更换表格分页
 const changePage = () => {}
-getStandardOwnerOptions()
 // 添加表格数据对象
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
-// 关闭
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
@@ -317,19 +212,9 @@
   phone: string
   director: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: object) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
-// 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
-}
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -338,7 +223,7 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 
@@ -372,13 +257,13 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 标准配套设备更换表格删除行
 const removeRow = () => {
@@ -407,11 +292,6 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -424,24 +304,23 @@
   }
   applyListClose()
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
 </script>
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        基本信息
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
+      <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -452,53 +331,17 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="标准代码:">
-              <el-input
-                v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
-                placeholder="标准名称"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目编号:" prop="projectNo">
-              <el-input
-                v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="组织机构代码:" prop="organizeNo">
-              <el-input
-                v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item
               label="建标单位名称:"
               prop="constructionStandardUnitName"
@@ -506,198 +349,27 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                placeholder="标准负责人"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="类 别:" prop="category">
-              <el-select
-                v-model="formInline.category"
-                clearable
-                placeholder="类别"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in checkTypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准等级:" prop="standardLevel">
-              <el-select
-                v-model.trim="formInline.standardLevel"
-                clearable
-                placeholder="标准等级"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardLevelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传递范围:" prop="transmitRange">
-              <el-select
-                v-model.trim="formInline.transmitRange"
-                clearable
-                placeholder="传递范围"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in transmitRangeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="投资总额:">
-              <el-input
-                v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="筹建日期:" prop="preparationDate">
-              <el-date-picker
-                v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准所在实验室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                placeholder="标准所在实验室"
-                size="default"
-                :disabled="buttonType === '查看'"
-                @clear="clearDeptList"
-              >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实验室负责人:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系方式:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="管理状态:" prop="managerState">
-              <el-select
-                v-model.trim="formInline.managerState"
-                clearable
-                placeholder="管理状态"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业:" prop="measureMajor">
-              <el-select
-                v-model.trim="formInline.measureMajor"
-                clearable
-                placeholder="计量专业"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in measureMajorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -709,54 +381,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="不确定度:" prop="uncertainty">
-              <el-input
-                v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="测量范围:" prop="mesureRange">
-              <el-input
-                v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <el-form-item label="环境条件" />
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
-              <el-input
-                v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
-              <el-input
-                v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -774,23 +399,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                placeholder="证书编号"
-                size="default"
-                disabled
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发证单位:">
               <el-input placeholder="发证单位" disabled />
             </el-form-item>
@@ -820,7 +428,7 @@
                 :on-change="handleFileChange"
                 :limit="1"
               >
-                <el-button :disabled="buttonType === '查看'">
+                <el-button :disabled="pageType === 'detail'">
                   上传
                 </el-button>
               </el-upload>
@@ -834,53 +442,53 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            批量选择
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+    </detail-page>
+    <div class="header">
+      <div class="title">
+        标准配套设备更换
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        申请文档
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          审批流程
-        </div>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        审批流程
       </div>
     </div>
   </app-container>
@@ -888,7 +496,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -909,69 +517,74 @@
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
-    :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
+    width="50%"
+    :before-close="handleClose"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
-      <el-button type="info" @click="applyListClose">
+      <el-button type="info" @click="handleClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 2b8bef4..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index bbaaa1f..2792a21 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -115,7 +115,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e9ff0ce..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
@@ -58,6 +58,7 @@
     text: '标准所在部门',
     value: 'standardLaboratoryName',
     align: 'center',
+    width: '180',
   },
   {
     text: '负责人',
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index 24f12ed..207c39f 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -2,9 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import type { IlistType, IlistTypes } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -19,21 +19,28 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: '0',
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: '1',
+  supplierName: '',
+  supplierNo: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
 const list = ref([
-  { name: '张三' },
+  { name: '张三', id: '12' },
 ])
 // 总数
 const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
 // 表头
 const columns = ref([
   {
@@ -104,12 +111,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getSoucreList(listQuery.value).then((response) => {
+  getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
 }
+// fetchData(true)
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -119,25 +127,11 @@
   id: string
   supplierName: string
 }
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   buttonArray.value = value === '编辑' ? ['提交'] : ['同意', '驳回', '拒绝']
-//   buttonType.value = value
-//   infoId.value = row.id
-//   show.value = false
-// }
 const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-}
-// 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+// 点击删除或者取消
+const handleDelete = (row: rowReturn, pageType: string) => {
   ElMessageBox.confirm(
-    `确认删除${row.supplierName}吗？`,
+    `确认${pageType}${row.supplierName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -146,17 +140,43 @@
     },
   )
     .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
+      if (pageType === '删除') {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+      else {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '取消成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
+  }
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    applyShow.value = true
+  }
+  else {
+    handleDelete(row, pageType)
+  }
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -167,9 +187,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    approvalStatus: '',
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: '1',
+    supplierName: '',
+    supplierNo: '',
     offset: 1,
     limit: 20,
   }
@@ -243,6 +268,16 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
 watch(() => show.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -325,19 +360,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
index f3eae25..289b3e4 100644
--- a/src/views/measure/source/components/listPageAdd.vue
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -3,7 +3,9 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IformInline, traceSupplierPerson } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -67,6 +69,7 @@
   traceSupplierPersonList: [],
 })
 const ruleFormRef = ref<FormInstance>()
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -74,6 +77,8 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
+// 控制审批弹窗开关
+const applyShow = ref(false)
 const rules = ref({
   supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
   supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
@@ -96,7 +101,6 @@
   phone: '',
 })
 const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -159,18 +163,38 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
-  dialogVisible.value = true
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
+  }
 }
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 删除行
 const deleteList = () => {
@@ -180,6 +204,7 @@
 }
 // 点击提交/导出按钮
 const getAddList = async (formEl: FormInstance | undefined, type: string) => {
+  console.log('6666')
   if (type === '提交' && pageType.value === 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -211,65 +236,52 @@
     })
   }
   else {
-    const params = {
-      businessContent: formInline.value.businessContent,
-      supplierName: formInline.value.supplierName,
-      supplierNo: formInline.value.supplierNo,
-    }
-    getSoucreLisListExport(params).then((res) => {
-      exportFile(res.data, '溯源供方详情')
+    applyShow.value = true
+  }
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
     })
   }
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const upload = () => {
+  fileRef.value.click()
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
 }
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
   }
 }
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
 if (pageType.value !== 'add') {
   getInfo()
 }
@@ -279,7 +291,7 @@
   <app-container>
     <detail-page :title="`培训计划审批-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, pageType === 'detail' ? '导出' : '提交')">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -300,9 +312,9 @@
               <el-input
                 v-model="formInline.supplierNo"
                 :placeholder="
-                  buttonType === '详情' ? '无' : '请输入溯源供方编号'
+                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
                 "
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -310,8 +322,8 @@
             <el-form-item label="税号:" prop="taxNumber">
               <el-input
                 v-model="formInline.taxNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入税号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -319,8 +331,8 @@
             <el-form-item label="邮编:">
               <el-input
                 v-model="formInline.postalCode"
-                :placeholder="buttonType === '详情' ? '无' : '请输入邮编'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -328,8 +340,8 @@
             <el-form-item label="手机:">
               <el-input
                 v-model="formInline.mobile"
-                :placeholder="buttonType === '详情' ? '无' : '请输入手机'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -339,8 +351,8 @@
             <el-form-item label="公司名称:" prop="supplierName">
               <el-input
                 v-model="formInline.supplierName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -348,8 +360,8 @@
             <el-form-item label="银行账户名:">
               <el-input
                 v-model="formInline.bankAccount"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -357,8 +369,8 @@
             <el-form-item label="负责人:">
               <el-input
                 v-model="formInline.director"
-                :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -366,8 +378,8 @@
             <el-form-item label="邮箱:">
               <el-input
                 v-model="formInline.mailbox"
-                :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -377,8 +389,8 @@
             <el-form-item label="公司简称:">
               <el-input
                 v-model="formInline.briefName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -386,8 +398,8 @@
             <el-form-item label="银行名称:">
               <el-input
                 v-model="formInline.bankName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -395,8 +407,8 @@
             <el-form-item label="电话:">
               <el-input
                 v-model="formInline.phone"
-                :placeholder="buttonType === '详情' ? '无' : '请输入电话'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -404,8 +416,8 @@
             <el-form-item label="网址:">
               <el-input
                 v-model="formInline.website"
-                :placeholder="buttonType === '详情' ? '无' : '请输入网址'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -415,8 +427,8 @@
             <el-form-item label="业务内容:" prop="businessContent">
               <el-input
                 v-model="formInline.businessContent"
-                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -424,8 +436,8 @@
             <el-form-item label="银行账号:">
               <el-input
                 v-model="formInline.bankAccountNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -433,8 +445,8 @@
             <el-form-item label="传真:">
               <el-input
                 v-model="formInline.fax"
-                :placeholder="buttonType === '详情' ? '无' : '请输入传真'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -445,7 +457,7 @@
               <el-select
                 v-model="formInline.companyCountry"
                 placeholder="国别"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option label="中国" value="中国" />
               </el-select>
@@ -454,7 +466,7 @@
               <el-select
                 v-model="formInline.companyProvince"
                 placeholder="省"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @click="getCompanyAddress('0')"
                 @change="changeProvince"
               >
@@ -470,7 +482,7 @@
               <el-select
                 v-model="formInline.companyCity"
                 placeholder="市"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @change="cityChange"
               >
                 <el-option
@@ -485,7 +497,7 @@
               <el-select
                 v-model="formInline.companyArea"
                 placeholder="区/县"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option
                   v-for="area in areaList"
@@ -499,7 +511,7 @@
               <el-input
                 v-model="formInline.companyAddress"
                 placeholder="公司详细地址"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-col>
           </el-form-item>
@@ -510,7 +522,7 @@
               <el-select
                 v-model="formInline.invoiceCountry"
                 placeholder="国别"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option label="中国" value="中国" />
               </el-select>
@@ -519,7 +531,7 @@
               <el-select
                 v-model="formInline.invoiceProvince"
                 placeholder="省"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @click="getinvoiceProvinceList('0')"
                 @change="changeInvoice"
               >
@@ -535,7 +547,7 @@
               <el-select
                 v-model="formInline.invoiceCity"
                 placeholder="市"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @change="invoiceCityChange"
               >
                 <el-option
@@ -550,7 +562,7 @@
               <el-select
                 v-model="formInline.invoiceArea"
                 placeholder="区/县"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option
                   v-for="area in areaInvoiceList"
@@ -564,7 +576,7 @@
               <el-input
                 v-model="formInline.invoiceAddress"
                 placeholder="开票详细地址"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-col>
           </el-form-item>
@@ -575,9 +587,9 @@
               <el-input
                 v-model="formInline.businessScope"
                 :placeholder="
-                  buttonType === '详情' ? '无' : '请输入公司业务范围'
+                  pageType === 'detail' ? '无' : '请输入公司业务范围'
                 "
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -587,8 +599,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>
@@ -596,63 +608,53 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button type="primary" :disabled="buttonType === '详情'">
-                  上传
-                </el-button>
-              </el-upload>
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
+              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
+        <el-button type="primary" @click="addRoow">
           增加行
         </el-button>
       </template>
-      <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
+      <el-table
+        :data="traceSupplierPersonList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
+      >
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
   </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
-        <el-input v-model="addPersonList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/source/components/manageBox.vue b/src/views/measure/source/components/manageBox.vue
new file mode 100644
index 0000000..c5ced8f
--- /dev/null
+++ b/src/views/measure/source/components/manageBox.vue
@@ -0,0 +1,99 @@
+<script lang="ts" setup name="Manage-Box">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+const props = defineProps({
+  applyShow: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
+interface IapplyList {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+const applyList: Ref<IapplyList> = ref({})
+const handleClose = () => {
+  emit('handleClose')
+}
+const applyListSubmit = () => {
+  emit('applyListSubmit', applyList.value)
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="props.applyShow"
+    title="审批操作"
+    width="50%"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="applyList"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" @click="applyListSubmit">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index c057976..5dd7a20 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -70,3 +70,16 @@
   traceSupplierPersonList: traceSupplierPerson []
 }
 
+export interface IlistTypes {
+  approvalStatus: string
+  businessContent: string
+  companyArea: string
+  companyCity: string
+  companyProvince: string
+  formId: string
+  supplierName: string
+  supplierNo: string
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
index ba7e19c..492e92a 100644
--- a/src/views/measure/train/components/listPage.vue
+++ b/src/views/measure/train/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistType } from '../list_interface'
-import ListPageAdd from './listPageAdd.vue'
+import ManageBox from './manageBox.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { getDeptTree } from '@/api/system/plan'
 import { uploadApi } from '@/api/system/notice'
@@ -27,6 +27,8 @@
   offset: 1,
   limit: 10,
 })
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -147,30 +149,10 @@
 }
 // 初始化路由
 const $router = useRouter()
-const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-}
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: rowReturn, pageType: string) => {
   ElMessageBox.confirm(
-    `确认删除${row.supplierName}吗？`,
+    `确认${pageType}${row.supplierName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -190,6 +172,33 @@
       })
     })
 }
+const pageTypeMap = ref('')
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
+  }
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    applyShow.value = true
+  }
+  else {
+    handleDelete(row, pageType)
+  }
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+
 // 点击搜索
 const searchList = () => {
   // fetchData(true)
@@ -212,6 +221,15 @@
   show.value = true
   // fetchData(true)
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -380,14 +398,7 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-page-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
index eb506ec..6527f2e 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="maintenanceAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -7,21 +7,34 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -33,109 +46,11 @@
   constructionStandardUnitName: '',
   contactInfo: '',
   createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
-  managerStateName: '',
-  measureMajor: null,
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: null,
-  standardLaboratoryName: '',
-  standardLevel: null,
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: null,
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: null,
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
-  createTime: '',
-  director: '',
-  meterMajor: '',
-  organizeName: '',
-  organizeNo: '',
-  organizeType: '2',
-  pdeptId: null,
-  offset: 1,
-  limit: 999999,
-}).then((res) => {
-  standardUsersDeptList.value = res.data.rows
-})
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
-  }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
-}
 // 数据
 const list = ref<object[]>([
   { name: '王五' },
 ])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -233,37 +148,17 @@
 ])
 // 标准配套设备更换表格分页
 const changePage = () => {}
-getStandardOwnerOptions()
 // 添加表格数据对象
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
-// 关闭
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
@@ -317,19 +212,9 @@
   phone: string
   director: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: object) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
-// 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
-}
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -338,7 +223,7 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 
@@ -372,13 +257,13 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 标准配套设备更换表格删除行
 const removeRow = () => {
@@ -407,11 +292,6 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -424,24 +304,23 @@
   }
   applyListClose()
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
 </script>
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        基本信息
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
+      <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -452,53 +331,17 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="标准代码:">
-              <el-input
-                v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
-                placeholder="标准名称"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目编号:" prop="projectNo">
-              <el-input
-                v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="组织机构代码:" prop="organizeNo">
-              <el-input
-                v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item
               label="建标单位名称:"
               prop="constructionStandardUnitName"
@@ -506,198 +349,27 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                placeholder="标准负责人"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="类 别:" prop="category">
-              <el-select
-                v-model="formInline.category"
-                clearable
-                placeholder="类别"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in checkTypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准等级:" prop="standardLevel">
-              <el-select
-                v-model.trim="formInline.standardLevel"
-                clearable
-                placeholder="标准等级"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardLevelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传递范围:" prop="transmitRange">
-              <el-select
-                v-model.trim="formInline.transmitRange"
-                clearable
-                placeholder="传递范围"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in transmitRangeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="投资总额:">
-              <el-input
-                v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="筹建日期:" prop="preparationDate">
-              <el-date-picker
-                v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准所在实验室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                placeholder="标准所在实验室"
-                size="default"
-                :disabled="buttonType === '查看'"
-                @clear="clearDeptList"
-              >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实验室负责人:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系方式:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="管理状态:" prop="managerState">
-              <el-select
-                v-model.trim="formInline.managerState"
-                clearable
-                placeholder="管理状态"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业:" prop="measureMajor">
-              <el-select
-                v-model.trim="formInline.measureMajor"
-                clearable
-                placeholder="计量专业"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in measureMajorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -709,54 +381,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="不确定度:" prop="uncertainty">
-              <el-input
-                v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="测量范围:" prop="mesureRange">
-              <el-input
-                v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <el-form-item label="环境条件" />
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
-              <el-input
-                v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
-              <el-input
-                v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -774,23 +399,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                placeholder="证书编号"
-                size="default"
-                disabled
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发证单位:">
               <el-input placeholder="发证单位" disabled />
             </el-form-item>
@@ -820,7 +428,7 @@
                 :on-change="handleFileChange"
                 :limit="1"
               >
-                <el-button :disabled="buttonType === '查看'">
+                <el-button :disabled="pageType === 'detail'">
                   上传
                 </el-button>
               </el-upload>
@@ -834,53 +442,53 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            批量选择
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+    </detail-page>
+    <div class="header">
+      <div class="title">
+        标准配套设备更换
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        申请文档
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          审批流程
-        </div>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        审批流程
       </div>
     </div>
   </app-container>
@@ -888,7 +496,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -909,69 +517,74 @@
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
-    :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
+    width="50%"
+    :before-close="handleClose"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
-      <el-button type="info" @click="applyListClose">
+      <el-button type="info" @click="handleClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 2b8bef4..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index bbaaa1f..2792a21 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -115,7 +115,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e9ff0ce..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
@@ -58,6 +58,7 @@
     text: '标准所在部门',
     value: 'standardLaboratoryName',
     align: 'center',
+    width: '180',
   },
   {
     text: '负责人',
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index 24f12ed..207c39f 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -2,9 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import type { IlistType, IlistTypes } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -19,21 +19,28 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: '0',
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: '1',
+  supplierName: '',
+  supplierNo: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
 const list = ref([
-  { name: '张三' },
+  { name: '张三', id: '12' },
 ])
 // 总数
 const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
 // 表头
 const columns = ref([
   {
@@ -104,12 +111,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getSoucreList(listQuery.value).then((response) => {
+  getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
 }
+// fetchData(true)
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -119,25 +127,11 @@
   id: string
   supplierName: string
 }
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   buttonArray.value = value === '编辑' ? ['提交'] : ['同意', '驳回', '拒绝']
-//   buttonType.value = value
-//   infoId.value = row.id
-//   show.value = false
-// }
 const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-}
-// 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+// 点击删除或者取消
+const handleDelete = (row: rowReturn, pageType: string) => {
   ElMessageBox.confirm(
-    `确认删除${row.supplierName}吗？`,
+    `确认${pageType}${row.supplierName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -146,17 +140,43 @@
     },
   )
     .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
+      if (pageType === '删除') {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+      else {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '取消成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
+  }
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    applyShow.value = true
+  }
+  else {
+    handleDelete(row, pageType)
+  }
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -167,9 +187,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    approvalStatus: '',
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: '1',
+    supplierName: '',
+    supplierNo: '',
     offset: 1,
     limit: 20,
   }
@@ -243,6 +268,16 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
 watch(() => show.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -325,19 +360,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
index f3eae25..289b3e4 100644
--- a/src/views/measure/source/components/listPageAdd.vue
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -3,7 +3,9 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IformInline, traceSupplierPerson } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -67,6 +69,7 @@
   traceSupplierPersonList: [],
 })
 const ruleFormRef = ref<FormInstance>()
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -74,6 +77,8 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
+// 控制审批弹窗开关
+const applyShow = ref(false)
 const rules = ref({
   supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
   supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
@@ -96,7 +101,6 @@
   phone: '',
 })
 const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -159,18 +163,38 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
-  dialogVisible.value = true
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
+  }
 }
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 删除行
 const deleteList = () => {
@@ -180,6 +204,7 @@
 }
 // 点击提交/导出按钮
 const getAddList = async (formEl: FormInstance | undefined, type: string) => {
+  console.log('6666')
   if (type === '提交' && pageType.value === 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -211,65 +236,52 @@
     })
   }
   else {
-    const params = {
-      businessContent: formInline.value.businessContent,
-      supplierName: formInline.value.supplierName,
-      supplierNo: formInline.value.supplierNo,
-    }
-    getSoucreLisListExport(params).then((res) => {
-      exportFile(res.data, '溯源供方详情')
+    applyShow.value = true
+  }
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
     })
   }
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const upload = () => {
+  fileRef.value.click()
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
 }
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
   }
 }
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
 if (pageType.value !== 'add') {
   getInfo()
 }
@@ -279,7 +291,7 @@
   <app-container>
     <detail-page :title="`培训计划审批-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, pageType === 'detail' ? '导出' : '提交')">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -300,9 +312,9 @@
               <el-input
                 v-model="formInline.supplierNo"
                 :placeholder="
-                  buttonType === '详情' ? '无' : '请输入溯源供方编号'
+                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
                 "
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -310,8 +322,8 @@
             <el-form-item label="税号:" prop="taxNumber">
               <el-input
                 v-model="formInline.taxNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入税号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -319,8 +331,8 @@
             <el-form-item label="邮编:">
               <el-input
                 v-model="formInline.postalCode"
-                :placeholder="buttonType === '详情' ? '无' : '请输入邮编'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -328,8 +340,8 @@
             <el-form-item label="手机:">
               <el-input
                 v-model="formInline.mobile"
-                :placeholder="buttonType === '详情' ? '无' : '请输入手机'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -339,8 +351,8 @@
             <el-form-item label="公司名称:" prop="supplierName">
               <el-input
                 v-model="formInline.supplierName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -348,8 +360,8 @@
             <el-form-item label="银行账户名:">
               <el-input
                 v-model="formInline.bankAccount"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -357,8 +369,8 @@
             <el-form-item label="负责人:">
               <el-input
                 v-model="formInline.director"
-                :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -366,8 +378,8 @@
             <el-form-item label="邮箱:">
               <el-input
                 v-model="formInline.mailbox"
-                :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -377,8 +389,8 @@
             <el-form-item label="公司简称:">
               <el-input
                 v-model="formInline.briefName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -386,8 +398,8 @@
             <el-form-item label="银行名称:">
               <el-input
                 v-model="formInline.bankName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -395,8 +407,8 @@
             <el-form-item label="电话:">
               <el-input
                 v-model="formInline.phone"
-                :placeholder="buttonType === '详情' ? '无' : '请输入电话'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -404,8 +416,8 @@
             <el-form-item label="网址:">
               <el-input
                 v-model="formInline.website"
-                :placeholder="buttonType === '详情' ? '无' : '请输入网址'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -415,8 +427,8 @@
             <el-form-item label="业务内容:" prop="businessContent">
               <el-input
                 v-model="formInline.businessContent"
-                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -424,8 +436,8 @@
             <el-form-item label="银行账号:">
               <el-input
                 v-model="formInline.bankAccountNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -433,8 +445,8 @@
             <el-form-item label="传真:">
               <el-input
                 v-model="formInline.fax"
-                :placeholder="buttonType === '详情' ? '无' : '请输入传真'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -445,7 +457,7 @@
               <el-select
                 v-model="formInline.companyCountry"
                 placeholder="国别"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option label="中国" value="中国" />
               </el-select>
@@ -454,7 +466,7 @@
               <el-select
                 v-model="formInline.companyProvince"
                 placeholder="省"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @click="getCompanyAddress('0')"
                 @change="changeProvince"
               >
@@ -470,7 +482,7 @@
               <el-select
                 v-model="formInline.companyCity"
                 placeholder="市"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @change="cityChange"
               >
                 <el-option
@@ -485,7 +497,7 @@
               <el-select
                 v-model="formInline.companyArea"
                 placeholder="区/县"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option
                   v-for="area in areaList"
@@ -499,7 +511,7 @@
               <el-input
                 v-model="formInline.companyAddress"
                 placeholder="公司详细地址"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-col>
           </el-form-item>
@@ -510,7 +522,7 @@
               <el-select
                 v-model="formInline.invoiceCountry"
                 placeholder="国别"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option label="中国" value="中国" />
               </el-select>
@@ -519,7 +531,7 @@
               <el-select
                 v-model="formInline.invoiceProvince"
                 placeholder="省"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @click="getinvoiceProvinceList('0')"
                 @change="changeInvoice"
               >
@@ -535,7 +547,7 @@
               <el-select
                 v-model="formInline.invoiceCity"
                 placeholder="市"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @change="invoiceCityChange"
               >
                 <el-option
@@ -550,7 +562,7 @@
               <el-select
                 v-model="formInline.invoiceArea"
                 placeholder="区/县"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option
                   v-for="area in areaInvoiceList"
@@ -564,7 +576,7 @@
               <el-input
                 v-model="formInline.invoiceAddress"
                 placeholder="开票详细地址"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-col>
           </el-form-item>
@@ -575,9 +587,9 @@
               <el-input
                 v-model="formInline.businessScope"
                 :placeholder="
-                  buttonType === '详情' ? '无' : '请输入公司业务范围'
+                  pageType === 'detail' ? '无' : '请输入公司业务范围'
                 "
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -587,8 +599,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>
@@ -596,63 +608,53 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button type="primary" :disabled="buttonType === '详情'">
-                  上传
-                </el-button>
-              </el-upload>
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
+              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
+        <el-button type="primary" @click="addRoow">
           增加行
         </el-button>
       </template>
-      <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
+      <el-table
+        :data="traceSupplierPersonList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
+      >
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
   </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
-        <el-input v-model="addPersonList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/source/components/manageBox.vue b/src/views/measure/source/components/manageBox.vue
new file mode 100644
index 0000000..c5ced8f
--- /dev/null
+++ b/src/views/measure/source/components/manageBox.vue
@@ -0,0 +1,99 @@
+<script lang="ts" setup name="Manage-Box">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+const props = defineProps({
+  applyShow: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
+interface IapplyList {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+const applyList: Ref<IapplyList> = ref({})
+const handleClose = () => {
+  emit('handleClose')
+}
+const applyListSubmit = () => {
+  emit('applyListSubmit', applyList.value)
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="props.applyShow"
+    title="审批操作"
+    width="50%"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="applyList"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" @click="applyListSubmit">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index c057976..5dd7a20 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -70,3 +70,16 @@
   traceSupplierPersonList: traceSupplierPerson []
 }
 
+export interface IlistTypes {
+  approvalStatus: string
+  businessContent: string
+  companyArea: string
+  companyCity: string
+  companyProvince: string
+  formId: string
+  supplierName: string
+  supplierNo: string
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
index ba7e19c..492e92a 100644
--- a/src/views/measure/train/components/listPage.vue
+++ b/src/views/measure/train/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistType } from '../list_interface'
-import ListPageAdd from './listPageAdd.vue'
+import ManageBox from './manageBox.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { getDeptTree } from '@/api/system/plan'
 import { uploadApi } from '@/api/system/notice'
@@ -27,6 +27,8 @@
   offset: 1,
   limit: 10,
 })
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -147,30 +149,10 @@
 }
 // 初始化路由
 const $router = useRouter()
-const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-}
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: rowReturn, pageType: string) => {
   ElMessageBox.confirm(
-    `确认删除${row.supplierName}吗？`,
+    `确认${pageType}${row.supplierName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -190,6 +172,33 @@
       })
     })
 }
+const pageTypeMap = ref('')
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
+  }
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    applyShow.value = true
+  }
+  else {
+    handleDelete(row, pageType)
+  }
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+
 // 点击搜索
 const searchList = () => {
   // fetchData(true)
@@ -212,6 +221,15 @@
   show.value = true
   // fetchData(true)
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -380,14 +398,7 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-page-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
index 8cd46e8..5f745f6 100644
--- a/src/views/measure/train/components/listPageAdd.vue
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessageBox } from 'element-plus'
 import { pa } from 'element-plus/es/locale'
+import ManageBox from './manageBox.vue'
 import {
   getDeptTree,
   getListAdd,
@@ -85,6 +86,8 @@
   technologyJob: '',
 })
 const SelectionList = ref([])
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
 // 获取到组织信息
 const getDept = () => {
   const params = {
@@ -110,7 +113,7 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
@@ -118,7 +121,7 @@
   formInline.value.trainStaffList.push(
     JSON.parse(JSON.stringify(addPersonList.value)),
   )
-  handleClose()
+  handleVisibleClose()
 }
 // 删除行
 const deleteList = () => {
@@ -160,43 +163,32 @@
       }
     })
   }
-  else if (buttonType === '提交' && pageType.value === 'edit') {
-    formInline.value.trainStaffList.map((item) => {
-      delete item.updateTime
-      delete item.createTime
-    })
-    formInline.value.id = infoId.value
-    getListLogupdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
   else {
-    // 打印
-    const printObj = ref({
-      id: 'print', // 需要打印元素的id
-      popTitle: '证书报告模板', // 打印配置页上方的标题
-      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-      preview: false, // 是否启动预览模式，默认是false
-      standard: '',
-      extarCss: '',
-    })
+    applyShow.value = true
   }
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
 </script>
 
 <template>
   <app-container>
     <detail-page :title="`培训计划审批-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
           {{ item }}
         </el-button>
         <el-button v-if=" pageType === 'edit'" type="primary">
           保存
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -368,7 +360,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -402,6 +394,7 @@
       完成
     </el-button>
   </el-dialog>
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index ffd9e95..5ae03f9 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -67,7 +67,7 @@
 // 删除申请列表信息
 export function getStandardLisdelete(data: object) {
   return request({
-    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    url: '/standard/deleteStandardEquipmentApply',
     method: 'post',
     data,
   })
@@ -76,7 +76,16 @@
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
-    url: `${prefix}/standard/addStandardEquipmentApply`,
+    url: '/standard/addStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 获取到申请列表信息
+export function getStandardLisdetali(data: object) {
+  return request({
+    url: '/standard/standardEquipmentApplyInfo',
     method: 'post',
     data,
   })
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 65c14fe..93f5f12 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -55,6 +55,7 @@
     data,
   })
 }
+
 // 导出详情
 export function getSoucreLisListExport(data: object) {
   return request({
@@ -64,3 +65,12 @@
     data,
   })
 }
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: object) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d67dab6..d464b09 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -437,6 +437,37 @@
           auth: '/device/manage/checkList',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '设备维护列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'maintenanceList':
+              to.meta.activeMenu = '/maintenance/maintenanceList'
+              to.meta.title = '设备维护列表'
+              break
+            case 'maintenanceCheckList':
+              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
+              to.meta.title = '设备检修保养验收单'
+              break
+            case 'manageCheckList':
+              to.meta.activeMenu = '/maintenance/manageCheckList'
+              to.meta.title = '设备管理点检查表'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 710bdc2..f114ca2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -278,7 +278,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          auth: '/train/trainPlanApprove',
+          activeMenu: '/train/trainPlanApprove',
         },
       },
       {
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
index df90882..478f4fb 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
@@ -3,7 +3,6 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -26,6 +25,8 @@
   offset: 1,
   limit: 10,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -167,22 +168,44 @@
       // })
     })
 }
-// 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+// // 点击编辑/详情
+// const handleEdit = (index: string, row: rowReturn, value: string) => {
+//   if (value === '查看' || value === '编辑') {
+//     buttonArray.value = ['同意', '驳回', '拒绝']
+//     buttonType.value = value
+//     infoId.value = row.id
+//     show.value = false
+//   }
+//   else if (value === '删除' || value === '取消' || value === '提交') {
+//     handleDelete(row, value)
+//   }
+//   else {
+//     if (value === '同意') {
+//       applyList.value.select = '1'
+//     }
+//     else if (value === '驳回') {
+//       applyList.value.select = '2'
+//     }
+//     else {
+//       applyList.value.select = '3'
+//     }
+//     applyList.value.approval = row.name
+//     applyList.value.approvalTime = row.name
+//     applyShow.value = true
+//   }
+// }
+const pageTypeMap = ref('')
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
   }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    if (pageType === '同意') {
       applyList.value.select = '1'
     }
-    else if (value === '驳回') {
+    else if (pageType === '驳回') {
       applyList.value.select = '2'
     }
     else {
@@ -192,6 +215,9 @@
     applyList.value.approvalTime = row.name
     applyShow.value = true
   }
+  else {
+    handleDelete(row, pageType)
+  }
 }
 // 审批弹窗关闭
 const handleClose = () => {
@@ -280,9 +306,7 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  $router.push('/maintenance/add')
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -396,7 +420,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -407,71 +431,68 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="handleClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="applyListSubmit">
@@ -483,11 +504,3 @@
     </template>
   </el-dialog>
 </template>
-
-<style lang="scss" scoped>
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
index eb506ec..6527f2e 100644
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="maintenanceAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -7,21 +7,34 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String,
-    default: '0',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -33,109 +46,11 @@
   constructionStandardUnitName: '',
   contactInfo: '',
   createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
-  managerStateName: '',
-  measureMajor: null,
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: null,
-  standardLaboratoryName: '',
-  standardLevel: null,
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: null,
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: null,
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
-  createTime: '',
-  director: '',
-  meterMajor: '',
-  organizeName: '',
-  organizeNo: '',
-  organizeType: '2',
-  pdeptId: null,
-  offset: 1,
-  limit: 999999,
-}).then((res) => {
-  standardUsersDeptList.value = res.data.rows
-})
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
-  }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
-}
 // 数据
 const list = ref<object[]>([
   { name: '王五' },
 ])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -233,37 +148,17 @@
 ])
 // 标准配套设备更换表格分页
 const changePage = () => {}
-getStandardOwnerOptions()
 // 添加表格数据对象
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
-// 关闭
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
 const close = () => {
-  emit('close')
+  $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
@@ -317,19 +212,9 @@
   phone: string
   director: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: object) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
-// 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
-}
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -338,7 +223,7 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
+if (pageType.value !== 'add') {
   getInfo()
 }
 
@@ -372,13 +257,13 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 标准配套设备更换表格删除行
 const removeRow = () => {
@@ -407,11 +292,6 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -424,24 +304,23 @@
   }
   applyListClose()
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
 </script>
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        基本信息
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
+      <template #btns>
         <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -452,53 +331,17 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="标准代码:">
-              <el-input
-                v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
-                placeholder="标准名称"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="项目编号:" prop="projectNo">
-              <el-input
-                v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="组织机构代码:" prop="organizeNo">
-              <el-input
-                v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item
               label="建标单位名称:"
               prop="constructionStandardUnitName"
@@ -506,198 +349,27 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                placeholder="标准负责人"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="类 别:" prop="category">
-              <el-select
-                v-model="formInline.category"
-                clearable
-                placeholder="类别"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in checkTypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准等级:" prop="standardLevel">
-              <el-select
-                v-model.trim="formInline.standardLevel"
-                clearable
-                placeholder="标准等级"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardLevelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传递范围:" prop="transmitRange">
-              <el-select
-                v-model.trim="formInline.transmitRange"
-                clearable
-                placeholder="传递范围"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in transmitRangeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="投资总额:">
-              <el-input
-                v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="筹建日期:" prop="preparationDate">
-              <el-date-picker
-                v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准所在实验室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                placeholder="标准所在实验室"
-                size="default"
-                :disabled="buttonType === '查看'"
-                @clear="clearDeptList"
-              >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实验室负责人:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系方式:">
-              <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="管理状态:" prop="managerState">
-              <el-select
-                v-model.trim="formInline.managerState"
-                clearable
-                placeholder="管理状态"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业:" prop="measureMajor">
-              <el-select
-                v-model.trim="formInline.measureMajor"
-                clearable
-                placeholder="计量专业"
-                size="default"
-                :disabled="buttonType === '查看'"
-              >
-                <el-option
-                  v-for="item in measureMajorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -709,54 +381,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="不确定度:" prop="uncertainty">
-              <el-input
-                v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="测量范围:" prop="mesureRange">
-              <el-input
-                v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <el-form-item label="环境条件" />
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
-              <el-input
-                v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
-              <el-input
-                v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -774,23 +399,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                placeholder="证书编号"
-                size="default"
-                disabled
-              >
-                <el-option
-                  v-for="item in standardManagerStateList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="发证单位:">
               <el-input placeholder="发证单位" disabled />
             </el-form-item>
@@ -820,7 +428,7 @@
                 :on-change="handleFileChange"
                 :limit="1"
               >
-                <el-button :disabled="buttonType === '查看'">
+                <el-button :disabled="pageType === 'detail'">
                   上传
                 </el-button>
               </el-upload>
@@ -834,53 +442,53 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            批量选择
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+    </detail-page>
+    <div class="header">
+      <div class="title">
+        标准配套设备更换
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
-            增加行
-          </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-        </span>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        申请文档
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
-        <div class="title">
-          审批流程
-        </div>
+      <span class="btns">
+        <el-button v-if="pageType !== 'detail'" type="primary">
+          增加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </span>
+    </div>
+    <normal-table
+      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
+      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+    />
+    <div class="header">
+      <div class="title">
+        审批流程
       </div>
     </div>
   </app-container>
@@ -888,7 +496,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -909,69 +517,74 @@
   <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
-    :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
+    width="50%"
+    :before-close="handleClose"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
-      <el-button type="info" @click="applyListClose">
+      <el-button type="info" @click="handleClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 2b8bef4..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index bbaaa1f..2792a21 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -115,7 +115,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e9ff0ce..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
@@ -58,6 +58,7 @@
     text: '标准所在部门',
     value: 'standardLaboratoryName',
     align: 'center',
+    width: '180',
   },
   {
     text: '负责人',
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index 24f12ed..207c39f 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -2,9 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import type { IlistType, IlistTypes } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -19,21 +19,28 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: '0',
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: '1',
+  supplierName: '',
+  supplierNo: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
 const list = ref([
-  { name: '张三' },
+  { name: '张三', id: '12' },
 ])
 // 总数
 const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
 // 表头
 const columns = ref([
   {
@@ -104,12 +111,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getSoucreList(listQuery.value).then((response) => {
+  getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
 }
+// fetchData(true)
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -119,25 +127,11 @@
   id: string
   supplierName: string
 }
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   buttonArray.value = value === '编辑' ? ['提交'] : ['同意', '驳回', '拒绝']
-//   buttonType.value = value
-//   infoId.value = row.id
-//   show.value = false
-// }
 const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-}
-// 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+// 点击删除或者取消
+const handleDelete = (row: rowReturn, pageType: string) => {
   ElMessageBox.confirm(
-    `确认删除${row.supplierName}吗？`,
+    `确认${pageType}${row.supplierName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -146,17 +140,43 @@
     },
   )
     .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
+      if (pageType === '删除') {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+      else {
+        getSoucreListDelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '取消成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
+// 点击每条数据操作
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
+  }
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    applyShow.value = true
+  }
+  else {
+    handleDelete(row, pageType)
+  }
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -167,9 +187,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    approvalStatus: '',
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: '1',
+    supplierName: '',
+    supplierNo: '',
     offset: 1,
     limit: 20,
   }
@@ -243,6 +268,16 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
 watch(() => show.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -325,19 +360,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
index f3eae25..289b3e4 100644
--- a/src/views/measure/source/components/listPageAdd.vue
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -3,7 +3,9 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IformInline, traceSupplierPerson } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -67,6 +69,7 @@
   traceSupplierPersonList: [],
 })
 const ruleFormRef = ref<FormInstance>()
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = [
   { text: '人员编号', value: 'personNo' },
   { text: '姓名', value: 'name' },
@@ -74,6 +77,8 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
+// 控制审批弹窗开关
+const applyShow = ref(false)
 const rules = ref({
   supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
   supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
@@ -96,7 +101,6 @@
   phone: '',
 })
 const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -159,18 +163,38 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
-  dialogVisible.value = true
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
+  }
 }
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
   formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleClose()
+  handleVisibleClose()
 }
 // 删除行
 const deleteList = () => {
@@ -180,6 +204,7 @@
 }
 // 点击提交/导出按钮
 const getAddList = async (formEl: FormInstance | undefined, type: string) => {
+  console.log('6666')
   if (type === '提交' && pageType.value === 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
@@ -211,65 +236,52 @@
     })
   }
   else {
-    const params = {
-      businessContent: formInline.value.businessContent,
-      supplierName: formInline.value.supplierName,
-      supplierNo: formInline.value.supplierNo,
-    }
-    getSoucreLisListExport(params).then((res) => {
-      exportFile(res.data, '溯源供方详情')
+    applyShow.value = true
+  }
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
     })
   }
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const upload = () => {
+  fileRef.value.click()
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
 }
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
   }
 }
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
 if (pageType.value !== 'add') {
   getInfo()
 }
@@ -279,7 +291,7 @@
   <app-container>
     <detail-page :title="`培训计划审批-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, pageType === 'detail' ? '导出' : '提交')">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -300,9 +312,9 @@
               <el-input
                 v-model="formInline.supplierNo"
                 :placeholder="
-                  buttonType === '详情' ? '无' : '请输入溯源供方编号'
+                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
                 "
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -310,8 +322,8 @@
             <el-form-item label="税号:" prop="taxNumber">
               <el-input
                 v-model="formInline.taxNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入税号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -319,8 +331,8 @@
             <el-form-item label="邮编:">
               <el-input
                 v-model="formInline.postalCode"
-                :placeholder="buttonType === '详情' ? '无' : '请输入邮编'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -328,8 +340,8 @@
             <el-form-item label="手机:">
               <el-input
                 v-model="formInline.mobile"
-                :placeholder="buttonType === '详情' ? '无' : '请输入手机'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -339,8 +351,8 @@
             <el-form-item label="公司名称:" prop="supplierName">
               <el-input
                 v-model="formInline.supplierName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -348,8 +360,8 @@
             <el-form-item label="银行账户名:">
               <el-input
                 v-model="formInline.bankAccount"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -357,8 +369,8 @@
             <el-form-item label="负责人:">
               <el-input
                 v-model="formInline.director"
-                :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -366,8 +378,8 @@
             <el-form-item label="邮箱:">
               <el-input
                 v-model="formInline.mailbox"
-                :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -377,8 +389,8 @@
             <el-form-item label="公司简称:">
               <el-input
                 v-model="formInline.briefName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -386,8 +398,8 @@
             <el-form-item label="银行名称:">
               <el-input
                 v-model="formInline.bankName"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -395,8 +407,8 @@
             <el-form-item label="电话:">
               <el-input
                 v-model="formInline.phone"
-                :placeholder="buttonType === '详情' ? '无' : '请输入电话'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -404,8 +416,8 @@
             <el-form-item label="网址:">
               <el-input
                 v-model="formInline.website"
-                :placeholder="buttonType === '详情' ? '无' : '请输入网址'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -415,8 +427,8 @@
             <el-form-item label="业务内容:" prop="businessContent">
               <el-input
                 v-model="formInline.businessContent"
-                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -424,8 +436,8 @@
             <el-form-item label="银行账号:">
               <el-input
                 v-model="formInline.bankAccountNumber"
-                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -433,8 +445,8 @@
             <el-form-item label="传真:">
               <el-input
                 v-model="formInline.fax"
-                :placeholder="buttonType === '详情' ? '无' : '请输入传真'"
-                :disabled="buttonType === '详情'"
+                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -445,7 +457,7 @@
               <el-select
                 v-model="formInline.companyCountry"
                 placeholder="国别"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option label="中国" value="中国" />
               </el-select>
@@ -454,7 +466,7 @@
               <el-select
                 v-model="formInline.companyProvince"
                 placeholder="省"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @click="getCompanyAddress('0')"
                 @change="changeProvince"
               >
@@ -470,7 +482,7 @@
               <el-select
                 v-model="formInline.companyCity"
                 placeholder="市"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @change="cityChange"
               >
                 <el-option
@@ -485,7 +497,7 @@
               <el-select
                 v-model="formInline.companyArea"
                 placeholder="区/县"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option
                   v-for="area in areaList"
@@ -499,7 +511,7 @@
               <el-input
                 v-model="formInline.companyAddress"
                 placeholder="公司详细地址"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-col>
           </el-form-item>
@@ -510,7 +522,7 @@
               <el-select
                 v-model="formInline.invoiceCountry"
                 placeholder="国别"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option label="中国" value="中国" />
               </el-select>
@@ -519,7 +531,7 @@
               <el-select
                 v-model="formInline.invoiceProvince"
                 placeholder="省"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @click="getinvoiceProvinceList('0')"
                 @change="changeInvoice"
               >
@@ -535,7 +547,7 @@
               <el-select
                 v-model="formInline.invoiceCity"
                 placeholder="市"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
                 @change="invoiceCityChange"
               >
                 <el-option
@@ -550,7 +562,7 @@
               <el-select
                 v-model="formInline.invoiceArea"
                 placeholder="区/县"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               >
                 <el-option
                   v-for="area in areaInvoiceList"
@@ -564,7 +576,7 @@
               <el-input
                 v-model="formInline.invoiceAddress"
                 placeholder="开票详细地址"
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-col>
           </el-form-item>
@@ -575,9 +587,9 @@
               <el-input
                 v-model="formInline.businessScope"
                 :placeholder="
-                  buttonType === '详情' ? '无' : '请输入公司业务范围'
+                  pageType === 'detail' ? '无' : '请输入公司业务范围'
                 "
-                :disabled="buttonType === '详情'"
+                :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
@@ -587,8 +599,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>
@@ -596,63 +608,53 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button type="primary" :disabled="buttonType === '详情'">
-                  上传
-                </el-button>
-              </el-upload>
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
+              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
+        <el-button type="primary" @click="addRoow">
           增加行
         </el-button>
       </template>
-      <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
+      <el-table
+        :data="traceSupplierPersonList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
+      >
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
   </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
-        <el-input v-model="addPersonList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/source/components/manageBox.vue b/src/views/measure/source/components/manageBox.vue
new file mode 100644
index 0000000..c5ced8f
--- /dev/null
+++ b/src/views/measure/source/components/manageBox.vue
@@ -0,0 +1,99 @@
+<script lang="ts" setup name="Manage-Box">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+const props = defineProps({
+  applyShow: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
+interface IapplyList {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+const applyList: Ref<IapplyList> = ref({})
+const handleClose = () => {
+  emit('handleClose')
+}
+const applyListSubmit = () => {
+  emit('applyListSubmit', applyList.value)
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="props.applyShow"
+    title="审批操作"
+    width="50%"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="applyList"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" @click="applyListSubmit">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index c057976..5dd7a20 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -70,3 +70,16 @@
   traceSupplierPersonList: traceSupplierPerson []
 }
 
+export interface IlistTypes {
+  approvalStatus: string
+  businessContent: string
+  companyArea: string
+  companyCity: string
+  companyProvince: string
+  formId: string
+  supplierName: string
+  supplierNo: string
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
index ba7e19c..492e92a 100644
--- a/src/views/measure/train/components/listPage.vue
+++ b/src/views/measure/train/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistType } from '../list_interface'
-import ListPageAdd from './listPageAdd.vue'
+import ManageBox from './manageBox.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { getDeptTree } from '@/api/system/plan'
 import { uploadApi } from '@/api/system/notice'
@@ -27,6 +27,8 @@
   offset: 1,
   limit: 10,
 })
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -147,30 +149,10 @@
 }
 // 初始化路由
 const $router = useRouter()
-const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-}
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: rowReturn, pageType: string) => {
   ElMessageBox.confirm(
-    `确认删除${row.supplierName}吗？`,
+    `确认${pageType}${row.supplierName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -190,6 +172,33 @@
       })
     })
 }
+const pageTypeMap = ref('')
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: string) => {
+  if (pageType === '编辑' || pageType === '查看') {
+    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
+    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
+  }
+  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
+    applyShow.value = true
+  }
+  else {
+    handleDelete(row, pageType)
+  }
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+
 // 点击搜索
 const searchList = () => {
   // fetchData(true)
@@ -212,6 +221,15 @@
   show.value = true
   // fetchData(true)
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -380,14 +398,7 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-page-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
index 8cd46e8..5f745f6 100644
--- a/src/views/measure/train/components/listPageAdd.vue
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessageBox } from 'element-plus'
 import { pa } from 'element-plus/es/locale'
+import ManageBox from './manageBox.vue'
 import {
   getDeptTree,
   getListAdd,
@@ -85,6 +86,8 @@
   technologyJob: '',
 })
 const SelectionList = ref([])
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
 // 获取到组织信息
 const getDept = () => {
   const params = {
@@ -110,7 +113,7 @@
   dialogVisible.value = true
 }
 // 点击关闭
-const handleClose = () => {
+const handleVisibleClose = () => {
   dialogVisible.value = false
 }
 // 点击弹窗的完成追加到表格数组中
@@ -118,7 +121,7 @@
   formInline.value.trainStaffList.push(
     JSON.parse(JSON.stringify(addPersonList.value)),
   )
-  handleClose()
+  handleVisibleClose()
 }
 // 删除行
 const deleteList = () => {
@@ -160,43 +163,32 @@
       }
     })
   }
-  else if (buttonType === '提交' && pageType.value === 'edit') {
-    formInline.value.trainStaffList.map((item) => {
-      delete item.updateTime
-      delete item.createTime
-    })
-    formInline.value.id = infoId.value
-    getListLogupdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
   else {
-    // 打印
-    const printObj = ref({
-      id: 'print', // 需要打印元素的id
-      popTitle: '证书报告模板', // 打印配置页上方的标题
-      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-      preview: false, // 是否启动预览模式，默认是false
-      standard: '',
-      extarCss: '',
-    })
+    applyShow.value = true
   }
 }
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 点击审批的提交
+const applyListSubmit = (row: any) => {
+  console.log(row)
+  handleClose()
+}
 </script>
 
 <template>
   <app-container>
     <detail-page :title="`培训计划审批-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
           {{ item }}
         </el-button>
         <el-button v-if=" pageType === 'edit'" type="primary">
           保存
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -368,7 +360,7 @@
     v-model="dialogVisible"
     title="添加人员信息"
     width="30%"
-    :before-close="handleClose"
+    :before-close="handleVisibleClose"
     center
   >
     <el-form
@@ -402,6 +394,7 @@
       完成
     </el-button>
   </el-dialog>
+  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/components/manageBox.vue b/src/views/measure/train/components/manageBox.vue
new file mode 100644
index 0000000..c5ced8f
--- /dev/null
+++ b/src/views/measure/train/components/manageBox.vue
@@ -0,0 +1,99 @@
+<script lang="ts" setup name="Manage-Box">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+const props = defineProps({
+  applyShow: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
+interface IapplyList {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+const applyList: Ref<IapplyList> = ref({})
+const handleClose = () => {
+  emit('handleClose')
+}
+const applyListSubmit = () => {
+  emit('applyListSubmit', applyList.value)
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="props.applyShow"
+    title="审批操作"
+    width="50%"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="applyList"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" @click="applyListSubmit">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>