diff --git a/src/api/eqpt/status/borrow.ts b/src/api/eqpt/status/borrow.ts
new file mode 100644
index 0000000..9d8370e
--- /dev/null
+++ b/src/api/eqpt/status/borrow.ts
@@ -0,0 +1,81 @@
+// 借用申请
+import request from '@/api/index'
+
+// 不同状态的列表
+export function getListPage(params: any, statusName: string) {
+  if (statusName === '全部') {
+    return request({
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+}
+// 保存编辑
+export function editStatus(data: object) {
+  return request({
+    url: '/status/approval/saveOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/status/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteStatus(id: string) {
+  return request({
+    url: `/status/approval/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/status/approval/cancel',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailStatus(params: object) {
+  return request({
+    url: '/status/approval/detail',
+    method: 'get',
+    params,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/status/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/eqpt/status/borrow.ts b/src/api/eqpt/status/borrow.ts
new file mode 100644
index 0000000..9d8370e
--- /dev/null
+++ b/src/api/eqpt/status/borrow.ts
@@ -0,0 +1,81 @@
+// 借用申请
+import request from '@/api/index'
+
+// 不同状态的列表
+export function getListPage(params: any, statusName: string) {
+  if (statusName === '全部') {
+    return request({
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+}
+// 保存编辑
+export function editStatus(data: object) {
+  return request({
+    url: '/status/approval/saveOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/status/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteStatus(id: string) {
+  return request({
+    url: `/status/approval/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/status/approval/cancel',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailStatus(params: object) {
+  return request({
+    url: '/status/approval/detail',
+    method: 'get',
+    params,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/status/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/eqpt/status/maintain.ts b/src/api/eqpt/status/maintain.ts
new file mode 100644
index 0000000..a2c94a2
--- /dev/null
+++ b/src/api/eqpt/status/maintain.ts
@@ -0,0 +1,40 @@
+// 故障维修接口
+import request from '@/api/index'
+
+export function getMaintainListPage(params: any) {
+  return request({
+    url: `/maintain/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function updateMaintain(data: object) {
+  return request({
+    url: '/maintain/update',
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addMaintain(data: object) {
+  return request({
+    url: '/maintain/add',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailMaintain(data: object) {
+  return request({
+    url: `/maintain/detail?id=${data.id}`,
+    method: 'get',
+  })
+}
+// 删除
+export function deleteMaintain(id: string) {
+  return request({
+    url: `/maintain/delete?id=${id}`,
+    method: 'get',
+  })
+}

diff --git a/src/api/eqpt/status/borrow.ts b/src/api/eqpt/status/borrow.ts
new file mode 100644
index 0000000..9d8370e
--- /dev/null
+++ b/src/api/eqpt/status/borrow.ts
@@ -0,0 +1,81 @@
+// 借用申请
+import request from '@/api/index'
+
+// 不同状态的列表
+export function getListPage(params: any, statusName: string) {
+  if (statusName === '全部') {
+    return request({
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+}
+// 保存编辑
+export function editStatus(data: object) {
+  return request({
+    url: '/status/approval/saveOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/status/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteStatus(id: string) {
+  return request({
+    url: `/status/approval/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/status/approval/cancel',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailStatus(params: object) {
+  return request({
+    url: '/status/approval/detail',
+    method: 'get',
+    params,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/status/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/eqpt/status/maintain.ts b/src/api/eqpt/status/maintain.ts
new file mode 100644
index 0000000..a2c94a2
--- /dev/null
+++ b/src/api/eqpt/status/maintain.ts
@@ -0,0 +1,40 @@
+// 故障维修接口
+import request from '@/api/index'
+
+export function getMaintainListPage(params: any) {
+  return request({
+    url: `/maintain/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function updateMaintain(data: object) {
+  return request({
+    url: '/maintain/update',
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addMaintain(data: object) {
+  return request({
+    url: '/maintain/add',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailMaintain(data: object) {
+  return request({
+    url: `/maintain/detail?id=${data.id}`,
+    method: 'get',
+  })
+}
+// 删除
+export function deleteMaintain(id: string) {
+  return request({
+    url: `/maintain/delete?id=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index fe0b97b..281be40 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -811,6 +811,80 @@
           },
         ],
       },
+      {
+        path: '/maintainlist',
+        component: Layout,
+        redirect: '/maintainpage',
+        name: 'MaintainList',
+        meta: {
+          title: '故障维修',
+          icon: 'ep:key',
+          auth: '/tested/status/maintain',
+        },
+        children: [
+          {
+            path: '/maintainpage',
+            name: 'MaintainPage',
+            component: () => import('@/views/tested/status/maintain/index.vue'),
+            meta: {
+              title: '故障维修',
+              auth: '/tested/status/maintain',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/maintainlist',
+            },
+          },
+          {
+            path: '/maintainpage/:type',
+            name: 'maintainEdit',
+            component: () => import('@/views/tested/status/maintain/components/edit.vue'),
+            meta: {
+              title: '故障维修',
+              auth: '/tested/status/maintain',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/maintainlist',
+            },
+          },
+        ],
+      },
+      {
+        path: '/borrowlist',
+        component: Layout,
+        redirect: '/borrowpage',
+        name: 'BorrwoList',
+        meta: {
+          title: '借用申请',
+          icon: 'ep:key',
+          auth: '/tested/status/borrow',
+        },
+        children: [
+          {
+            path: '/borrowpage',
+            name: 'BorrowPage',
+            component: () => import('@/views/tested/status/borrow/index.vue'),
+            meta: {
+              title: '借用申请',
+              auth: '/tested/status/borrow',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/borrowlist',
+            },
+          },
+          {
+            path: '/borrowpage/:type',
+            name: 'borrowpageEdit',
+            component: () => import('@/views/tested/status/borrow/components/edit.vue'),
+            meta: {
+              title: '借用申请',
+              auth: '/tested/status/borrow',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/borrowlist',
+            },
+          },
+        ],
+      },
     ],
   },
   // 文档管理

diff --git a/src/api/eqpt/status/borrow.ts b/src/api/eqpt/status/borrow.ts
new file mode 100644
index 0000000..9d8370e
--- /dev/null
+++ b/src/api/eqpt/status/borrow.ts
@@ -0,0 +1,81 @@
+// 借用申请
+import request from '@/api/index'
+
+// 不同状态的列表
+export function getListPage(params: any, statusName: string) {
+  if (statusName === '全部') {
+    return request({
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+}
+// 保存编辑
+export function editStatus(data: object) {
+  return request({
+    url: '/status/approval/saveOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/status/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteStatus(id: string) {
+  return request({
+    url: `/status/approval/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/status/approval/cancel',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailStatus(params: object) {
+  return request({
+    url: '/status/approval/detail',
+    method: 'get',
+    params,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/status/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/eqpt/status/maintain.ts b/src/api/eqpt/status/maintain.ts
new file mode 100644
index 0000000..a2c94a2
--- /dev/null
+++ b/src/api/eqpt/status/maintain.ts
@@ -0,0 +1,40 @@
+// 故障维修接口
+import request from '@/api/index'
+
+export function getMaintainListPage(params: any) {
+  return request({
+    url: `/maintain/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function updateMaintain(data: object) {
+  return request({
+    url: '/maintain/update',
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addMaintain(data: object) {
+  return request({
+    url: '/maintain/add',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailMaintain(data: object) {
+  return request({
+    url: `/maintain/detail?id=${data.id}`,
+    method: 'get',
+  })
+}
+// 删除
+export function deleteMaintain(id: string) {
+  return request({
+    url: `/maintain/delete?id=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index fe0b97b..281be40 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -811,6 +811,80 @@
           },
         ],
       },
+      {
+        path: '/maintainlist',
+        component: Layout,
+        redirect: '/maintainpage',
+        name: 'MaintainList',
+        meta: {
+          title: '故障维修',
+          icon: 'ep:key',
+          auth: '/tested/status/maintain',
+        },
+        children: [
+          {
+            path: '/maintainpage',
+            name: 'MaintainPage',
+            component: () => import('@/views/tested/status/maintain/index.vue'),
+            meta: {
+              title: '故障维修',
+              auth: '/tested/status/maintain',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/maintainlist',
+            },
+          },
+          {
+            path: '/maintainpage/:type',
+            name: 'maintainEdit',
+            component: () => import('@/views/tested/status/maintain/components/edit.vue'),
+            meta: {
+              title: '故障维修',
+              auth: '/tested/status/maintain',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/maintainlist',
+            },
+          },
+        ],
+      },
+      {
+        path: '/borrowlist',
+        component: Layout,
+        redirect: '/borrowpage',
+        name: 'BorrwoList',
+        meta: {
+          title: '借用申请',
+          icon: 'ep:key',
+          auth: '/tested/status/borrow',
+        },
+        children: [
+          {
+            path: '/borrowpage',
+            name: 'BorrowPage',
+            component: () => import('@/views/tested/status/borrow/index.vue'),
+            meta: {
+              title: '借用申请',
+              auth: '/tested/status/borrow',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/borrowlist',
+            },
+          },
+          {
+            path: '/borrowpage/:type',
+            name: 'borrowpageEdit',
+            component: () => import('@/views/tested/status/borrow/components/edit.vue'),
+            meta: {
+              title: '借用申请',
+              auth: '/tested/status/borrow',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/borrowlist',
+            },
+          },
+        ],
+      },
     ],
   },
   // 文档管理
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 714cf00..afab766 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -80,6 +80,7 @@
   customerId: [{ required: true, message: '委托方必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
+const processId = ref()
 const isAdmin = ref(false)
 const companyList = ref<any[]>([]) // 单位列表
 const initDialog = () => {
@@ -114,6 +115,7 @@
       console.log(ruleForm.value, 'rule')
       ruleForm.value.isUrgent = String(res.data.data.isUrgent)
       ruleForm.value.isOnSiteCheck = String(res.data.data.isOnSiteCheck)
+      processId.value = ruleForm.value.processId
     })
   }
 }
@@ -348,6 +350,7 @@
     })
   })
 }
+const activeName = ref('基本信息')
 </script>
 
 <template>
@@ -391,27 +394,38 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com class="container">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="任务单编号">
-              <el-input v-model.trim="ruleForm.orderNo" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="送检人" prop="deliverer">
-              <el-input v-model.trim="ruleForm.deliverer" placeholder="送检人" />
+    <detail-block-com v-if="!$route.path.includes('create') && statusName !== '全部' && statusName !== '草稿箱'">
+      <el-radio-group v-model="activeName">
+        <el-radio-button label="基本信息">
+          基本信息
+        </el-radio-button>
+        <el-radio-button label="审批详情">
+          审批详情
+        </el-radio-button>
+      </el-radio-group>
+    </detail-block-com>
+    <template v-if="activeName === '基本信息'">
+      <detail-block-com class="container">
+        <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="任务单编号">
+                <el-input v-model.trim="ruleForm.orderNo" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建人">
+                <el-input v-model.trim="ruleForm.createUserName" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间">
+                <el-input v-model.trim="ruleForm.createTime" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人" prop="deliverer">
+                <el-input v-model.trim="ruleForm.deliverer" placeholder="送检人" />
               <!-- <el-select v-model="ruleForm.deliverer" filterable placeholder="送检人" style="width: 100%;">
                 <el-option
                   v-for="item in personList"
@@ -423,70 +437,70 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select> -->
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="委托方" prop="customerId">
-              <el-input v-if="!isAdmin" v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
-              <el-select v-else v-model="ruleForm.customerId" clearable filterable placeholder="委托方" style="width: 100%;">
-                <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="12">
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="委托方" prop="customerId">
+                <el-input v-if="!isAdmin" v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
+                <el-select v-else v-model="ruleForm.customerId" clearable filterable placeholder="委托方" style="width: 100%;">
+                  <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
           </el-col> -->
-          <!-- <el-col :span="6">
+            <!-- <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
-            <el-form-item label="是否现场检定" prop="isOnSiteCheck">
-              <el-radio-group v-model="ruleForm.isOnSiteCheck" class="ml-4">
-                <el-radio label="1">
-                  是
-                </el-radio>
-                <el-radio label="0">
-                  否
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <!-- 现场检定- 是 -->
-          <template v-if="ruleForm.isOnSiteCheck === '1'">
             <el-col :span="6">
-              <el-form-item label="现场检定时间" prop="onSiteCheckTime">
-                <el-date-picker
-                  v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
-                />
+              <el-form-item label="是否现场检定" prop="isOnSiteCheck">
+                <el-radio-group v-model="ruleForm.isOnSiteCheck" class="ml-4">
+                  <el-radio label="1">
+                    是
+                  </el-radio>
+                  <el-radio label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-          </template>
-          <!-- 现场检定- 否 -->
-          <template v-if="ruleForm.isOnSiteCheck === '0'">
-            <el-col :span="6">
-              <el-form-item label="预计送达时间" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="ruleForm.planDeliverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="预计送达时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间" prop="requireOverTime">
-                <el-date-picker
-                  v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
-          </template>
+            <!-- 现场检定- 是 -->
+            <template v-if="ruleForm.isOnSiteCheck === '1'">
+              <el-col :span="6">
+                <el-form-item label="现场检定时间" prop="onSiteCheckTime">
+                  <el-date-picker
+                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
+            <!-- 现场检定- 否 -->
+            <template v-if="ruleForm.isOnSiteCheck === '0'">
+              <el-col :span="6">
+                <el-form-item label="预计送达时间" prop="planDeliverTime">
+                  <el-date-picker
+                    v-model="ruleForm.planDeliverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="预计送达时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="要求检完时间" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
           <!-- <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <el-date-picker
@@ -503,57 +517,59 @@
               />
             </el-form-item>
           </el-col> -->
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="电话" prop="customerPhone">
-              <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否加急" prop="isUrgent">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
-              <el-select v-model="ruleForm.isUrgent" placeholder="是否加急" style="width: 100%;">
-                <el-option v-for="item in isUrgentList" :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="measureCompany">
-              <!-- <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled /> -->
-              <el-select v-model="ruleForm.measureCompany" filterable placeholder="检定(校准)单位" style="width: 100%;">
-                <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="电话" prop="customerPhone">
+                <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否加急" prop="isUrgent">
+                <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
+                <el-select v-model="ruleForm.isUrgent" placeholder="是否加急" style="width: 100%;">
+                  <el-option v-for="item in isUrgentList" :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="measureCompany">
+                <!-- <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled /> -->
+                <el-select v-model="ruleForm.measureCompany" filterable placeholder="检定(校准)单位" style="width: 100%;">
+                  <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           <!-- <el-col :span="6">
             <el-form-item label="检修专业" prop="maintainMajor">
               <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
             </el-form-item>
           </el-col> -->
-        </el-row>
-        <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="接收状态">
-              <el-input v-model.trim="ruleForm.receiveStatusName" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="接收说明">
-              <el-input v-model.trim="ruleForm.receiveIllustrate" />
-            </el-form-item>
-          </el-col>
+          </el-row>
+          <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="接收状态">
+                <el-input v-model.trim="ruleForm.receiveStatusName" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="接收说明">
+                <el-input v-model.trim="ruleForm.receiveIllustrate" />
+              </el-form-item>
+            </el-col>
           <!-- <el-col :span="6">
             <el-form-item label="交接单" prop="undertakeTime">
               <a />
             </el-form-item>
           </el-col> -->
-        </el-row>
-      </el-form>
-    </detail-block-com>
-    <detail-block-com>
-      <table-list ref="tableRef" :data="ruleForm.customerSampleInfoList" :form="ruleForm" :status="dialogStatus" />
-    </detail-block-com>
+          </el-row>
+        </el-form>
+      </detail-block-com>
+      <detail-block-com>
+        <table-list ref="tableRef" :data="ruleForm.customerSampleInfoList" :form="ruleForm" :status="dialogStatus" />
+      </detail-block-com>
+    </template>
+    <approval-record-table v-if="activeName === '审批详情'" :process-id="processId" />
   </app-container>
 </template>
 

diff --git a/src/api/eqpt/status/borrow.ts b/src/api/eqpt/status/borrow.ts
new file mode 100644
index 0000000..9d8370e
--- /dev/null
+++ b/src/api/eqpt/status/borrow.ts
@@ -0,0 +1,81 @@
+// 借用申请
+import request from '@/api/index'
+
+// 不同状态的列表
+export function getListPage(params: any, statusName: string) {
+  if (statusName === '全部') {
+    return request({
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+}
+// 保存编辑
+export function editStatus(data: object) {
+  return request({
+    url: '/status/approval/saveOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/status/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteStatus(id: string) {
+  return request({
+    url: `/status/approval/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/status/approval/cancel',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailStatus(params: object) {
+  return request({
+    url: '/status/approval/detail',
+    method: 'get',
+    params,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/status/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/eqpt/status/maintain.ts b/src/api/eqpt/status/maintain.ts
new file mode 100644
index 0000000..a2c94a2
--- /dev/null
+++ b/src/api/eqpt/status/maintain.ts
@@ -0,0 +1,40 @@
+// 故障维修接口
+import request from '@/api/index'
+
+export function getMaintainListPage(params: any) {
+  return request({
+    url: `/maintain/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function updateMaintain(data: object) {
+  return request({
+    url: '/maintain/update',
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addMaintain(data: object) {
+  return request({
+    url: '/maintain/add',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailMaintain(data: object) {
+  return request({
+    url: `/maintain/detail?id=${data.id}`,
+    method: 'get',
+  })
+}
+// 删除
+export function deleteMaintain(id: string) {
+  return request({
+    url: `/maintain/delete?id=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index fe0b97b..281be40 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -811,6 +811,80 @@
           },
         ],
       },
+      {
+        path: '/maintainlist',
+        component: Layout,
+        redirect: '/maintainpage',
+        name: 'MaintainList',
+        meta: {
+          title: '故障维修',
+          icon: 'ep:key',
+          auth: '/tested/status/maintain',
+        },
+        children: [
+          {
+            path: '/maintainpage',
+            name: 'MaintainPage',
+            component: () => import('@/views/tested/status/maintain/index.vue'),
+            meta: {
+              title: '故障维修',
+              auth: '/tested/status/maintain',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/maintainlist',
+            },
+          },
+          {
+            path: '/maintainpage/:type',
+            name: 'maintainEdit',
+            component: () => import('@/views/tested/status/maintain/components/edit.vue'),
+            meta: {
+              title: '故障维修',
+              auth: '/tested/status/maintain',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/maintainlist',
+            },
+          },
+        ],
+      },
+      {
+        path: '/borrowlist',
+        component: Layout,
+        redirect: '/borrowpage',
+        name: 'BorrwoList',
+        meta: {
+          title: '借用申请',
+          icon: 'ep:key',
+          auth: '/tested/status/borrow',
+        },
+        children: [
+          {
+            path: '/borrowpage',
+            name: 'BorrowPage',
+            component: () => import('@/views/tested/status/borrow/index.vue'),
+            meta: {
+              title: '借用申请',
+              auth: '/tested/status/borrow',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/borrowlist',
+            },
+          },
+          {
+            path: '/borrowpage/:type',
+            name: 'borrowpageEdit',
+            component: () => import('@/views/tested/status/borrow/components/edit.vue'),
+            meta: {
+              title: '借用申请',
+              auth: '/tested/status/borrow',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/borrowlist',
+            },
+          },
+        ],
+      },
     ],
   },
   // 文档管理
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 714cf00..afab766 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -80,6 +80,7 @@
   customerId: [{ required: true, message: '委托方必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
+const processId = ref()
 const isAdmin = ref(false)
 const companyList = ref<any[]>([]) // 单位列表
 const initDialog = () => {
@@ -114,6 +115,7 @@
       console.log(ruleForm.value, 'rule')
       ruleForm.value.isUrgent = String(res.data.data.isUrgent)
       ruleForm.value.isOnSiteCheck = String(res.data.data.isOnSiteCheck)
+      processId.value = ruleForm.value.processId
     })
   }
 }
@@ -348,6 +350,7 @@
     })
   })
 }
+const activeName = ref('基本信息')
 </script>
 
 <template>
@@ -391,27 +394,38 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com class="container">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="任务单编号">
-              <el-input v-model.trim="ruleForm.orderNo" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="送检人" prop="deliverer">
-              <el-input v-model.trim="ruleForm.deliverer" placeholder="送检人" />
+    <detail-block-com v-if="!$route.path.includes('create') && statusName !== '全部' && statusName !== '草稿箱'">
+      <el-radio-group v-model="activeName">
+        <el-radio-button label="基本信息">
+          基本信息
+        </el-radio-button>
+        <el-radio-button label="审批详情">
+          审批详情
+        </el-radio-button>
+      </el-radio-group>
+    </detail-block-com>
+    <template v-if="activeName === '基本信息'">
+      <detail-block-com class="container">
+        <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="任务单编号">
+                <el-input v-model.trim="ruleForm.orderNo" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建人">
+                <el-input v-model.trim="ruleForm.createUserName" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间">
+                <el-input v-model.trim="ruleForm.createTime" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人" prop="deliverer">
+                <el-input v-model.trim="ruleForm.deliverer" placeholder="送检人" />
               <!-- <el-select v-model="ruleForm.deliverer" filterable placeholder="送检人" style="width: 100%;">
                 <el-option
                   v-for="item in personList"
@@ -423,70 +437,70 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select> -->
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="委托方" prop="customerId">
-              <el-input v-if="!isAdmin" v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
-              <el-select v-else v-model="ruleForm.customerId" clearable filterable placeholder="委托方" style="width: 100%;">
-                <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="12">
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="委托方" prop="customerId">
+                <el-input v-if="!isAdmin" v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
+                <el-select v-else v-model="ruleForm.customerId" clearable filterable placeholder="委托方" style="width: 100%;">
+                  <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
           </el-col> -->
-          <!-- <el-col :span="6">
+            <!-- <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
-            <el-form-item label="是否现场检定" prop="isOnSiteCheck">
-              <el-radio-group v-model="ruleForm.isOnSiteCheck" class="ml-4">
-                <el-radio label="1">
-                  是
-                </el-radio>
-                <el-radio label="0">
-                  否
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <!-- 现场检定- 是 -->
-          <template v-if="ruleForm.isOnSiteCheck === '1'">
             <el-col :span="6">
-              <el-form-item label="现场检定时间" prop="onSiteCheckTime">
-                <el-date-picker
-                  v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
-                />
+              <el-form-item label="是否现场检定" prop="isOnSiteCheck">
+                <el-radio-group v-model="ruleForm.isOnSiteCheck" class="ml-4">
+                  <el-radio label="1">
+                    是
+                  </el-radio>
+                  <el-radio label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-          </template>
-          <!-- 现场检定- 否 -->
-          <template v-if="ruleForm.isOnSiteCheck === '0'">
-            <el-col :span="6">
-              <el-form-item label="预计送达时间" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="ruleForm.planDeliverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="预计送达时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间" prop="requireOverTime">
-                <el-date-picker
-                  v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
-          </template>
+            <!-- 现场检定- 是 -->
+            <template v-if="ruleForm.isOnSiteCheck === '1'">
+              <el-col :span="6">
+                <el-form-item label="现场检定时间" prop="onSiteCheckTime">
+                  <el-date-picker
+                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
+            <!-- 现场检定- 否 -->
+            <template v-if="ruleForm.isOnSiteCheck === '0'">
+              <el-col :span="6">
+                <el-form-item label="预计送达时间" prop="planDeliverTime">
+                  <el-date-picker
+                    v-model="ruleForm.planDeliverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="预计送达时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="要求检完时间" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
           <!-- <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <el-date-picker
@@ -503,57 +517,59 @@
               />
             </el-form-item>
           </el-col> -->
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="电话" prop="customerPhone">
-              <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否加急" prop="isUrgent">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
-              <el-select v-model="ruleForm.isUrgent" placeholder="是否加急" style="width: 100%;">
-                <el-option v-for="item in isUrgentList" :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="measureCompany">
-              <!-- <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled /> -->
-              <el-select v-model="ruleForm.measureCompany" filterable placeholder="检定(校准)单位" style="width: 100%;">
-                <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="电话" prop="customerPhone">
+                <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否加急" prop="isUrgent">
+                <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
+                <el-select v-model="ruleForm.isUrgent" placeholder="是否加急" style="width: 100%;">
+                  <el-option v-for="item in isUrgentList" :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="measureCompany">
+                <!-- <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled /> -->
+                <el-select v-model="ruleForm.measureCompany" filterable placeholder="检定(校准)单位" style="width: 100%;">
+                  <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           <!-- <el-col :span="6">
             <el-form-item label="检修专业" prop="maintainMajor">
               <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
             </el-form-item>
           </el-col> -->
-        </el-row>
-        <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="接收状态">
-              <el-input v-model.trim="ruleForm.receiveStatusName" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="接收说明">
-              <el-input v-model.trim="ruleForm.receiveIllustrate" />
-            </el-form-item>
-          </el-col>
+          </el-row>
+          <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="接收状态">
+                <el-input v-model.trim="ruleForm.receiveStatusName" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="接收说明">
+                <el-input v-model.trim="ruleForm.receiveIllustrate" />
+              </el-form-item>
+            </el-col>
           <!-- <el-col :span="6">
             <el-form-item label="交接单" prop="undertakeTime">
               <a />
             </el-form-item>
           </el-col> -->
-        </el-row>
-      </el-form>
-    </detail-block-com>
-    <detail-block-com>
-      <table-list ref="tableRef" :data="ruleForm.customerSampleInfoList" :form="ruleForm" :status="dialogStatus" />
-    </detail-block-com>
+          </el-row>
+        </el-form>
+      </detail-block-com>
+      <detail-block-com>
+        <table-list ref="tableRef" :data="ruleForm.customerSampleInfoList" :form="ruleForm" :status="dialogStatus" />
+      </detail-block-com>
+    </template>
+    <approval-record-table v-if="activeName === '审批详情'" :process-id="processId" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue
new file mode 100644
index 0000000..1085613
--- /dev/null
+++ b/src/views/tested/status/borrow/components/edit.vue
@@ -0,0 +1,3 @@
+<template>
+  借用
+</template>

diff --git a/src/api/eqpt/status/borrow.ts b/src/api/eqpt/status/borrow.ts
new file mode 100644
index 0000000..9d8370e
--- /dev/null
+++ b/src/api/eqpt/status/borrow.ts
@@ -0,0 +1,81 @@
+// 借用申请
+import request from '@/api/index'
+
+// 不同状态的列表
+export function getListPage(params: any, statusName: string) {
+  if (statusName === '全部') {
+    return request({
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+}
+// 保存编辑
+export function editStatus(data: object) {
+  return request({
+    url: '/status/approval/saveOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/status/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteStatus(id: string) {
+  return request({
+    url: `/status/approval/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/status/approval/cancel',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailStatus(params: object) {
+  return request({
+    url: '/status/approval/detail',
+    method: 'get',
+    params,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/status/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/eqpt/status/maintain.ts b/src/api/eqpt/status/maintain.ts
new file mode 100644
index 0000000..a2c94a2
--- /dev/null
+++ b/src/api/eqpt/status/maintain.ts
@@ -0,0 +1,40 @@
+// 故障维修接口
+import request from '@/api/index'
+
+export function getMaintainListPage(params: any) {
+  return request({
+    url: `/maintain/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function updateMaintain(data: object) {
+  return request({
+    url: '/maintain/update',
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addMaintain(data: object) {
+  return request({
+    url: '/maintain/add',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailMaintain(data: object) {
+  return request({
+    url: `/maintain/detail?id=${data.id}`,
+    method: 'get',
+  })
+}
+// 删除
+export function deleteMaintain(id: string) {
+  return request({
+    url: `/maintain/delete?id=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index fe0b97b..281be40 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -811,6 +811,80 @@
           },
         ],
       },
+      {
+        path: '/maintainlist',
+        component: Layout,
+        redirect: '/maintainpage',
+        name: 'MaintainList',
+        meta: {
+          title: '故障维修',
+          icon: 'ep:key',
+          auth: '/tested/status/maintain',
+        },
+        children: [
+          {
+            path: '/maintainpage',
+            name: 'MaintainPage',
+            component: () => import('@/views/tested/status/maintain/index.vue'),
+            meta: {
+              title: '故障维修',
+              auth: '/tested/status/maintain',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/maintainlist',
+            },
+          },
+          {
+            path: '/maintainpage/:type',
+            name: 'maintainEdit',
+            component: () => import('@/views/tested/status/maintain/components/edit.vue'),
+            meta: {
+              title: '故障维修',
+              auth: '/tested/status/maintain',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/maintainlist',
+            },
+          },
+        ],
+      },
+      {
+        path: '/borrowlist',
+        component: Layout,
+        redirect: '/borrowpage',
+        name: 'BorrwoList',
+        meta: {
+          title: '借用申请',
+          icon: 'ep:key',
+          auth: '/tested/status/borrow',
+        },
+        children: [
+          {
+            path: '/borrowpage',
+            name: 'BorrowPage',
+            component: () => import('@/views/tested/status/borrow/index.vue'),
+            meta: {
+              title: '借用申请',
+              auth: '/tested/status/borrow',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/borrowlist',
+            },
+          },
+          {
+            path: '/borrowpage/:type',
+            name: 'borrowpageEdit',
+            component: () => import('@/views/tested/status/borrow/components/edit.vue'),
+            meta: {
+              title: '借用申请',
+              auth: '/tested/status/borrow',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/borrowlist',
+            },
+          },
+        ],
+      },
     ],
   },
   // 文档管理
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 714cf00..afab766 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -80,6 +80,7 @@
   customerId: [{ required: true, message: '委托方必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
+const processId = ref()
 const isAdmin = ref(false)
 const companyList = ref<any[]>([]) // 单位列表
 const initDialog = () => {
@@ -114,6 +115,7 @@
       console.log(ruleForm.value, 'rule')
       ruleForm.value.isUrgent = String(res.data.data.isUrgent)
       ruleForm.value.isOnSiteCheck = String(res.data.data.isOnSiteCheck)
+      processId.value = ruleForm.value.processId
     })
   }
 }
@@ -348,6 +350,7 @@
     })
   })
 }
+const activeName = ref('基本信息')
 </script>
 
 <template>
@@ -391,27 +394,38 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com class="container">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="任务单编号">
-              <el-input v-model.trim="ruleForm.orderNo" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="送检人" prop="deliverer">
-              <el-input v-model.trim="ruleForm.deliverer" placeholder="送检人" />
+    <detail-block-com v-if="!$route.path.includes('create') && statusName !== '全部' && statusName !== '草稿箱'">
+      <el-radio-group v-model="activeName">
+        <el-radio-button label="基本信息">
+          基本信息
+        </el-radio-button>
+        <el-radio-button label="审批详情">
+          审批详情
+        </el-radio-button>
+      </el-radio-group>
+    </detail-block-com>
+    <template v-if="activeName === '基本信息'">
+      <detail-block-com class="container">
+        <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="任务单编号">
+                <el-input v-model.trim="ruleForm.orderNo" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建人">
+                <el-input v-model.trim="ruleForm.createUserName" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间">
+                <el-input v-model.trim="ruleForm.createTime" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人" prop="deliverer">
+                <el-input v-model.trim="ruleForm.deliverer" placeholder="送检人" />
               <!-- <el-select v-model="ruleForm.deliverer" filterable placeholder="送检人" style="width: 100%;">
                 <el-option
                   v-for="item in personList"
@@ -423,70 +437,70 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select> -->
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="委托方" prop="customerId">
-              <el-input v-if="!isAdmin" v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
-              <el-select v-else v-model="ruleForm.customerId" clearable filterable placeholder="委托方" style="width: 100%;">
-                <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="12">
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="委托方" prop="customerId">
+                <el-input v-if="!isAdmin" v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
+                <el-select v-else v-model="ruleForm.customerId" clearable filterable placeholder="委托方" style="width: 100%;">
+                  <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
           </el-col> -->
-          <!-- <el-col :span="6">
+            <!-- <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
-            <el-form-item label="是否现场检定" prop="isOnSiteCheck">
-              <el-radio-group v-model="ruleForm.isOnSiteCheck" class="ml-4">
-                <el-radio label="1">
-                  是
-                </el-radio>
-                <el-radio label="0">
-                  否
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <!-- 现场检定- 是 -->
-          <template v-if="ruleForm.isOnSiteCheck === '1'">
             <el-col :span="6">
-              <el-form-item label="现场检定时间" prop="onSiteCheckTime">
-                <el-date-picker
-                  v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
-                />
+              <el-form-item label="是否现场检定" prop="isOnSiteCheck">
+                <el-radio-group v-model="ruleForm.isOnSiteCheck" class="ml-4">
+                  <el-radio label="1">
+                    是
+                  </el-radio>
+                  <el-radio label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-          </template>
-          <!-- 现场检定- 否 -->
-          <template v-if="ruleForm.isOnSiteCheck === '0'">
-            <el-col :span="6">
-              <el-form-item label="预计送达时间" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="ruleForm.planDeliverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="预计送达时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间" prop="requireOverTime">
-                <el-date-picker
-                  v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
-          </template>
+            <!-- 现场检定- 是 -->
+            <template v-if="ruleForm.isOnSiteCheck === '1'">
+              <el-col :span="6">
+                <el-form-item label="现场检定时间" prop="onSiteCheckTime">
+                  <el-date-picker
+                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
+            <!-- 现场检定- 否 -->
+            <template v-if="ruleForm.isOnSiteCheck === '0'">
+              <el-col :span="6">
+                <el-form-item label="预计送达时间" prop="planDeliverTime">
+                  <el-date-picker
+                    v-model="ruleForm.planDeliverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="预计送达时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="要求检完时间" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
           <!-- <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <el-date-picker
@@ -503,57 +517,59 @@
               />
             </el-form-item>
           </el-col> -->
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="电话" prop="customerPhone">
-              <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否加急" prop="isUrgent">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
-              <el-select v-model="ruleForm.isUrgent" placeholder="是否加急" style="width: 100%;">
-                <el-option v-for="item in isUrgentList" :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="measureCompany">
-              <!-- <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled /> -->
-              <el-select v-model="ruleForm.measureCompany" filterable placeholder="检定(校准)单位" style="width: 100%;">
-                <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="电话" prop="customerPhone">
+                <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否加急" prop="isUrgent">
+                <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
+                <el-select v-model="ruleForm.isUrgent" placeholder="是否加急" style="width: 100%;">
+                  <el-option v-for="item in isUrgentList" :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="measureCompany">
+                <!-- <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled /> -->
+                <el-select v-model="ruleForm.measureCompany" filterable placeholder="检定(校准)单位" style="width: 100%;">
+                  <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           <!-- <el-col :span="6">
             <el-form-item label="检修专业" prop="maintainMajor">
               <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
             </el-form-item>
           </el-col> -->
-        </el-row>
-        <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="接收状态">
-              <el-input v-model.trim="ruleForm.receiveStatusName" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="接收说明">
-              <el-input v-model.trim="ruleForm.receiveIllustrate" />
-            </el-form-item>
-          </el-col>
+          </el-row>
+          <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="接收状态">
+                <el-input v-model.trim="ruleForm.receiveStatusName" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="接收说明">
+                <el-input v-model.trim="ruleForm.receiveIllustrate" />
+              </el-form-item>
+            </el-col>
           <!-- <el-col :span="6">
             <el-form-item label="交接单" prop="undertakeTime">
               <a />
             </el-form-item>
           </el-col> -->
-        </el-row>
-      </el-form>
-    </detail-block-com>
-    <detail-block-com>
-      <table-list ref="tableRef" :data="ruleForm.customerSampleInfoList" :form="ruleForm" :status="dialogStatus" />
-    </detail-block-com>
+          </el-row>
+        </el-form>
+      </detail-block-com>
+      <detail-block-com>
+        <table-list ref="tableRef" :data="ruleForm.customerSampleInfoList" :form="ruleForm" :status="dialogStatus" />
+      </detail-block-com>
+    </template>
+    <approval-record-table v-if="activeName === '审批详情'" :process-id="processId" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue
new file mode 100644
index 0000000..1085613
--- /dev/null
+++ b/src/views/tested/status/borrow/components/edit.vue
@@ -0,0 +1,3 @@
+<template>
+  借用
+</template>
diff --git a/src/views/tested/status/borrow/index.vue b/src/views/tested/status/borrow/index.vue
new file mode 100644
index 0000000..1085613
--- /dev/null
+++ b/src/views/tested/status/borrow/index.vue
@@ -0,0 +1,3 @@
+<template>
+  借用
+</template>

diff --git a/src/api/eqpt/status/borrow.ts b/src/api/eqpt/status/borrow.ts
new file mode 100644
index 0000000..9d8370e
--- /dev/null
+++ b/src/api/eqpt/status/borrow.ts
@@ -0,0 +1,81 @@
+// 借用申请
+import request from '@/api/index'
+
+// 不同状态的列表
+export function getListPage(params: any, statusName: string) {
+  if (statusName === '全部') {
+    return request({
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+}
+// 保存编辑
+export function editStatus(data: object) {
+  return request({
+    url: '/status/approval/saveOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/status/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteStatus(id: string) {
+  return request({
+    url: `/status/approval/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/status/approval/cancel',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailStatus(params: object) {
+  return request({
+    url: '/status/approval/detail',
+    method: 'get',
+    params,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/status/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/eqpt/status/maintain.ts b/src/api/eqpt/status/maintain.ts
new file mode 100644
index 0000000..a2c94a2
--- /dev/null
+++ b/src/api/eqpt/status/maintain.ts
@@ -0,0 +1,40 @@
+// 故障维修接口
+import request from '@/api/index'
+
+export function getMaintainListPage(params: any) {
+  return request({
+    url: `/maintain/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function updateMaintain(data: object) {
+  return request({
+    url: '/maintain/update',
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addMaintain(data: object) {
+  return request({
+    url: '/maintain/add',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailMaintain(data: object) {
+  return request({
+    url: `/maintain/detail?id=${data.id}`,
+    method: 'get',
+  })
+}
+// 删除
+export function deleteMaintain(id: string) {
+  return request({
+    url: `/maintain/delete?id=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index fe0b97b..281be40 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -811,6 +811,80 @@
           },
         ],
       },
+      {
+        path: '/maintainlist',
+        component: Layout,
+        redirect: '/maintainpage',
+        name: 'MaintainList',
+        meta: {
+          title: '故障维修',
+          icon: 'ep:key',
+          auth: '/tested/status/maintain',
+        },
+        children: [
+          {
+            path: '/maintainpage',
+            name: 'MaintainPage',
+            component: () => import('@/views/tested/status/maintain/index.vue'),
+            meta: {
+              title: '故障维修',
+              auth: '/tested/status/maintain',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/maintainlist',
+            },
+          },
+          {
+            path: '/maintainpage/:type',
+            name: 'maintainEdit',
+            component: () => import('@/views/tested/status/maintain/components/edit.vue'),
+            meta: {
+              title: '故障维修',
+              auth: '/tested/status/maintain',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/maintainlist',
+            },
+          },
+        ],
+      },
+      {
+        path: '/borrowlist',
+        component: Layout,
+        redirect: '/borrowpage',
+        name: 'BorrwoList',
+        meta: {
+          title: '借用申请',
+          icon: 'ep:key',
+          auth: '/tested/status/borrow',
+        },
+        children: [
+          {
+            path: '/borrowpage',
+            name: 'BorrowPage',
+            component: () => import('@/views/tested/status/borrow/index.vue'),
+            meta: {
+              title: '借用申请',
+              auth: '/tested/status/borrow',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/borrowlist',
+            },
+          },
+          {
+            path: '/borrowpage/:type',
+            name: 'borrowpageEdit',
+            component: () => import('@/views/tested/status/borrow/components/edit.vue'),
+            meta: {
+              title: '借用申请',
+              auth: '/tested/status/borrow',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/borrowlist',
+            },
+          },
+        ],
+      },
     ],
   },
   // 文档管理
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 714cf00..afab766 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -80,6 +80,7 @@
   customerId: [{ required: true, message: '委托方必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
+const processId = ref()
 const isAdmin = ref(false)
 const companyList = ref<any[]>([]) // 单位列表
 const initDialog = () => {
@@ -114,6 +115,7 @@
       console.log(ruleForm.value, 'rule')
       ruleForm.value.isUrgent = String(res.data.data.isUrgent)
       ruleForm.value.isOnSiteCheck = String(res.data.data.isOnSiteCheck)
+      processId.value = ruleForm.value.processId
     })
   }
 }
@@ -348,6 +350,7 @@
     })
   })
 }
+const activeName = ref('基本信息')
 </script>
 
 <template>
@@ -391,27 +394,38 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com class="container">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="任务单编号">
-              <el-input v-model.trim="ruleForm.orderNo" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="送检人" prop="deliverer">
-              <el-input v-model.trim="ruleForm.deliverer" placeholder="送检人" />
+    <detail-block-com v-if="!$route.path.includes('create') && statusName !== '全部' && statusName !== '草稿箱'">
+      <el-radio-group v-model="activeName">
+        <el-radio-button label="基本信息">
+          基本信息
+        </el-radio-button>
+        <el-radio-button label="审批详情">
+          审批详情
+        </el-radio-button>
+      </el-radio-group>
+    </detail-block-com>
+    <template v-if="activeName === '基本信息'">
+      <detail-block-com class="container">
+        <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="任务单编号">
+                <el-input v-model.trim="ruleForm.orderNo" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建人">
+                <el-input v-model.trim="ruleForm.createUserName" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间">
+                <el-input v-model.trim="ruleForm.createTime" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人" prop="deliverer">
+                <el-input v-model.trim="ruleForm.deliverer" placeholder="送检人" />
               <!-- <el-select v-model="ruleForm.deliverer" filterable placeholder="送检人" style="width: 100%;">
                 <el-option
                   v-for="item in personList"
@@ -423,70 +437,70 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select> -->
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="委托方" prop="customerId">
-              <el-input v-if="!isAdmin" v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
-              <el-select v-else v-model="ruleForm.customerId" clearable filterable placeholder="委托方" style="width: 100%;">
-                <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="12">
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="委托方" prop="customerId">
+                <el-input v-if="!isAdmin" v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
+                <el-select v-else v-model="ruleForm.customerId" clearable filterable placeholder="委托方" style="width: 100%;">
+                  <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
           </el-col> -->
-          <!-- <el-col :span="6">
+            <!-- <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
-            <el-form-item label="是否现场检定" prop="isOnSiteCheck">
-              <el-radio-group v-model="ruleForm.isOnSiteCheck" class="ml-4">
-                <el-radio label="1">
-                  是
-                </el-radio>
-                <el-radio label="0">
-                  否
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <!-- 现场检定- 是 -->
-          <template v-if="ruleForm.isOnSiteCheck === '1'">
             <el-col :span="6">
-              <el-form-item label="现场检定时间" prop="onSiteCheckTime">
-                <el-date-picker
-                  v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
-                />
+              <el-form-item label="是否现场检定" prop="isOnSiteCheck">
+                <el-radio-group v-model="ruleForm.isOnSiteCheck" class="ml-4">
+                  <el-radio label="1">
+                    是
+                  </el-radio>
+                  <el-radio label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-          </template>
-          <!-- 现场检定- 否 -->
-          <template v-if="ruleForm.isOnSiteCheck === '0'">
-            <el-col :span="6">
-              <el-form-item label="预计送达时间" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="ruleForm.planDeliverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="预计送达时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间" prop="requireOverTime">
-                <el-date-picker
-                  v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
-          </template>
+            <!-- 现场检定- 是 -->
+            <template v-if="ruleForm.isOnSiteCheck === '1'">
+              <el-col :span="6">
+                <el-form-item label="现场检定时间" prop="onSiteCheckTime">
+                  <el-date-picker
+                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
+            <!-- 现场检定- 否 -->
+            <template v-if="ruleForm.isOnSiteCheck === '0'">
+              <el-col :span="6">
+                <el-form-item label="预计送达时间" prop="planDeliverTime">
+                  <el-date-picker
+                    v-model="ruleForm.planDeliverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="预计送达时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="要求检完时间" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
           <!-- <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <el-date-picker
@@ -503,57 +517,59 @@
               />
             </el-form-item>
           </el-col> -->
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="电话" prop="customerPhone">
-              <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否加急" prop="isUrgent">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
-              <el-select v-model="ruleForm.isUrgent" placeholder="是否加急" style="width: 100%;">
-                <el-option v-for="item in isUrgentList" :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="measureCompany">
-              <!-- <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled /> -->
-              <el-select v-model="ruleForm.measureCompany" filterable placeholder="检定(校准)单位" style="width: 100%;">
-                <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="电话" prop="customerPhone">
+                <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否加急" prop="isUrgent">
+                <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
+                <el-select v-model="ruleForm.isUrgent" placeholder="是否加急" style="width: 100%;">
+                  <el-option v-for="item in isUrgentList" :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="measureCompany">
+                <!-- <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled /> -->
+                <el-select v-model="ruleForm.measureCompany" filterable placeholder="检定(校准)单位" style="width: 100%;">
+                  <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           <!-- <el-col :span="6">
             <el-form-item label="检修专业" prop="maintainMajor">
               <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
             </el-form-item>
           </el-col> -->
-        </el-row>
-        <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="接收状态">
-              <el-input v-model.trim="ruleForm.receiveStatusName" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="接收说明">
-              <el-input v-model.trim="ruleForm.receiveIllustrate" />
-            </el-form-item>
-          </el-col>
+          </el-row>
+          <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="接收状态">
+                <el-input v-model.trim="ruleForm.receiveStatusName" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="接收说明">
+                <el-input v-model.trim="ruleForm.receiveIllustrate" />
+              </el-form-item>
+            </el-col>
           <!-- <el-col :span="6">
             <el-form-item label="交接单" prop="undertakeTime">
               <a />
             </el-form-item>
           </el-col> -->
-        </el-row>
-      </el-form>
-    </detail-block-com>
-    <detail-block-com>
-      <table-list ref="tableRef" :data="ruleForm.customerSampleInfoList" :form="ruleForm" :status="dialogStatus" />
-    </detail-block-com>
+          </el-row>
+        </el-form>
+      </detail-block-com>
+      <detail-block-com>
+        <table-list ref="tableRef" :data="ruleForm.customerSampleInfoList" :form="ruleForm" :status="dialogStatus" />
+      </detail-block-com>
+    </template>
+    <approval-record-table v-if="activeName === '审批详情'" :process-id="processId" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue
new file mode 100644
index 0000000..1085613
--- /dev/null
+++ b/src/views/tested/status/borrow/components/edit.vue
@@ -0,0 +1,3 @@
+<template>
+  借用
+</template>
diff --git a/src/views/tested/status/borrow/index.vue b/src/views/tested/status/borrow/index.vue
new file mode 100644
index 0000000..1085613
--- /dev/null
+++ b/src/views/tested/status/borrow/index.vue
@@ -0,0 +1,3 @@
+<template>
+  借用
+</template>
diff --git a/src/views/tested/status/maintain/components/edit.vue b/src/views/tested/status/maintain/components/edit.vue
new file mode 100644
index 0000000..0dce97f
--- /dev/null
+++ b/src/views/tested/status/maintain/components/edit.vue
@@ -0,0 +1,227 @@
+<!-- 故障维修新建修改页面 -->
+<script lang="ts" setup name="MainTainEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
+import { addMaintain, detailMaintain, updateMaintain } from '@/api/eqpt/status/maintain'
+import useUserStore from '@/store/modules/user'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+import annexList from '@/views/tested/status/delay/components/annexList.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const dialogStatus = ref('create')
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+const ruleForm = ref({
+  attachments: [],
+  companyId: '',
+  companyName: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  deptId: '',
+  deptName: '',
+  equipmentId: '',
+  equipmentName: '',
+  equipmentNo: '',
+  faultDescription: '',
+  id: '',
+  maintainContent: '',
+  manufactureNo: '',
+  model: '',
+  remark: '',
+  updateTime: '',
+  usePosition: '',
+  usePositionId: '',
+  manufacturer: '',
+})
+// 表单1验证规则
+const rules = ref<FormRules>({
+  equipmentNo: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+  faultDescription: [{ required: true, message: '故障描述必填', trigger: ['blur', 'change'] }],
+  maintainContent: [{ required: true, message: '维修内容必填', trigger: ['blur', 'change'] }],
+})
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  if (!$route.path.includes('create')) {
+    detailMaintain({ id: $route.query.id as string }).then((res) => {
+      ruleForm.value = res.data
+    })
+  }
+  else {
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新建
+const createRow = () => {
+  addMaintain(ruleForm.value).then(() => {
+    ElMessage.success('添加成功')
+    close()
+  })
+}
+// 编辑
+const updateRow = () => {
+  updateMaintain(ruleForm.value).then(() => {
+    ElMessage.success('添加成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  Promise.all([Promise.all([formEl.validate()])]).then(() => {
+    // 验证表格
+    ElMessageBox.confirm(
+      '确认保存吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then((res) => {
+      if (dialogStatus.value === 'create') {
+        createRow()
+      }
+      else {
+        updateRow()
+      }
+    })
+  })
+}
+// 选择设备
+const deviceRef = ref()
+const selectDeviceFun = () => {
+  deviceRef.value.initDialog()
+}
+const confirm = (row: any) => {
+  const data = row
+  console.log(row, 'rowrowrow')
+  ruleForm.value.equipmentNo = data.equipmentNo
+  ruleForm.value.equipmentName = data.equipmentName
+  ruleForm.value.equipmentId = data.id
+  ruleForm.value.model = data.model
+  ruleForm.value.companyName = data.companyName
+  ruleForm.value.companyId = data.companyId
+  // ruleForm.value.productCountry = data.productCountry
+  ruleForm.value.manufacturer = data.manufacturer
+  ruleForm.value.manufactureNo = data.manufactureNo
+  // ruleForm.value.productDate = data.productDate
+  // ruleForm.value.productDate = data.productDate
+  ruleForm.value.manufactureNo = data.manufactureNo
+  ruleForm.value.deptId = data.deptId
+  ruleForm.value.deptName = data.deptName
+  ruleForm.value.companyName = data.companyName
+  ruleForm.value.usePosition = data.usePosition
+  ruleForm.value.usePositionId = data.usePositionId
+  // 获取设备 技术指标信息
+  getInfoDetail({ equipmentId: row.id }).then((res) => {
+    ruleForm.value.attachments = res.data.attachments
+  })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 选择设备弹窗 -->
+    <select-device ref="deviceRef" :limit="10" :need-status="true" status-type="custom" @add="confirm" />
+    <detail-page class="base-info-device" :title="`故障维修-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <el-form
+      ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
+      :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+    >
+      <detail-block-com>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="统一编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="" @focus="selectDeviceFun">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDeviceFun">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="$route.path.includes('create') ? '设备名称' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号" prop="model">
+              <el-input v-model.trim="ruleForm.model" :placeholder="$route.path.includes('create') ? '规格型号' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model.trim="ruleForm.manufactureNo" :placeholder="$route.path.includes('create') ? '出厂编号' : ''" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="$route.path.includes('create') ? '生产厂家' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="所在单位">
+              <el-input v-model.trim="ruleForm.companyName" :placeholder="$route.path.includes('create') ? '所在单位' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用部门">
+              <el-input v-model.trim="ruleForm.deptName" :placeholder="$route.path.includes('create') ? '使用部门' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用岗位">
+              <el-input v-model.trim="ruleForm.usePosition" :placeholder="$route.path.includes('create') ? '使用岗位' : ''" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="维修内容" prop="maintainContent">
+              <el-input v-model="ruleForm.maintainContent" :placeholder="$route.path.includes('create') ? '维修内容' : ''" :rows="1" type="textarea" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="故障描述" prop="faultDescription">
+              <el-input v-model="ruleForm.faultDescription" :placeholder="$route.path.includes('create') ? '故障描述' : ''" :rows="3" type="textarea" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </detail-block-com>
+      <detail-block-com v-if="ruleForm.attachments.length">
+        <annex-list ref="annexRef" :data="ruleForm.attachments" :status="$route.params.type as string" />
+      </detail-block-com>
+    </el-form>
+  </app-container>
+</template>

diff --git a/src/api/eqpt/status/borrow.ts b/src/api/eqpt/status/borrow.ts
new file mode 100644
index 0000000..9d8370e
--- /dev/null
+++ b/src/api/eqpt/status/borrow.ts
@@ -0,0 +1,81 @@
+// 借用申请
+import request from '@/api/index'
+
+// 不同状态的列表
+export function getListPage(params: any, statusName: string) {
+  if (statusName === '全部') {
+    return request({
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+}
+// 保存编辑
+export function editStatus(data: object) {
+  return request({
+    url: '/status/approval/saveOrUpdate',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/status/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 删除记录
+export function deleteStatus(id: string) {
+  return request({
+    url: `/status/approval/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/status/approval/cancel',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailStatus(params: object) {
+  return request({
+    url: '/status/approval/detail',
+    method: 'get',
+    params,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/status/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/eqpt/status/maintain.ts b/src/api/eqpt/status/maintain.ts
new file mode 100644
index 0000000..a2c94a2
--- /dev/null
+++ b/src/api/eqpt/status/maintain.ts
@@ -0,0 +1,40 @@
+// 故障维修接口
+import request from '@/api/index'
+
+export function getMaintainListPage(params: any) {
+  return request({
+    url: `/maintain/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 编辑
+export function updateMaintain(data: object) {
+  return request({
+    url: '/maintain/update',
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addMaintain(data: object) {
+  return request({
+    url: '/maintain/add',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailMaintain(data: object) {
+  return request({
+    url: `/maintain/detail?id=${data.id}`,
+    method: 'get',
+  })
+}
+// 删除
+export function deleteMaintain(id: string) {
+  return request({
+    url: `/maintain/delete?id=${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index fe0b97b..281be40 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -811,6 +811,80 @@
           },
         ],
       },
+      {
+        path: '/maintainlist',
+        component: Layout,
+        redirect: '/maintainpage',
+        name: 'MaintainList',
+        meta: {
+          title: '故障维修',
+          icon: 'ep:key',
+          auth: '/tested/status/maintain',
+        },
+        children: [
+          {
+            path: '/maintainpage',
+            name: 'MaintainPage',
+            component: () => import('@/views/tested/status/maintain/index.vue'),
+            meta: {
+              title: '故障维修',
+              auth: '/tested/status/maintain',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/maintainlist',
+            },
+          },
+          {
+            path: '/maintainpage/:type',
+            name: 'maintainEdit',
+            component: () => import('@/views/tested/status/maintain/components/edit.vue'),
+            meta: {
+              title: '故障维修',
+              auth: '/tested/status/maintain',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/maintainlist',
+            },
+          },
+        ],
+      },
+      {
+        path: '/borrowlist',
+        component: Layout,
+        redirect: '/borrowpage',
+        name: 'BorrwoList',
+        meta: {
+          title: '借用申请',
+          icon: 'ep:key',
+          auth: '/tested/status/borrow',
+        },
+        children: [
+          {
+            path: '/borrowpage',
+            name: 'BorrowPage',
+            component: () => import('@/views/tested/status/borrow/index.vue'),
+            meta: {
+              title: '借用申请',
+              auth: '/tested/status/borrow',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/borrowlist',
+            },
+          },
+          {
+            path: '/borrowpage/:type',
+            name: 'borrowpageEdit',
+            component: () => import('@/views/tested/status/borrow/components/edit.vue'),
+            meta: {
+              title: '借用申请',
+              auth: '/tested/status/borrow',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/borrowlist',
+            },
+          },
+        ],
+      },
     ],
   },
   // 文档管理
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 714cf00..afab766 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -80,6 +80,7 @@
   customerId: [{ required: true, message: '委托方必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
+const processId = ref()
 const isAdmin = ref(false)
 const companyList = ref<any[]>([]) // 单位列表
 const initDialog = () => {
@@ -114,6 +115,7 @@
       console.log(ruleForm.value, 'rule')
       ruleForm.value.isUrgent = String(res.data.data.isUrgent)
       ruleForm.value.isOnSiteCheck = String(res.data.data.isOnSiteCheck)
+      processId.value = ruleForm.value.processId
     })
   }
 }
@@ -348,6 +350,7 @@
     })
   })
 }
+const activeName = ref('基本信息')
 </script>
 
 <template>
@@ -391,27 +394,38 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com class="container">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="任务单编号">
-              <el-input v-model.trim="ruleForm.orderNo" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="送检人" prop="deliverer">
-              <el-input v-model.trim="ruleForm.deliverer" placeholder="送检人" />
+    <detail-block-com v-if="!$route.path.includes('create') && statusName !== '全部' && statusName !== '草稿箱'">
+      <el-radio-group v-model="activeName">
+        <el-radio-button label="基本信息">
+          基本信息
+        </el-radio-button>
+        <el-radio-button label="审批详情">
+          审批详情
+        </el-radio-button>
+      </el-radio-group>
+    </detail-block-com>
+    <template v-if="activeName === '基本信息'">
+      <detail-block-com class="container">
+        <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="任务单编号">
+                <el-input v-model.trim="ruleForm.orderNo" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建人">
+                <el-input v-model.trim="ruleForm.createUserName" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间">
+                <el-input v-model.trim="ruleForm.createTime" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人" prop="deliverer">
+                <el-input v-model.trim="ruleForm.deliverer" placeholder="送检人" />
               <!-- <el-select v-model="ruleForm.deliverer" filterable placeholder="送检人" style="width: 100%;">
                 <el-option
                   v-for="item in personList"
@@ -423,70 +437,70 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select> -->
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="委托方" prop="customerId">
-              <el-input v-if="!isAdmin" v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
-              <el-select v-else v-model="ruleForm.customerId" clearable filterable placeholder="委托方" style="width: 100%;">
-                <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="12">
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="委托方" prop="customerId">
+                <el-input v-if="!isAdmin" v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
+                <el-select v-else v-model="ruleForm.customerId" clearable filterable placeholder="委托方" style="width: 100%;">
+                  <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
           </el-col> -->
-          <!-- <el-col :span="6">
+            <!-- <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
-            <el-form-item label="是否现场检定" prop="isOnSiteCheck">
-              <el-radio-group v-model="ruleForm.isOnSiteCheck" class="ml-4">
-                <el-radio label="1">
-                  是
-                </el-radio>
-                <el-radio label="0">
-                  否
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <!-- 现场检定- 是 -->
-          <template v-if="ruleForm.isOnSiteCheck === '1'">
             <el-col :span="6">
-              <el-form-item label="现场检定时间" prop="onSiteCheckTime">
-                <el-date-picker
-                  v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
-                />
+              <el-form-item label="是否现场检定" prop="isOnSiteCheck">
+                <el-radio-group v-model="ruleForm.isOnSiteCheck" class="ml-4">
+                  <el-radio label="1">
+                    是
+                  </el-radio>
+                  <el-radio label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-          </template>
-          <!-- 现场检定- 否 -->
-          <template v-if="ruleForm.isOnSiteCheck === '0'">
-            <el-col :span="6">
-              <el-form-item label="预计送达时间" prop="planDeliverTime">
-                <el-date-picker
-                  v-model="ruleForm.planDeliverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="预计送达时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间" prop="requireOverTime">
-                <el-date-picker
-                  v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
-          </template>
+            <!-- 现场检定- 是 -->
+            <template v-if="ruleForm.isOnSiteCheck === '1'">
+              <el-col :span="6">
+                <el-form-item label="现场检定时间" prop="onSiteCheckTime">
+                  <el-date-picker
+                    v-model="ruleForm.onSiteCheckTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="现场检定时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
+            <!-- 现场检定- 否 -->
+            <template v-if="ruleForm.isOnSiteCheck === '0'">
+              <el-col :span="6">
+                <el-form-item label="预计送达时间" prop="planDeliverTime">
+                  <el-date-picker
+                    v-model="ruleForm.planDeliverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="预计送达时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="要求检完时间" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="ruleForm.requireOverTime" type="date" format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD" placeholder="要求检完时间" class="normal-date" style="width: 100%;"
+                  />
+                </el-form-item>
+              </el-col>
+            </template>
           <!-- <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <el-date-picker
@@ -503,57 +517,59 @@
               />
             </el-form-item>
           </el-col> -->
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="电话" prop="customerPhone">
-              <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否加急" prop="isUrgent">
-              <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
-              <el-select v-model="ruleForm.isUrgent" placeholder="是否加急" style="width: 100%;">
-                <el-option v-for="item in isUrgentList" :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="measureCompany">
-              <!-- <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled /> -->
-              <el-select v-model="ruleForm.measureCompany" filterable placeholder="检定(校准)单位" style="width: 100%;">
-                <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="电话" prop="customerPhone">
+                <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否加急" prop="isUrgent">
+                <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
+                <el-select v-model="ruleForm.isUrgent" placeholder="是否加急" style="width: 100%;">
+                  <el-option v-for="item in isUrgentList" :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="measureCompany">
+                <!-- <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled /> -->
+                <el-select v-model="ruleForm.measureCompany" filterable placeholder="检定(校准)单位" style="width: 100%;">
+                  <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           <!-- <el-col :span="6">
             <el-form-item label="检修专业" prop="maintainMajor">
               <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
             </el-form-item>
           </el-col> -->
-        </el-row>
-        <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="接收状态">
-              <el-input v-model.trim="ruleForm.receiveStatusName" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="接收说明">
-              <el-input v-model.trim="ruleForm.receiveIllustrate" />
-            </el-form-item>
-          </el-col>
+          </el-row>
+          <el-row v-if="$route.path.includes('detail') && $route.query.statusName === '全部'" :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="接收状态">
+                <el-input v-model.trim="ruleForm.receiveStatusName" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="接收说明">
+                <el-input v-model.trim="ruleForm.receiveIllustrate" />
+              </el-form-item>
+            </el-col>
           <!-- <el-col :span="6">
             <el-form-item label="交接单" prop="undertakeTime">
               <a />
             </el-form-item>
           </el-col> -->
-        </el-row>
-      </el-form>
-    </detail-block-com>
-    <detail-block-com>
-      <table-list ref="tableRef" :data="ruleForm.customerSampleInfoList" :form="ruleForm" :status="dialogStatus" />
-    </detail-block-com>
+          </el-row>
+        </el-form>
+      </detail-block-com>
+      <detail-block-com>
+        <table-list ref="tableRef" :data="ruleForm.customerSampleInfoList" :form="ruleForm" :status="dialogStatus" />
+      </detail-block-com>
+    </template>
+    <approval-record-table v-if="activeName === '审批详情'" :process-id="processId" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue
new file mode 100644
index 0000000..1085613
--- /dev/null
+++ b/src/views/tested/status/borrow/components/edit.vue
@@ -0,0 +1,3 @@
+<template>
+  借用
+</template>
diff --git a/src/views/tested/status/borrow/index.vue b/src/views/tested/status/borrow/index.vue
new file mode 100644
index 0000000..1085613
--- /dev/null
+++ b/src/views/tested/status/borrow/index.vue
@@ -0,0 +1,3 @@
+<template>
+  借用
+</template>
diff --git a/src/views/tested/status/maintain/components/edit.vue b/src/views/tested/status/maintain/components/edit.vue
new file mode 100644
index 0000000..0dce97f
--- /dev/null
+++ b/src/views/tested/status/maintain/components/edit.vue
@@ -0,0 +1,227 @@
+<!-- 故障维修新建修改页面 -->
+<script lang="ts" setup name="MainTainEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
+import { addMaintain, detailMaintain, updateMaintain } from '@/api/eqpt/status/maintain'
+import useUserStore from '@/store/modules/user'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+import annexList from '@/views/tested/status/delay/components/annexList.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+// 显示标题
+const dialogStatus = ref('create')
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+const ruleForm = ref({
+  attachments: [],
+  companyId: '',
+  companyName: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  deptId: '',
+  deptName: '',
+  equipmentId: '',
+  equipmentName: '',
+  equipmentNo: '',
+  faultDescription: '',
+  id: '',
+  maintainContent: '',
+  manufactureNo: '',
+  model: '',
+  remark: '',
+  updateTime: '',
+  usePosition: '',
+  usePositionId: '',
+  manufacturer: '',
+})
+// 表单1验证规则
+const rules = ref<FormRules>({
+  equipmentNo: [{ required: true, message: '设备必选', trigger: ['blur', 'change'] }],
+  faultDescription: [{ required: true, message: '故障描述必填', trigger: ['blur', 'change'] }],
+  maintainContent: [{ required: true, message: '维修内容必填', trigger: ['blur', 'change'] }],
+})
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  if (!$route.path.includes('create')) {
+    detailMaintain({ id: $route.query.id as string }).then((res) => {
+      ruleForm.value = res.data
+    })
+  }
+  else {
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 新建
+const createRow = () => {
+  addMaintain(ruleForm.value).then(() => {
+    ElMessage.success('添加成功')
+    close()
+  })
+}
+// 编辑
+const updateRow = () => {
+  updateMaintain(ruleForm.value).then(() => {
+    ElMessage.success('添加成功')
+    close()
+  })
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  Promise.all([Promise.all([formEl.validate()])]).then(() => {
+    // 验证表格
+    ElMessageBox.confirm(
+      '确认保存吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then((res) => {
+      if (dialogStatus.value === 'create') {
+        createRow()
+      }
+      else {
+        updateRow()
+      }
+    })
+  })
+}
+// 选择设备
+const deviceRef = ref()
+const selectDeviceFun = () => {
+  deviceRef.value.initDialog()
+}
+const confirm = (row: any) => {
+  const data = row
+  console.log(row, 'rowrowrow')
+  ruleForm.value.equipmentNo = data.equipmentNo
+  ruleForm.value.equipmentName = data.equipmentName
+  ruleForm.value.equipmentId = data.id
+  ruleForm.value.model = data.model
+  ruleForm.value.companyName = data.companyName
+  ruleForm.value.companyId = data.companyId
+  // ruleForm.value.productCountry = data.productCountry
+  ruleForm.value.manufacturer = data.manufacturer
+  ruleForm.value.manufactureNo = data.manufactureNo
+  // ruleForm.value.productDate = data.productDate
+  // ruleForm.value.productDate = data.productDate
+  ruleForm.value.manufactureNo = data.manufactureNo
+  ruleForm.value.deptId = data.deptId
+  ruleForm.value.deptName = data.deptName
+  ruleForm.value.companyName = data.companyName
+  ruleForm.value.usePosition = data.usePosition
+  ruleForm.value.usePositionId = data.usePositionId
+  // 获取设备 技术指标信息
+  getInfoDetail({ equipmentId: row.id }).then((res) => {
+    ruleForm.value.attachments = res.data.attachments
+  })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 选择设备弹窗 -->
+    <select-device ref="deviceRef" :limit="10" :need-status="true" status-type="custom" @add="confirm" />
+    <detail-page class="base-info-device" :title="`故障维修-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <el-form
+      ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
+      :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+    >
+      <detail-block-com>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="统一编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="" @focus="selectDeviceFun">
+                <template v-if="!$route.path.includes('detail')" #append>
+                  <span @click="selectDeviceFun">选择</span>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="$route.path.includes('create') ? '设备名称' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号" prop="model">
+              <el-input v-model.trim="ruleForm.model" :placeholder="$route.path.includes('create') ? '规格型号' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model.trim="ruleForm.manufactureNo" :placeholder="$route.path.includes('create') ? '出厂编号' : ''" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="$route.path.includes('create') ? '生产厂家' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="所在单位">
+              <el-input v-model.trim="ruleForm.companyName" :placeholder="$route.path.includes('create') ? '所在单位' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用部门">
+              <el-input v-model.trim="ruleForm.deptName" :placeholder="$route.path.includes('create') ? '使用部门' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用岗位">
+              <el-input v-model.trim="ruleForm.usePosition" :placeholder="$route.path.includes('create') ? '使用岗位' : ''" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="维修内容" prop="maintainContent">
+              <el-input v-model="ruleForm.maintainContent" :placeholder="$route.path.includes('create') ? '维修内容' : ''" :rows="1" type="textarea" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="故障描述" prop="faultDescription">
+              <el-input v-model="ruleForm.faultDescription" :placeholder="$route.path.includes('create') ? '故障描述' : ''" :rows="3" type="textarea" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </detail-block-com>
+      <detail-block-com v-if="ruleForm.attachments.length">
+        <annex-list ref="annexRef" :data="ruleForm.attachments" :status="$route.params.type as string" />
+      </detail-block-com>
+    </el-form>
+  </app-container>
+</template>
diff --git a/src/views/tested/status/maintain/index.vue b/src/views/tested/status/maintain/index.vue
new file mode 100644
index 0000000..a0378c7
--- /dev/null
+++ b/src/views/tested/status/maintain/index.vue
@@ -0,0 +1,311 @@
+<!-- 故障维修列表页 -->
+<script lang="ts" setup name="DeviceMainList">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { deleteMaintain, getMaintainListPage } from '@/api/eqpt/status/maintain'
+import { getDeviceNameList, getModelAllList } from '@/api/eqpt/device/model'
+import { getPostList } from '@/api/system/post'
+import { getAdminDept, getUserDept } from '@/api/system/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 查询条件
+const listQuery = reactive({
+  manufactureNo: '',
+  usePositionId: '',
+  createUserName: '',
+  createTimeStart: '',
+  createTimeEnd: '',
+  deptId: '',
+  companyId: '',
+  equipmentName: '',
+  model: '',
+  offset: 1,
+  limit: 20,
+})
+// 申请开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '规格型号',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+    align: 'center',
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+    align: 'center',
+  },
+  {
+    text: '所在单位',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '使用岗位',
+    value: 'usePosition',
+    align: 'center',
+  },
+  {
+    text: '维修内容',
+    value: 'maintainContent',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getMaintainListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+search()
+// 重置
+const reset = () => {
+  datetimerange.value = ''
+  listQuery.manufactureNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.usePositionId = ''
+  listQuery.equipmentName = ''
+  listQuery.createUserName = ''
+  listQuery.companyId = ''
+  listQuery.deptId = ''
+  listQuery.model = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+// 新建编辑等
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/maintainpage/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const del = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteMaintain(row.id).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 获取字典
+// 设备名称
+const deviceNameList = ref<string[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+const modelListAll = ref<any[]>([])
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 使用部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+const fetchDict = () => {
+// 设备名称
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({ equipmentType: '1' }).then((res) => {
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    modelListAll.value = res.data
+  })
+  // 单位
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+}
+fetchDict()
+watch(() => listQuery.equipmentName, (newVal) => {
+  listQuery.model = ''
+  if (newVal) {
+    modelList.value = Array.from(new Set(modelListAll.value.filter((item: any) => item.equipmentName === newVal && item.model).map((item: any) => item.model))).sort()
+  }
+  else {
+    modelList.value = Array.from(new Set(modelListAll.value.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+  }
+})
+// 监听单位，修改部门
+watch(() => listQuery.companyId, (newVal) => {
+  listQuery.deptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.deptId"
+          style="width: 100%;"
+          :data="deptList"
+          :render-after-expand="false"
+          check-strictly
+          placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.usePositionId" filterable clearable placeholder="使用岗位">
+          <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <!-- v-if="proxy.hasPerm(permUrl.add)" -->
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="listLoading" :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="160" align="center">
+            <template #default=" scope ">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+