diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index ea79535..8771c29 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,10 +1,34 @@
 // 状态管理相关接口api
 import request from '../index'
 // 设备申请列表
-export function getApplyList(data: any) {
+export function getStatusList(data: any) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
+// 状态管理新建
+export function addStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/addStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理删除
+export function deleteStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/deleteStateManageList',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理详情
+export function detailStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/selectStateManageInfo',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index ea79535..8771c29 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,10 +1,34 @@
 // 状态管理相关接口api
 import request from '../index'
 // 设备申请列表
-export function getApplyList(data: any) {
+export function getStatusList(data: any) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
+// 状态管理新建
+export function addStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/addStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理删除
+export function deleteStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/deleteStateManageList',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理详情
+export function detailStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/selectStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
deleted file mode 100644
index 7c087f8..0000000
--- a/src/components/SelectTree/index.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
-      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
-      TreeProps类型  {value:'id',babel:'name',children:'children'}
-      最好是 符合elementui类型的树形结构
-       -->
-<!-- 树状选择器 -->
-<script lang="ts">
-import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import type { PropType } from 'vue'
-import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
-interface PropsIter {
-  value: string
-  label: string
-  children: string
-  disabled?: boolean
-}
-interface TreeIter {
-  id: string
-  label: string
-  children?: TreeIter[]
-}
-export default defineComponent({
-  props: {
-    // 组件绑定的options
-    options: {
-      type: Array as PropType<TreeIter[]>,
-      required: true,
-    },
-    // 配置选项
-    keyProps: Object as PropType<PropsIter>,
-    // 双向绑定值
-    modelValue: [String, Number],
-    // 组件样式宽
-    width: {
-      type: String,
-      default: '240px',
-    },
-    // 空占位字符
-    placeholder: String,
-    // eslint-disable-next-line vue/prop-name-casing
-    TreeProps: {
-      type: Object,
-      default: () => { return {} },
-    },
-  },
-  setup(props, { emit }) {
-    const { modelValue } = toRefs(props)
-    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
-      value: modelValue.value,
-      currentNodeKey: '',
-      currentNodeLabel: '',
-    })
-    const treeSelect = ref<HTMLElement | null>(null)
-    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
-      select.currentNodeKey = data.id
-      select.currentNodeLabel = data.label || data.name
-      select.value = data.id;
-      (treeSelect.value as any).blur()
-      emit('update:modelValue', select.value)
-    }
-    // 筛选方法
-    const treeV2: any = ref<HTMLElement | null>(null)
-    const selectFilter = (query: string) => {
-      treeV2.value.filter(query)
-    }
-    // 筛选方法
-    const treeFilter = (query: string, node: TreeNode) => {
-      return node.label?.indexOf(query) !== -1
-    }
-    // 直接清空选择数据
-    const clearSelected = () => {
-      select.currentNodeKey = ''
-      select.currentNodeLabel = ''
-      select.value = ''
-      emit('update:modelValue', undefined)
-    }
-    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
-    const setCurrent = () => {
-      select.currentNodeKey = select.value
-      treeV2.value.setCurrentKey(select.value)
-      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
-      select.currentNodeLabel = data?.label || data?.name
-    }
-    // 监听外部清空数据源 清空组件数据
-    watch(modelValue, (v) => {
-      if (v === undefined && select.currentNodeKey !== '') {
-        clearSelected()
-      }
-      // 动态赋值
-      if (v) {
-        select.value = v
-        setCurrent()
-      }
-    })
-    // 回显数据
-    onMounted(async () => {
-      await nextTick()
-      if (select.value) {
-        setCurrent()
-      }
-    })
-    const TreeProps = toRefs(props)
-    return {
-      treeSelect,
-      treeV2,
-      // eslint-disable-next-line vue/no-dupe-keys
-      TreeProps,
-      ...toRefs(select),
-      nodeClick,
-      selectFilter,
-      treeFilter,
-      clearSelected,
-    }
-  },
-})
-</script>
-
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.tree_box {
-  width: 214px;
-}
-
-.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
-  height: auto;
-  max-height: 274px;
-  padding: 0;
-  overflow: hidden;
-  overflow-y: auto;
-}
-
-.el-select-dropdown__item.selected {
-  font-weight: normal;
-}
-
-ul li :deep(.el-tree .el-tree-node__content) {
-  height: auto;
-  padding: 0 20px;
-}
-
-.el-tree-node__label {
-  font-weight: normal;
-}
-
-.el-tree :deep(.is-current .el-tree-node__label) {
-  color: #409eff;
-  font-weight: 700;
-}
-
-.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
-  color: #606266;
-  font-weight: normal;
-}
-
-.selectInput {
-  padding: 0 5px;
-  box-sizing: border-box;
-}
-
-.el-select {
-  width: 100% !important;
-}
-</style>
-

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index ea79535..8771c29 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,10 +1,34 @@
 // 状态管理相关接口api
 import request from '../index'
 // 设备申请列表
-export function getApplyList(data: any) {
+export function getStatusList(data: any) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
+// 状态管理新建
+export function addStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/addStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理删除
+export function deleteStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/deleteStateManageList',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理详情
+export function detailStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/selectStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
deleted file mode 100644
index 7c087f8..0000000
--- a/src/components/SelectTree/index.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
-      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
-      TreeProps类型  {value:'id',babel:'name',children:'children'}
-      最好是 符合elementui类型的树形结构
-       -->
-<!-- 树状选择器 -->
-<script lang="ts">
-import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import type { PropType } from 'vue'
-import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
-interface PropsIter {
-  value: string
-  label: string
-  children: string
-  disabled?: boolean
-}
-interface TreeIter {
-  id: string
-  label: string
-  children?: TreeIter[]
-}
-export default defineComponent({
-  props: {
-    // 组件绑定的options
-    options: {
-      type: Array as PropType<TreeIter[]>,
-      required: true,
-    },
-    // 配置选项
-    keyProps: Object as PropType<PropsIter>,
-    // 双向绑定值
-    modelValue: [String, Number],
-    // 组件样式宽
-    width: {
-      type: String,
-      default: '240px',
-    },
-    // 空占位字符
-    placeholder: String,
-    // eslint-disable-next-line vue/prop-name-casing
-    TreeProps: {
-      type: Object,
-      default: () => { return {} },
-    },
-  },
-  setup(props, { emit }) {
-    const { modelValue } = toRefs(props)
-    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
-      value: modelValue.value,
-      currentNodeKey: '',
-      currentNodeLabel: '',
-    })
-    const treeSelect = ref<HTMLElement | null>(null)
-    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
-      select.currentNodeKey = data.id
-      select.currentNodeLabel = data.label || data.name
-      select.value = data.id;
-      (treeSelect.value as any).blur()
-      emit('update:modelValue', select.value)
-    }
-    // 筛选方法
-    const treeV2: any = ref<HTMLElement | null>(null)
-    const selectFilter = (query: string) => {
-      treeV2.value.filter(query)
-    }
-    // 筛选方法
-    const treeFilter = (query: string, node: TreeNode) => {
-      return node.label?.indexOf(query) !== -1
-    }
-    // 直接清空选择数据
-    const clearSelected = () => {
-      select.currentNodeKey = ''
-      select.currentNodeLabel = ''
-      select.value = ''
-      emit('update:modelValue', undefined)
-    }
-    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
-    const setCurrent = () => {
-      select.currentNodeKey = select.value
-      treeV2.value.setCurrentKey(select.value)
-      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
-      select.currentNodeLabel = data?.label || data?.name
-    }
-    // 监听外部清空数据源 清空组件数据
-    watch(modelValue, (v) => {
-      if (v === undefined && select.currentNodeKey !== '') {
-        clearSelected()
-      }
-      // 动态赋值
-      if (v) {
-        select.value = v
-        setCurrent()
-      }
-    })
-    // 回显数据
-    onMounted(async () => {
-      await nextTick()
-      if (select.value) {
-        setCurrent()
-      }
-    })
-    const TreeProps = toRefs(props)
-    return {
-      treeSelect,
-      treeV2,
-      // eslint-disable-next-line vue/no-dupe-keys
-      TreeProps,
-      ...toRefs(select),
-      nodeClick,
-      selectFilter,
-      treeFilter,
-      clearSelected,
-    }
-  },
-})
-</script>
-
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.tree_box {
-  width: 214px;
-}
-
-.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
-  height: auto;
-  max-height: 274px;
-  padding: 0;
-  overflow: hidden;
-  overflow-y: auto;
-}
-
-.el-select-dropdown__item.selected {
-  font-weight: normal;
-}
-
-ul li :deep(.el-tree .el-tree-node__content) {
-  height: auto;
-  padding: 0 20px;
-}
-
-.el-tree-node__label {
-  font-weight: normal;
-}
-
-.el-tree :deep(.is-current .el-tree-node__label) {
-  color: #409eff;
-  font-weight: 700;
-}
-
-.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
-  color: #606266;
-  font-weight: normal;
-}
-
-.selectInput {
-  padding: 0 5px;
-  box-sizing: border-box;
-}
-
-.el-select {
-  width: 100% !important;
-}
-</style>
-
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 35f3dec..240fffa 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -165,6 +165,7 @@
       title: '详情',
       name: '设备借用申请',
       approvalStatus: props.type,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -378,7 +379,7 @@
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{ (searchQuery.offset as number - 1) * (searchQuery.limit as number) + scope.$index + 1 }}
               </template>
             </el-table-column>
           </template>

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index ea79535..8771c29 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,10 +1,34 @@
 // 状态管理相关接口api
 import request from '../index'
 // 设备申请列表
-export function getApplyList(data: any) {
+export function getStatusList(data: any) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
+// 状态管理新建
+export function addStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/addStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理删除
+export function deleteStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/deleteStateManageList',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理详情
+export function detailStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/selectStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
deleted file mode 100644
index 7c087f8..0000000
--- a/src/components/SelectTree/index.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
-      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
-      TreeProps类型  {value:'id',babel:'name',children:'children'}
-      最好是 符合elementui类型的树形结构
-       -->
-<!-- 树状选择器 -->
-<script lang="ts">
-import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import type { PropType } from 'vue'
-import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
-interface PropsIter {
-  value: string
-  label: string
-  children: string
-  disabled?: boolean
-}
-interface TreeIter {
-  id: string
-  label: string
-  children?: TreeIter[]
-}
-export default defineComponent({
-  props: {
-    // 组件绑定的options
-    options: {
-      type: Array as PropType<TreeIter[]>,
-      required: true,
-    },
-    // 配置选项
-    keyProps: Object as PropType<PropsIter>,
-    // 双向绑定值
-    modelValue: [String, Number],
-    // 组件样式宽
-    width: {
-      type: String,
-      default: '240px',
-    },
-    // 空占位字符
-    placeholder: String,
-    // eslint-disable-next-line vue/prop-name-casing
-    TreeProps: {
-      type: Object,
-      default: () => { return {} },
-    },
-  },
-  setup(props, { emit }) {
-    const { modelValue } = toRefs(props)
-    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
-      value: modelValue.value,
-      currentNodeKey: '',
-      currentNodeLabel: '',
-    })
-    const treeSelect = ref<HTMLElement | null>(null)
-    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
-      select.currentNodeKey = data.id
-      select.currentNodeLabel = data.label || data.name
-      select.value = data.id;
-      (treeSelect.value as any).blur()
-      emit('update:modelValue', select.value)
-    }
-    // 筛选方法
-    const treeV2: any = ref<HTMLElement | null>(null)
-    const selectFilter = (query: string) => {
-      treeV2.value.filter(query)
-    }
-    // 筛选方法
-    const treeFilter = (query: string, node: TreeNode) => {
-      return node.label?.indexOf(query) !== -1
-    }
-    // 直接清空选择数据
-    const clearSelected = () => {
-      select.currentNodeKey = ''
-      select.currentNodeLabel = ''
-      select.value = ''
-      emit('update:modelValue', undefined)
-    }
-    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
-    const setCurrent = () => {
-      select.currentNodeKey = select.value
-      treeV2.value.setCurrentKey(select.value)
-      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
-      select.currentNodeLabel = data?.label || data?.name
-    }
-    // 监听外部清空数据源 清空组件数据
-    watch(modelValue, (v) => {
-      if (v === undefined && select.currentNodeKey !== '') {
-        clearSelected()
-      }
-      // 动态赋值
-      if (v) {
-        select.value = v
-        setCurrent()
-      }
-    })
-    // 回显数据
-    onMounted(async () => {
-      await nextTick()
-      if (select.value) {
-        setCurrent()
-      }
-    })
-    const TreeProps = toRefs(props)
-    return {
-      treeSelect,
-      treeV2,
-      // eslint-disable-next-line vue/no-dupe-keys
-      TreeProps,
-      ...toRefs(select),
-      nodeClick,
-      selectFilter,
-      treeFilter,
-      clearSelected,
-    }
-  },
-})
-</script>
-
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.tree_box {
-  width: 214px;
-}
-
-.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
-  height: auto;
-  max-height: 274px;
-  padding: 0;
-  overflow: hidden;
-  overflow-y: auto;
-}
-
-.el-select-dropdown__item.selected {
-  font-weight: normal;
-}
-
-ul li :deep(.el-tree .el-tree-node__content) {
-  height: auto;
-  padding: 0 20px;
-}
-
-.el-tree-node__label {
-  font-weight: normal;
-}
-
-.el-tree :deep(.is-current .el-tree-node__label) {
-  color: #409eff;
-  font-weight: 700;
-}
-
-.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
-  color: #606266;
-  font-weight: normal;
-}
-
-.selectInput {
-  padding: 0 5px;
-  box-sizing: border-box;
-}
-
-.el-select {
-  width: 100% !important;
-}
-</style>
-
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 35f3dec..240fffa 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -165,6 +165,7 @@
       title: '详情',
       name: '设备借用申请',
       approvalStatus: props.type,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -378,7 +379,7 @@
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{ (searchQuery.offset as number - 1) * (searchQuery.limit as number) + scope.$index + 1 }}
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index 755138a..f272ff7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -8,7 +8,6 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
@@ -116,41 +115,14 @@
   },
 ])
 // 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
+const mesureCycleList = ref<selectType[]>()
 // 获取下拉框数
 const fetchData = () => {
-// 获取资产类型
+  // 获取检定周期
+  getDictByCode('mesureCycle').then((response) => {
+    mesureCycleList.value = response.data
+  })
+  // 获取资产类型
   getDictByCode('assetType').then((response) => {
     assetTypeList.value = response.data
   })

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index ea79535..8771c29 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,10 +1,34 @@
 // 状态管理相关接口api
 import request from '../index'
 // 设备申请列表
-export function getApplyList(data: any) {
+export function getStatusList(data: any) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
+// 状态管理新建
+export function addStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/addStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理删除
+export function deleteStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/deleteStateManageList',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理详情
+export function detailStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/selectStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
deleted file mode 100644
index 7c087f8..0000000
--- a/src/components/SelectTree/index.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
-      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
-      TreeProps类型  {value:'id',babel:'name',children:'children'}
-      最好是 符合elementui类型的树形结构
-       -->
-<!-- 树状选择器 -->
-<script lang="ts">
-import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import type { PropType } from 'vue'
-import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
-interface PropsIter {
-  value: string
-  label: string
-  children: string
-  disabled?: boolean
-}
-interface TreeIter {
-  id: string
-  label: string
-  children?: TreeIter[]
-}
-export default defineComponent({
-  props: {
-    // 组件绑定的options
-    options: {
-      type: Array as PropType<TreeIter[]>,
-      required: true,
-    },
-    // 配置选项
-    keyProps: Object as PropType<PropsIter>,
-    // 双向绑定值
-    modelValue: [String, Number],
-    // 组件样式宽
-    width: {
-      type: String,
-      default: '240px',
-    },
-    // 空占位字符
-    placeholder: String,
-    // eslint-disable-next-line vue/prop-name-casing
-    TreeProps: {
-      type: Object,
-      default: () => { return {} },
-    },
-  },
-  setup(props, { emit }) {
-    const { modelValue } = toRefs(props)
-    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
-      value: modelValue.value,
-      currentNodeKey: '',
-      currentNodeLabel: '',
-    })
-    const treeSelect = ref<HTMLElement | null>(null)
-    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
-      select.currentNodeKey = data.id
-      select.currentNodeLabel = data.label || data.name
-      select.value = data.id;
-      (treeSelect.value as any).blur()
-      emit('update:modelValue', select.value)
-    }
-    // 筛选方法
-    const treeV2: any = ref<HTMLElement | null>(null)
-    const selectFilter = (query: string) => {
-      treeV2.value.filter(query)
-    }
-    // 筛选方法
-    const treeFilter = (query: string, node: TreeNode) => {
-      return node.label?.indexOf(query) !== -1
-    }
-    // 直接清空选择数据
-    const clearSelected = () => {
-      select.currentNodeKey = ''
-      select.currentNodeLabel = ''
-      select.value = ''
-      emit('update:modelValue', undefined)
-    }
-    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
-    const setCurrent = () => {
-      select.currentNodeKey = select.value
-      treeV2.value.setCurrentKey(select.value)
-      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
-      select.currentNodeLabel = data?.label || data?.name
-    }
-    // 监听外部清空数据源 清空组件数据
-    watch(modelValue, (v) => {
-      if (v === undefined && select.currentNodeKey !== '') {
-        clearSelected()
-      }
-      // 动态赋值
-      if (v) {
-        select.value = v
-        setCurrent()
-      }
-    })
-    // 回显数据
-    onMounted(async () => {
-      await nextTick()
-      if (select.value) {
-        setCurrent()
-      }
-    })
-    const TreeProps = toRefs(props)
-    return {
-      treeSelect,
-      treeV2,
-      // eslint-disable-next-line vue/no-dupe-keys
-      TreeProps,
-      ...toRefs(select),
-      nodeClick,
-      selectFilter,
-      treeFilter,
-      clearSelected,
-    }
-  },
-})
-</script>
-
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.tree_box {
-  width: 214px;
-}
-
-.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
-  height: auto;
-  max-height: 274px;
-  padding: 0;
-  overflow: hidden;
-  overflow-y: auto;
-}
-
-.el-select-dropdown__item.selected {
-  font-weight: normal;
-}
-
-ul li :deep(.el-tree .el-tree-node__content) {
-  height: auto;
-  padding: 0 20px;
-}
-
-.el-tree-node__label {
-  font-weight: normal;
-}
-
-.el-tree :deep(.is-current .el-tree-node__label) {
-  color: #409eff;
-  font-weight: 700;
-}
-
-.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
-  color: #606266;
-  font-weight: normal;
-}
-
-.selectInput {
-  padding: 0 5px;
-  box-sizing: border-box;
-}
-
-.el-select {
-  width: 100% !important;
-}
-</style>
-
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 35f3dec..240fffa 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -165,6 +165,7 @@
       title: '详情',
       name: '设备借用申请',
       approvalStatus: props.type,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -378,7 +379,7 @@
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{ (searchQuery.offset as number - 1) * (searchQuery.limit as number) + scope.$index + 1 }}
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index 755138a..f272ff7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -8,7 +8,6 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
@@ -116,41 +115,14 @@
   },
 ])
 // 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
+const mesureCycleList = ref<selectType[]>()
 // 获取下拉框数
 const fetchData = () => {
-// 获取资产类型
+  // 获取检定周期
+  getDictByCode('mesureCycle').then((response) => {
+    mesureCycleList.value = response.data
+  })
+  // 获取资产类型
   getDictByCode('assetType').then((response) => {
     assetTypeList.value = response.data
   })
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index e220eb5..d0b26b6 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -24,61 +24,51 @@
   {
     text: '固定资产编号',
     value: 'assetNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '设备名称',
     value: 'equipmentName',
-    width: '150',
     align: 'center',
   },
   {
     text: '型号',
     value: 'modelNo',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备规格',
     value: 'equipmentSpecifications',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类别',
     value: 'equipmentCategoryName',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类型',
     value: 'equipmentTypeName',
-    width: '150',
     align: 'center',
   },
   {
     text: '用途',
     value: 'purpose',
-    width: '150',
     align: 'center',
   },
   {
     text: '管理级别',
     value: 'managerLevelName',
-    width: '150',
     align: 'center',
   },
   {
     text: '使用单位',
     value: 'useDeptName',
-    width: '150',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
     align: 'center',
   },
 ]) // 表格
@@ -103,7 +93,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index ea79535..8771c29 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,10 +1,34 @@
 // 状态管理相关接口api
 import request from '../index'
 // 设备申请列表
-export function getApplyList(data: any) {
+export function getStatusList(data: any) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
+// 状态管理新建
+export function addStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/addStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理删除
+export function deleteStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/deleteStateManageList',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理详情
+export function detailStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/selectStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
deleted file mode 100644
index 7c087f8..0000000
--- a/src/components/SelectTree/index.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
-      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
-      TreeProps类型  {value:'id',babel:'name',children:'children'}
-      最好是 符合elementui类型的树形结构
-       -->
-<!-- 树状选择器 -->
-<script lang="ts">
-import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import type { PropType } from 'vue'
-import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
-interface PropsIter {
-  value: string
-  label: string
-  children: string
-  disabled?: boolean
-}
-interface TreeIter {
-  id: string
-  label: string
-  children?: TreeIter[]
-}
-export default defineComponent({
-  props: {
-    // 组件绑定的options
-    options: {
-      type: Array as PropType<TreeIter[]>,
-      required: true,
-    },
-    // 配置选项
-    keyProps: Object as PropType<PropsIter>,
-    // 双向绑定值
-    modelValue: [String, Number],
-    // 组件样式宽
-    width: {
-      type: String,
-      default: '240px',
-    },
-    // 空占位字符
-    placeholder: String,
-    // eslint-disable-next-line vue/prop-name-casing
-    TreeProps: {
-      type: Object,
-      default: () => { return {} },
-    },
-  },
-  setup(props, { emit }) {
-    const { modelValue } = toRefs(props)
-    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
-      value: modelValue.value,
-      currentNodeKey: '',
-      currentNodeLabel: '',
-    })
-    const treeSelect = ref<HTMLElement | null>(null)
-    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
-      select.currentNodeKey = data.id
-      select.currentNodeLabel = data.label || data.name
-      select.value = data.id;
-      (treeSelect.value as any).blur()
-      emit('update:modelValue', select.value)
-    }
-    // 筛选方法
-    const treeV2: any = ref<HTMLElement | null>(null)
-    const selectFilter = (query: string) => {
-      treeV2.value.filter(query)
-    }
-    // 筛选方法
-    const treeFilter = (query: string, node: TreeNode) => {
-      return node.label?.indexOf(query) !== -1
-    }
-    // 直接清空选择数据
-    const clearSelected = () => {
-      select.currentNodeKey = ''
-      select.currentNodeLabel = ''
-      select.value = ''
-      emit('update:modelValue', undefined)
-    }
-    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
-    const setCurrent = () => {
-      select.currentNodeKey = select.value
-      treeV2.value.setCurrentKey(select.value)
-      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
-      select.currentNodeLabel = data?.label || data?.name
-    }
-    // 监听外部清空数据源 清空组件数据
-    watch(modelValue, (v) => {
-      if (v === undefined && select.currentNodeKey !== '') {
-        clearSelected()
-      }
-      // 动态赋值
-      if (v) {
-        select.value = v
-        setCurrent()
-      }
-    })
-    // 回显数据
-    onMounted(async () => {
-      await nextTick()
-      if (select.value) {
-        setCurrent()
-      }
-    })
-    const TreeProps = toRefs(props)
-    return {
-      treeSelect,
-      treeV2,
-      // eslint-disable-next-line vue/no-dupe-keys
-      TreeProps,
-      ...toRefs(select),
-      nodeClick,
-      selectFilter,
-      treeFilter,
-      clearSelected,
-    }
-  },
-})
-</script>
-
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.tree_box {
-  width: 214px;
-}
-
-.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
-  height: auto;
-  max-height: 274px;
-  padding: 0;
-  overflow: hidden;
-  overflow-y: auto;
-}
-
-.el-select-dropdown__item.selected {
-  font-weight: normal;
-}
-
-ul li :deep(.el-tree .el-tree-node__content) {
-  height: auto;
-  padding: 0 20px;
-}
-
-.el-tree-node__label {
-  font-weight: normal;
-}
-
-.el-tree :deep(.is-current .el-tree-node__label) {
-  color: #409eff;
-  font-weight: 700;
-}
-
-.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
-  color: #606266;
-  font-weight: normal;
-}
-
-.selectInput {
-  padding: 0 5px;
-  box-sizing: border-box;
-}
-
-.el-select {
-  width: 100% !important;
-}
-</style>
-
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 35f3dec..240fffa 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -165,6 +165,7 @@
       title: '详情',
       name: '设备借用申请',
       approvalStatus: props.type,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -378,7 +379,7 @@
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{ (searchQuery.offset as number - 1) * (searchQuery.limit as number) + scope.$index + 1 }}
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index 755138a..f272ff7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -8,7 +8,6 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
@@ -116,41 +115,14 @@
   },
 ])
 // 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
+const mesureCycleList = ref<selectType[]>()
 // 获取下拉框数
 const fetchData = () => {
-// 获取资产类型
+  // 获取检定周期
+  getDictByCode('mesureCycle').then((response) => {
+    mesureCycleList.value = response.data
+  })
+  // 获取资产类型
   getDictByCode('assetType').then((response) => {
     assetTypeList.value = response.data
   })
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index e220eb5..d0b26b6 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -24,61 +24,51 @@
   {
     text: '固定资产编号',
     value: 'assetNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '设备名称',
     value: 'equipmentName',
-    width: '150',
     align: 'center',
   },
   {
     text: '型号',
     value: 'modelNo',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备规格',
     value: 'equipmentSpecifications',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类别',
     value: 'equipmentCategoryName',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类型',
     value: 'equipmentTypeName',
-    width: '150',
     align: 'center',
   },
   {
     text: '用途',
     value: 'purpose',
-    width: '150',
     align: 'center',
   },
   {
     text: '管理级别',
     value: 'managerLevelName',
-    width: '150',
     align: 'center',
   },
   {
     text: '使用单位',
     value: 'useDeptName',
-    width: '150',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
     align: 'center',
   },
 ]) // 表格
@@ -103,7 +93,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 7ab7c18..2f7cf28 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,6 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
+import { addStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 const userInfo = useUserStore()
@@ -24,56 +25,18 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
-  assetNo: '', // 资产编号
-  assetType: '', // 资产类型
-  assetSource: '', // 资产来源
+  applyDesc: '', // 申请说明
+  time: '', // 时间
+  fileList: [] as any[], //	说明书
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
   equipmentNo: '', // 设备编号
   equipmentName: '', // 设备名称
-  labelBind: '', // 标签绑定
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
-  equipmentType: '', // 设备类型
-  equipmentCategory: '', // 设备类别
-  capitalSource: '', // 资本来源
-  managerLevel: '', // 管理级别
-  purpose: '', // 用途
-  technicalLevel: '', // 技术水平
-  intactState: '', // 完好状态
-  manufacturerCountry: '', // 厂家国别
-  manufacturer: '', // 生产厂家
-  overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
-  manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
-  weight: '', // 重量
-  enableDate: '', // 启用年月
-  singlePrice: '', // 单价
-  installIncidentalExpenses: '', //	安装及杂费
-  originValue: '', //	原值
-  useDept: '', //	使用部门
-  installPlace: '', //	安装地点
-  createUser: '', //		创建人/负责人
-  depreciationPeriod: '', //	折旧年限
-  depreciationMethod: '', //	折旧方法
-  attribute: '', //	属性
-  majorCategory: '', //	专业分类
-  presentOriginValue: '', //	目前原值
-  managerState: '1', //	管理状态
-  fileList: [] as any[], //	说明书
-  remark: '', //	备注
-  mesureType: '', //	检定方式
-  mesureRange: '', //	测量范围
-  uncertainty: '', //	不确定度
-  usePerson: '', //	使用人
-  mesureDept: '', //	检定部门
-  mesureCycle: '', //	检定周期
-  mesureDate: '', //	检定日期
-  validDate: '', //	有效日期
-  mesureResult: '', //	检定结果
-  abc: '', //	ABC
-  isCalibrationTestEquipment: '', //	是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', //	是否是测量工装台账
-  isStandardSupportEquipment: '', //		是否标准配套设备
+  manufacturer: '', // 生产厂家
+  equipmentList: [],
   id: '',
 }) // 表单
 const ruleForm2 = ref({
@@ -224,62 +187,6 @@
     useDeptListNoTree.value = res.data
   })
 }
-// 重置
-const resetDATA = () => {
-  ruleForm1.value = {
-    assetNo: '', // 资产编号
-    assetType: '', // 资产类型
-    assetSource: '', // 资产来源
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 设备名称
-    labelBind: '', // 标签绑定
-    modelNo: '', // 型号
-    equipmentSpecifications: '', // 设备规格
-    equipmentType: '', // 设备类型
-    equipmentCategory: '', // 设备类别
-    capitalSource: '', // 资本来源
-    managerLevel: '', // 管理级别
-    purpose: '', // 用途
-    technicalLevel: '', // 技术水平
-    intactState: '', // 完好状态
-    manufacturerCountry: '', // 厂家国别
-    manufacturer: '', // 生产厂家
-    overallDimension: '', // 外形尺寸
-    manufacturingNo: '', // 出厂编号
-    manufacturingDate: '', // 出厂年月
-    cardEstablishmentDate: '', // 立卡年月
-    weight: '', // 重量
-    enableDate: '', // 启用年月
-    singlePrice: '', // 单价
-    installIncidentalExpenses: '', //	安装及杂费
-    originValue: '', //	原值
-    useDept: '', //	使用部门
-    installPlace: '', //	安装地点
-    createUser: '', //		创建人/负责人
-    depreciationPeriod: '', //	折旧年限
-    depreciationMethod: '', //	折旧方法
-    attribute: '', //	属性
-    majorCategory: '', //	专业分类
-    presentOriginValue: '', //	目前原值
-    managerState: '1', //	管理状态
-    fileList: [] as any[], //	说明书
-    remark: '', //	备注
-    mesureType: '', //	检定方式
-    mesureRange: '', //	测量范围
-    uncertainty: '', //	不确定度
-    usePerson: '', //	使用人
-    mesureDept: '', //	检定部门
-    mesureCycle: '', //	检定周期
-    mesureDate: '', //	检定日期
-    validDate: '', //	有效日期
-    mesureResult: '', //	检定结果
-    abc: '', //	ABC
-    isCalibrationTestEquipment: '', //	是否是技术指标需要校准检定的设备
-    isMeasureAccount: '', //	是否是测量工装台账
-    isStandardSupportEquipment: '', //		是否标准配套设备
-    id: '',
-  }
-}
 // 判断是设备借用还是状态管理
 const isDevice = computed(() => {
   if (name.value == '设备借用申请' || name.value == '设备借用处理') {
@@ -295,7 +202,7 @@
   // ruleFormRef.value?.resetFields()
   title.value = row.title
   name.value = row.name
-  if (isDevice) {
+  if (isDevice.value) {
     // 设备借用
     if (title.value !== '新建') {
       console.log(row.id)
@@ -307,6 +214,7 @@
   }
   else {
     // 状态管理
+
   }
 }
 onMounted(() => {
@@ -315,12 +223,11 @@
 
 // 关闭弹窗
 const close = () => {
-  resetDATA()
   $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  if (isDevice) {
+  if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
     await formEl2.validate((valid, fields) => {
@@ -362,7 +269,25 @@
     })
   }
   else {
-    // 状态管理
+  // 状态管理
+    if (!formEl1) { return }
+    await formEl1.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then((res) => {
+          addStatus(ruleForm1.value).then((res) => {
+            console.log(res)
+          })
+        })
+      }
+    })
   }
 }
 // 取消
@@ -520,7 +445,7 @@
   //     edit: true,
   //   })
   // }
-  addRowRef.value.initDialog({ title: '添加' })
+  addRowRef.value.initDialog({ title: '' })
 }
 const SelectionList = ref()
 // 表格选中
@@ -556,7 +481,20 @@
 }
 // 借用设备列表添加
 const addRowMethods = (row) => {
-  borrowList.value = [...borrowList.value, ...row]
+  if (isDevice.value) {
+    // 设备借用
+    borrowList.value = [...borrowList.value, ...row]
+  }
+  else {
+  // 设备状态
+    if (row.length > 1) {
+      ElMessage.warning('只能选择一个设备')
+    }
+    else {
+      console.log(row[0], '选中的设备')
+      const device = row[0]
+    }
+  }
   // row.forEach((element) => {
   //   borrowList.value.push({
   //     equipmentName: element.equipmentName, // 设备名称
@@ -577,18 +515,20 @@
   //  根据状态判断
   //  全部 待审批 审批中 可审批
   const arr = ['0', '2', '3']
-  return arr.includes($route.query?.approvalStatus as string)
+  const status = ['待审批', '审批中']
+  return arr.includes($route.query?.approvalStatus as string) && status.includes($route.query?.approvalStatusName as string)
 })
 // 详情页是否展示打印按钮
 const isPrint = computed(() => {
   //  根据状态判断
   // 未通过 已通过
-  const arr = ['4', '5']
-  return arr.includes($route.query?.approvalStatus as string)
+  const arr = ['4', '5', '0']
+  const status = ['未通过', '已通过']
+  return arr.includes($route.query?.approvalStatus as string) && status.includes($route.query?.approvalStatusName as string)
 })
 // 已取消状态
 const isCancel = computed(() => {
-  if ($route.query?.approvalStatus === '6') {
+  if ($route.query?.approvalStatus === '6' || $route.query?.approvalStatusName === '已取消') {
     return true
   }
   else {
@@ -620,16 +560,16 @@
         <el-button v-if="title === '详情' && isPrint" type="primary">
           打印
         </el-button>
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
-        </el-button>
+        </el-button> -->
         <el-button v-if="title === '详情' && isCancel" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="title === '详情' && $route.query?.approvalStatus === '1'" type="primary" @click="editForm">
+        <el-button v-if="(title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+        <el-button v-if="(title === '详情' && isCancel) || (title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="deleteForm">
           删除
         </el-button>
         <el-button type="info" @click="resetForm()">
@@ -652,7 +592,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo">
-              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="addRowBtn">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -685,17 +631,17 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="manufacturingDate">
+            <el-form-item label="闲置时间" prop="time">
               <el-date-picker
-                v-model="ruleForm1.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '闲置时间'"
                 style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="managerState">
-              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="applyDesc">
+              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -751,12 +697,12 @@
       </el-form>
     </detail-page>
     <div>
-      <detail-block title="借用设备列表">
+      <detail-block v-if="isDevice" title="借用设备列表">
         <template #btns>
-          <el-button type="primary" @click="addRowBtn">
+          <el-button v-if="title !== '详情'" type="primary" @click="addRowBtn">
             添加行
           </el-button>
-          <el-button type="info" @click="removeRowBtn">
+          <el-button v-if="title !== '详情'" type="info" @click="removeRowBtn">
             删除行
           </el-button>
         </template>

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index ea79535..8771c29 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,10 +1,34 @@
 // 状态管理相关接口api
 import request from '../index'
 // 设备申请列表
-export function getApplyList(data: any) {
+export function getStatusList(data: any) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
+// 状态管理新建
+export function addStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/addStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理删除
+export function deleteStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/deleteStateManageList',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理详情
+export function detailStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/selectStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
deleted file mode 100644
index 7c087f8..0000000
--- a/src/components/SelectTree/index.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
-      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
-      TreeProps类型  {value:'id',babel:'name',children:'children'}
-      最好是 符合elementui类型的树形结构
-       -->
-<!-- 树状选择器 -->
-<script lang="ts">
-import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import type { PropType } from 'vue'
-import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
-interface PropsIter {
-  value: string
-  label: string
-  children: string
-  disabled?: boolean
-}
-interface TreeIter {
-  id: string
-  label: string
-  children?: TreeIter[]
-}
-export default defineComponent({
-  props: {
-    // 组件绑定的options
-    options: {
-      type: Array as PropType<TreeIter[]>,
-      required: true,
-    },
-    // 配置选项
-    keyProps: Object as PropType<PropsIter>,
-    // 双向绑定值
-    modelValue: [String, Number],
-    // 组件样式宽
-    width: {
-      type: String,
-      default: '240px',
-    },
-    // 空占位字符
-    placeholder: String,
-    // eslint-disable-next-line vue/prop-name-casing
-    TreeProps: {
-      type: Object,
-      default: () => { return {} },
-    },
-  },
-  setup(props, { emit }) {
-    const { modelValue } = toRefs(props)
-    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
-      value: modelValue.value,
-      currentNodeKey: '',
-      currentNodeLabel: '',
-    })
-    const treeSelect = ref<HTMLElement | null>(null)
-    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
-      select.currentNodeKey = data.id
-      select.currentNodeLabel = data.label || data.name
-      select.value = data.id;
-      (treeSelect.value as any).blur()
-      emit('update:modelValue', select.value)
-    }
-    // 筛选方法
-    const treeV2: any = ref<HTMLElement | null>(null)
-    const selectFilter = (query: string) => {
-      treeV2.value.filter(query)
-    }
-    // 筛选方法
-    const treeFilter = (query: string, node: TreeNode) => {
-      return node.label?.indexOf(query) !== -1
-    }
-    // 直接清空选择数据
-    const clearSelected = () => {
-      select.currentNodeKey = ''
-      select.currentNodeLabel = ''
-      select.value = ''
-      emit('update:modelValue', undefined)
-    }
-    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
-    const setCurrent = () => {
-      select.currentNodeKey = select.value
-      treeV2.value.setCurrentKey(select.value)
-      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
-      select.currentNodeLabel = data?.label || data?.name
-    }
-    // 监听外部清空数据源 清空组件数据
-    watch(modelValue, (v) => {
-      if (v === undefined && select.currentNodeKey !== '') {
-        clearSelected()
-      }
-      // 动态赋值
-      if (v) {
-        select.value = v
-        setCurrent()
-      }
-    })
-    // 回显数据
-    onMounted(async () => {
-      await nextTick()
-      if (select.value) {
-        setCurrent()
-      }
-    })
-    const TreeProps = toRefs(props)
-    return {
-      treeSelect,
-      treeV2,
-      // eslint-disable-next-line vue/no-dupe-keys
-      TreeProps,
-      ...toRefs(select),
-      nodeClick,
-      selectFilter,
-      treeFilter,
-      clearSelected,
-    }
-  },
-})
-</script>
-
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.tree_box {
-  width: 214px;
-}
-
-.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
-  height: auto;
-  max-height: 274px;
-  padding: 0;
-  overflow: hidden;
-  overflow-y: auto;
-}
-
-.el-select-dropdown__item.selected {
-  font-weight: normal;
-}
-
-ul li :deep(.el-tree .el-tree-node__content) {
-  height: auto;
-  padding: 0 20px;
-}
-
-.el-tree-node__label {
-  font-weight: normal;
-}
-
-.el-tree :deep(.is-current .el-tree-node__label) {
-  color: #409eff;
-  font-weight: 700;
-}
-
-.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
-  color: #606266;
-  font-weight: normal;
-}
-
-.selectInput {
-  padding: 0 5px;
-  box-sizing: border-box;
-}
-
-.el-select {
-  width: 100% !important;
-}
-</style>
-
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 35f3dec..240fffa 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -165,6 +165,7 @@
       title: '详情',
       name: '设备借用申请',
       approvalStatus: props.type,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -378,7 +379,7 @@
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{ (searchQuery.offset as number - 1) * (searchQuery.limit as number) + scope.$index + 1 }}
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index 755138a..f272ff7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -8,7 +8,6 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
@@ -116,41 +115,14 @@
   },
 ])
 // 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
+const mesureCycleList = ref<selectType[]>()
 // 获取下拉框数
 const fetchData = () => {
-// 获取资产类型
+  // 获取检定周期
+  getDictByCode('mesureCycle').then((response) => {
+    mesureCycleList.value = response.data
+  })
+  // 获取资产类型
   getDictByCode('assetType').then((response) => {
     assetTypeList.value = response.data
   })
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index e220eb5..d0b26b6 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -24,61 +24,51 @@
   {
     text: '固定资产编号',
     value: 'assetNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '设备名称',
     value: 'equipmentName',
-    width: '150',
     align: 'center',
   },
   {
     text: '型号',
     value: 'modelNo',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备规格',
     value: 'equipmentSpecifications',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类别',
     value: 'equipmentCategoryName',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类型',
     value: 'equipmentTypeName',
-    width: '150',
     align: 'center',
   },
   {
     text: '用途',
     value: 'purpose',
-    width: '150',
     align: 'center',
   },
   {
     text: '管理级别',
     value: 'managerLevelName',
-    width: '150',
     align: 'center',
   },
   {
     text: '使用单位',
     value: 'useDeptName',
-    width: '150',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
     align: 'center',
   },
 ]) // 表格
@@ -103,7 +93,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 7ab7c18..2f7cf28 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,6 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
+import { addStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 const userInfo = useUserStore()
@@ -24,56 +25,18 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
-  assetNo: '', // 资产编号
-  assetType: '', // 资产类型
-  assetSource: '', // 资产来源
+  applyDesc: '', // 申请说明
+  time: '', // 时间
+  fileList: [] as any[], //	说明书
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
   equipmentNo: '', // 设备编号
   equipmentName: '', // 设备名称
-  labelBind: '', // 标签绑定
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
-  equipmentType: '', // 设备类型
-  equipmentCategory: '', // 设备类别
-  capitalSource: '', // 资本来源
-  managerLevel: '', // 管理级别
-  purpose: '', // 用途
-  technicalLevel: '', // 技术水平
-  intactState: '', // 完好状态
-  manufacturerCountry: '', // 厂家国别
-  manufacturer: '', // 生产厂家
-  overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
-  manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
-  weight: '', // 重量
-  enableDate: '', // 启用年月
-  singlePrice: '', // 单价
-  installIncidentalExpenses: '', //	安装及杂费
-  originValue: '', //	原值
-  useDept: '', //	使用部门
-  installPlace: '', //	安装地点
-  createUser: '', //		创建人/负责人
-  depreciationPeriod: '', //	折旧年限
-  depreciationMethod: '', //	折旧方法
-  attribute: '', //	属性
-  majorCategory: '', //	专业分类
-  presentOriginValue: '', //	目前原值
-  managerState: '1', //	管理状态
-  fileList: [] as any[], //	说明书
-  remark: '', //	备注
-  mesureType: '', //	检定方式
-  mesureRange: '', //	测量范围
-  uncertainty: '', //	不确定度
-  usePerson: '', //	使用人
-  mesureDept: '', //	检定部门
-  mesureCycle: '', //	检定周期
-  mesureDate: '', //	检定日期
-  validDate: '', //	有效日期
-  mesureResult: '', //	检定结果
-  abc: '', //	ABC
-  isCalibrationTestEquipment: '', //	是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', //	是否是测量工装台账
-  isStandardSupportEquipment: '', //		是否标准配套设备
+  manufacturer: '', // 生产厂家
+  equipmentList: [],
   id: '',
 }) // 表单
 const ruleForm2 = ref({
@@ -224,62 +187,6 @@
     useDeptListNoTree.value = res.data
   })
 }
-// 重置
-const resetDATA = () => {
-  ruleForm1.value = {
-    assetNo: '', // 资产编号
-    assetType: '', // 资产类型
-    assetSource: '', // 资产来源
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 设备名称
-    labelBind: '', // 标签绑定
-    modelNo: '', // 型号
-    equipmentSpecifications: '', // 设备规格
-    equipmentType: '', // 设备类型
-    equipmentCategory: '', // 设备类别
-    capitalSource: '', // 资本来源
-    managerLevel: '', // 管理级别
-    purpose: '', // 用途
-    technicalLevel: '', // 技术水平
-    intactState: '', // 完好状态
-    manufacturerCountry: '', // 厂家国别
-    manufacturer: '', // 生产厂家
-    overallDimension: '', // 外形尺寸
-    manufacturingNo: '', // 出厂编号
-    manufacturingDate: '', // 出厂年月
-    cardEstablishmentDate: '', // 立卡年月
-    weight: '', // 重量
-    enableDate: '', // 启用年月
-    singlePrice: '', // 单价
-    installIncidentalExpenses: '', //	安装及杂费
-    originValue: '', //	原值
-    useDept: '', //	使用部门
-    installPlace: '', //	安装地点
-    createUser: '', //		创建人/负责人
-    depreciationPeriod: '', //	折旧年限
-    depreciationMethod: '', //	折旧方法
-    attribute: '', //	属性
-    majorCategory: '', //	专业分类
-    presentOriginValue: '', //	目前原值
-    managerState: '1', //	管理状态
-    fileList: [] as any[], //	说明书
-    remark: '', //	备注
-    mesureType: '', //	检定方式
-    mesureRange: '', //	测量范围
-    uncertainty: '', //	不确定度
-    usePerson: '', //	使用人
-    mesureDept: '', //	检定部门
-    mesureCycle: '', //	检定周期
-    mesureDate: '', //	检定日期
-    validDate: '', //	有效日期
-    mesureResult: '', //	检定结果
-    abc: '', //	ABC
-    isCalibrationTestEquipment: '', //	是否是技术指标需要校准检定的设备
-    isMeasureAccount: '', //	是否是测量工装台账
-    isStandardSupportEquipment: '', //		是否标准配套设备
-    id: '',
-  }
-}
 // 判断是设备借用还是状态管理
 const isDevice = computed(() => {
   if (name.value == '设备借用申请' || name.value == '设备借用处理') {
@@ -295,7 +202,7 @@
   // ruleFormRef.value?.resetFields()
   title.value = row.title
   name.value = row.name
-  if (isDevice) {
+  if (isDevice.value) {
     // 设备借用
     if (title.value !== '新建') {
       console.log(row.id)
@@ -307,6 +214,7 @@
   }
   else {
     // 状态管理
+
   }
 }
 onMounted(() => {
@@ -315,12 +223,11 @@
 
 // 关闭弹窗
 const close = () => {
-  resetDATA()
   $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  if (isDevice) {
+  if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
     await formEl2.validate((valid, fields) => {
@@ -362,7 +269,25 @@
     })
   }
   else {
-    // 状态管理
+  // 状态管理
+    if (!formEl1) { return }
+    await formEl1.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then((res) => {
+          addStatus(ruleForm1.value).then((res) => {
+            console.log(res)
+          })
+        })
+      }
+    })
   }
 }
 // 取消
@@ -520,7 +445,7 @@
   //     edit: true,
   //   })
   // }
-  addRowRef.value.initDialog({ title: '添加' })
+  addRowRef.value.initDialog({ title: '' })
 }
 const SelectionList = ref()
 // 表格选中
@@ -556,7 +481,20 @@
 }
 // 借用设备列表添加
 const addRowMethods = (row) => {
-  borrowList.value = [...borrowList.value, ...row]
+  if (isDevice.value) {
+    // 设备借用
+    borrowList.value = [...borrowList.value, ...row]
+  }
+  else {
+  // 设备状态
+    if (row.length > 1) {
+      ElMessage.warning('只能选择一个设备')
+    }
+    else {
+      console.log(row[0], '选中的设备')
+      const device = row[0]
+    }
+  }
   // row.forEach((element) => {
   //   borrowList.value.push({
   //     equipmentName: element.equipmentName, // 设备名称
@@ -577,18 +515,20 @@
   //  根据状态判断
   //  全部 待审批 审批中 可审批
   const arr = ['0', '2', '3']
-  return arr.includes($route.query?.approvalStatus as string)
+  const status = ['待审批', '审批中']
+  return arr.includes($route.query?.approvalStatus as string) && status.includes($route.query?.approvalStatusName as string)
 })
 // 详情页是否展示打印按钮
 const isPrint = computed(() => {
   //  根据状态判断
   // 未通过 已通过
-  const arr = ['4', '5']
-  return arr.includes($route.query?.approvalStatus as string)
+  const arr = ['4', '5', '0']
+  const status = ['未通过', '已通过']
+  return arr.includes($route.query?.approvalStatus as string) && status.includes($route.query?.approvalStatusName as string)
 })
 // 已取消状态
 const isCancel = computed(() => {
-  if ($route.query?.approvalStatus === '6') {
+  if ($route.query?.approvalStatus === '6' || $route.query?.approvalStatusName === '已取消') {
     return true
   }
   else {
@@ -620,16 +560,16 @@
         <el-button v-if="title === '详情' && isPrint" type="primary">
           打印
         </el-button>
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
-        </el-button>
+        </el-button> -->
         <el-button v-if="title === '详情' && isCancel" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="title === '详情' && $route.query?.approvalStatus === '1'" type="primary" @click="editForm">
+        <el-button v-if="(title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+        <el-button v-if="(title === '详情' && isCancel) || (title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="deleteForm">
           删除
         </el-button>
         <el-button type="info" @click="resetForm()">
@@ -652,7 +592,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo">
-              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="addRowBtn">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -685,17 +631,17 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="manufacturingDate">
+            <el-form-item label="闲置时间" prop="time">
               <el-date-picker
-                v-model="ruleForm1.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '闲置时间'"
                 style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="managerState">
-              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="applyDesc">
+              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -751,12 +697,12 @@
       </el-form>
     </detail-page>
     <div>
-      <detail-block title="借用设备列表">
+      <detail-block v-if="isDevice" title="借用设备列表">
         <template #btns>
-          <el-button type="primary" @click="addRowBtn">
+          <el-button v-if="title !== '详情'" type="primary" @click="addRowBtn">
             添加行
           </el-button>
-          <el-button type="info" @click="removeRowBtn">
+          <el-button v-if="title !== '详情'" type="info" @click="removeRowBtn">
             删除行
           </el-button>
         </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 131b636..fd576ff 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/stateManage'
+// import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -156,6 +156,7 @@
     query: {
       title: '详情',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
@@ -174,6 +175,7 @@
     query: {
       title: '编辑',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
@@ -260,6 +262,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index ea79535..8771c29 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,10 +1,34 @@
 // 状态管理相关接口api
 import request from '../index'
 // 设备申请列表
-export function getApplyList(data: any) {
+export function getStatusList(data: any) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
+// 状态管理新建
+export function addStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/addStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理删除
+export function deleteStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/deleteStateManageList',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理详情
+export function detailStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/selectStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
deleted file mode 100644
index 7c087f8..0000000
--- a/src/components/SelectTree/index.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
-      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
-      TreeProps类型  {value:'id',babel:'name',children:'children'}
-      最好是 符合elementui类型的树形结构
-       -->
-<!-- 树状选择器 -->
-<script lang="ts">
-import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import type { PropType } from 'vue'
-import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
-interface PropsIter {
-  value: string
-  label: string
-  children: string
-  disabled?: boolean
-}
-interface TreeIter {
-  id: string
-  label: string
-  children?: TreeIter[]
-}
-export default defineComponent({
-  props: {
-    // 组件绑定的options
-    options: {
-      type: Array as PropType<TreeIter[]>,
-      required: true,
-    },
-    // 配置选项
-    keyProps: Object as PropType<PropsIter>,
-    // 双向绑定值
-    modelValue: [String, Number],
-    // 组件样式宽
-    width: {
-      type: String,
-      default: '240px',
-    },
-    // 空占位字符
-    placeholder: String,
-    // eslint-disable-next-line vue/prop-name-casing
-    TreeProps: {
-      type: Object,
-      default: () => { return {} },
-    },
-  },
-  setup(props, { emit }) {
-    const { modelValue } = toRefs(props)
-    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
-      value: modelValue.value,
-      currentNodeKey: '',
-      currentNodeLabel: '',
-    })
-    const treeSelect = ref<HTMLElement | null>(null)
-    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
-      select.currentNodeKey = data.id
-      select.currentNodeLabel = data.label || data.name
-      select.value = data.id;
-      (treeSelect.value as any).blur()
-      emit('update:modelValue', select.value)
-    }
-    // 筛选方法
-    const treeV2: any = ref<HTMLElement | null>(null)
-    const selectFilter = (query: string) => {
-      treeV2.value.filter(query)
-    }
-    // 筛选方法
-    const treeFilter = (query: string, node: TreeNode) => {
-      return node.label?.indexOf(query) !== -1
-    }
-    // 直接清空选择数据
-    const clearSelected = () => {
-      select.currentNodeKey = ''
-      select.currentNodeLabel = ''
-      select.value = ''
-      emit('update:modelValue', undefined)
-    }
-    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
-    const setCurrent = () => {
-      select.currentNodeKey = select.value
-      treeV2.value.setCurrentKey(select.value)
-      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
-      select.currentNodeLabel = data?.label || data?.name
-    }
-    // 监听外部清空数据源 清空组件数据
-    watch(modelValue, (v) => {
-      if (v === undefined && select.currentNodeKey !== '') {
-        clearSelected()
-      }
-      // 动态赋值
-      if (v) {
-        select.value = v
-        setCurrent()
-      }
-    })
-    // 回显数据
-    onMounted(async () => {
-      await nextTick()
-      if (select.value) {
-        setCurrent()
-      }
-    })
-    const TreeProps = toRefs(props)
-    return {
-      treeSelect,
-      treeV2,
-      // eslint-disable-next-line vue/no-dupe-keys
-      TreeProps,
-      ...toRefs(select),
-      nodeClick,
-      selectFilter,
-      treeFilter,
-      clearSelected,
-    }
-  },
-})
-</script>
-
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.tree_box {
-  width: 214px;
-}
-
-.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
-  height: auto;
-  max-height: 274px;
-  padding: 0;
-  overflow: hidden;
-  overflow-y: auto;
-}
-
-.el-select-dropdown__item.selected {
-  font-weight: normal;
-}
-
-ul li :deep(.el-tree .el-tree-node__content) {
-  height: auto;
-  padding: 0 20px;
-}
-
-.el-tree-node__label {
-  font-weight: normal;
-}
-
-.el-tree :deep(.is-current .el-tree-node__label) {
-  color: #409eff;
-  font-weight: 700;
-}
-
-.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
-  color: #606266;
-  font-weight: normal;
-}
-
-.selectInput {
-  padding: 0 5px;
-  box-sizing: border-box;
-}
-
-.el-select {
-  width: 100% !important;
-}
-</style>
-
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 35f3dec..240fffa 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -165,6 +165,7 @@
       title: '详情',
       name: '设备借用申请',
       approvalStatus: props.type,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -378,7 +379,7 @@
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{ (searchQuery.offset as number - 1) * (searchQuery.limit as number) + scope.$index + 1 }}
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index 755138a..f272ff7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -8,7 +8,6 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
@@ -116,41 +115,14 @@
   },
 ])
 // 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
+const mesureCycleList = ref<selectType[]>()
 // 获取下拉框数
 const fetchData = () => {
-// 获取资产类型
+  // 获取检定周期
+  getDictByCode('mesureCycle').then((response) => {
+    mesureCycleList.value = response.data
+  })
+  // 获取资产类型
   getDictByCode('assetType').then((response) => {
     assetTypeList.value = response.data
   })
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index e220eb5..d0b26b6 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -24,61 +24,51 @@
   {
     text: '固定资产编号',
     value: 'assetNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '设备名称',
     value: 'equipmentName',
-    width: '150',
     align: 'center',
   },
   {
     text: '型号',
     value: 'modelNo',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备规格',
     value: 'equipmentSpecifications',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类别',
     value: 'equipmentCategoryName',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类型',
     value: 'equipmentTypeName',
-    width: '150',
     align: 'center',
   },
   {
     text: '用途',
     value: 'purpose',
-    width: '150',
     align: 'center',
   },
   {
     text: '管理级别',
     value: 'managerLevelName',
-    width: '150',
     align: 'center',
   },
   {
     text: '使用单位',
     value: 'useDeptName',
-    width: '150',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
     align: 'center',
   },
 ]) // 表格
@@ -103,7 +93,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 7ab7c18..2f7cf28 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,6 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
+import { addStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 const userInfo = useUserStore()
@@ -24,56 +25,18 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
-  assetNo: '', // 资产编号
-  assetType: '', // 资产类型
-  assetSource: '', // 资产来源
+  applyDesc: '', // 申请说明
+  time: '', // 时间
+  fileList: [] as any[], //	说明书
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
   equipmentNo: '', // 设备编号
   equipmentName: '', // 设备名称
-  labelBind: '', // 标签绑定
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
-  equipmentType: '', // 设备类型
-  equipmentCategory: '', // 设备类别
-  capitalSource: '', // 资本来源
-  managerLevel: '', // 管理级别
-  purpose: '', // 用途
-  technicalLevel: '', // 技术水平
-  intactState: '', // 完好状态
-  manufacturerCountry: '', // 厂家国别
-  manufacturer: '', // 生产厂家
-  overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
-  manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
-  weight: '', // 重量
-  enableDate: '', // 启用年月
-  singlePrice: '', // 单价
-  installIncidentalExpenses: '', //	安装及杂费
-  originValue: '', //	原值
-  useDept: '', //	使用部门
-  installPlace: '', //	安装地点
-  createUser: '', //		创建人/负责人
-  depreciationPeriod: '', //	折旧年限
-  depreciationMethod: '', //	折旧方法
-  attribute: '', //	属性
-  majorCategory: '', //	专业分类
-  presentOriginValue: '', //	目前原值
-  managerState: '1', //	管理状态
-  fileList: [] as any[], //	说明书
-  remark: '', //	备注
-  mesureType: '', //	检定方式
-  mesureRange: '', //	测量范围
-  uncertainty: '', //	不确定度
-  usePerson: '', //	使用人
-  mesureDept: '', //	检定部门
-  mesureCycle: '', //	检定周期
-  mesureDate: '', //	检定日期
-  validDate: '', //	有效日期
-  mesureResult: '', //	检定结果
-  abc: '', //	ABC
-  isCalibrationTestEquipment: '', //	是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', //	是否是测量工装台账
-  isStandardSupportEquipment: '', //		是否标准配套设备
+  manufacturer: '', // 生产厂家
+  equipmentList: [],
   id: '',
 }) // 表单
 const ruleForm2 = ref({
@@ -224,62 +187,6 @@
     useDeptListNoTree.value = res.data
   })
 }
-// 重置
-const resetDATA = () => {
-  ruleForm1.value = {
-    assetNo: '', // 资产编号
-    assetType: '', // 资产类型
-    assetSource: '', // 资产来源
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 设备名称
-    labelBind: '', // 标签绑定
-    modelNo: '', // 型号
-    equipmentSpecifications: '', // 设备规格
-    equipmentType: '', // 设备类型
-    equipmentCategory: '', // 设备类别
-    capitalSource: '', // 资本来源
-    managerLevel: '', // 管理级别
-    purpose: '', // 用途
-    technicalLevel: '', // 技术水平
-    intactState: '', // 完好状态
-    manufacturerCountry: '', // 厂家国别
-    manufacturer: '', // 生产厂家
-    overallDimension: '', // 外形尺寸
-    manufacturingNo: '', // 出厂编号
-    manufacturingDate: '', // 出厂年月
-    cardEstablishmentDate: '', // 立卡年月
-    weight: '', // 重量
-    enableDate: '', // 启用年月
-    singlePrice: '', // 单价
-    installIncidentalExpenses: '', //	安装及杂费
-    originValue: '', //	原值
-    useDept: '', //	使用部门
-    installPlace: '', //	安装地点
-    createUser: '', //		创建人/负责人
-    depreciationPeriod: '', //	折旧年限
-    depreciationMethod: '', //	折旧方法
-    attribute: '', //	属性
-    majorCategory: '', //	专业分类
-    presentOriginValue: '', //	目前原值
-    managerState: '1', //	管理状态
-    fileList: [] as any[], //	说明书
-    remark: '', //	备注
-    mesureType: '', //	检定方式
-    mesureRange: '', //	测量范围
-    uncertainty: '', //	不确定度
-    usePerson: '', //	使用人
-    mesureDept: '', //	检定部门
-    mesureCycle: '', //	检定周期
-    mesureDate: '', //	检定日期
-    validDate: '', //	有效日期
-    mesureResult: '', //	检定结果
-    abc: '', //	ABC
-    isCalibrationTestEquipment: '', //	是否是技术指标需要校准检定的设备
-    isMeasureAccount: '', //	是否是测量工装台账
-    isStandardSupportEquipment: '', //		是否标准配套设备
-    id: '',
-  }
-}
 // 判断是设备借用还是状态管理
 const isDevice = computed(() => {
   if (name.value == '设备借用申请' || name.value == '设备借用处理') {
@@ -295,7 +202,7 @@
   // ruleFormRef.value?.resetFields()
   title.value = row.title
   name.value = row.name
-  if (isDevice) {
+  if (isDevice.value) {
     // 设备借用
     if (title.value !== '新建') {
       console.log(row.id)
@@ -307,6 +214,7 @@
   }
   else {
     // 状态管理
+
   }
 }
 onMounted(() => {
@@ -315,12 +223,11 @@
 
 // 关闭弹窗
 const close = () => {
-  resetDATA()
   $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  if (isDevice) {
+  if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
     await formEl2.validate((valid, fields) => {
@@ -362,7 +269,25 @@
     })
   }
   else {
-    // 状态管理
+  // 状态管理
+    if (!formEl1) { return }
+    await formEl1.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then((res) => {
+          addStatus(ruleForm1.value).then((res) => {
+            console.log(res)
+          })
+        })
+      }
+    })
   }
 }
 // 取消
@@ -520,7 +445,7 @@
   //     edit: true,
   //   })
   // }
-  addRowRef.value.initDialog({ title: '添加' })
+  addRowRef.value.initDialog({ title: '' })
 }
 const SelectionList = ref()
 // 表格选中
@@ -556,7 +481,20 @@
 }
 // 借用设备列表添加
 const addRowMethods = (row) => {
-  borrowList.value = [...borrowList.value, ...row]
+  if (isDevice.value) {
+    // 设备借用
+    borrowList.value = [...borrowList.value, ...row]
+  }
+  else {
+  // 设备状态
+    if (row.length > 1) {
+      ElMessage.warning('只能选择一个设备')
+    }
+    else {
+      console.log(row[0], '选中的设备')
+      const device = row[0]
+    }
+  }
   // row.forEach((element) => {
   //   borrowList.value.push({
   //     equipmentName: element.equipmentName, // 设备名称
@@ -577,18 +515,20 @@
   //  根据状态判断
   //  全部 待审批 审批中 可审批
   const arr = ['0', '2', '3']
-  return arr.includes($route.query?.approvalStatus as string)
+  const status = ['待审批', '审批中']
+  return arr.includes($route.query?.approvalStatus as string) && status.includes($route.query?.approvalStatusName as string)
 })
 // 详情页是否展示打印按钮
 const isPrint = computed(() => {
   //  根据状态判断
   // 未通过 已通过
-  const arr = ['4', '5']
-  return arr.includes($route.query?.approvalStatus as string)
+  const arr = ['4', '5', '0']
+  const status = ['未通过', '已通过']
+  return arr.includes($route.query?.approvalStatus as string) && status.includes($route.query?.approvalStatusName as string)
 })
 // 已取消状态
 const isCancel = computed(() => {
-  if ($route.query?.approvalStatus === '6') {
+  if ($route.query?.approvalStatus === '6' || $route.query?.approvalStatusName === '已取消') {
     return true
   }
   else {
@@ -620,16 +560,16 @@
         <el-button v-if="title === '详情' && isPrint" type="primary">
           打印
         </el-button>
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
-        </el-button>
+        </el-button> -->
         <el-button v-if="title === '详情' && isCancel" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="title === '详情' && $route.query?.approvalStatus === '1'" type="primary" @click="editForm">
+        <el-button v-if="(title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+        <el-button v-if="(title === '详情' && isCancel) || (title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="deleteForm">
           删除
         </el-button>
         <el-button type="info" @click="resetForm()">
@@ -652,7 +592,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo">
-              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="addRowBtn">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -685,17 +631,17 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="manufacturingDate">
+            <el-form-item label="闲置时间" prop="time">
               <el-date-picker
-                v-model="ruleForm1.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '闲置时间'"
                 style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="managerState">
-              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="applyDesc">
+              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -751,12 +697,12 @@
       </el-form>
     </detail-page>
     <div>
-      <detail-block title="借用设备列表">
+      <detail-block v-if="isDevice" title="借用设备列表">
         <template #btns>
-          <el-button type="primary" @click="addRowBtn">
+          <el-button v-if="title !== '详情'" type="primary" @click="addRowBtn">
             添加行
           </el-button>
-          <el-button type="info" @click="removeRowBtn">
+          <el-button v-if="title !== '详情'" type="info" @click="removeRowBtn">
             删除行
           </el-button>
         </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 131b636..fd576ff 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/stateManage'
+// import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -156,6 +156,7 @@
     query: {
       title: '详情',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
@@ -174,6 +175,7 @@
     query: {
       title: '编辑',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
@@ -260,6 +262,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index fa7b761..a566b78 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,6 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
@@ -36,17 +35,17 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
-  { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
-  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '人员编号', value: 'staffNo', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center', width: 90 },
+  { text: '性别', value: 'sex', align: 'center', width: 90 },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '证书号', value: 'certificateNo', align: 'center' },
-  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
-  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效日期', value: 'validDate', align: 'center' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center' },
 ]) // 表格
 const certificateStatusList = ref([
   {

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index ea79535..8771c29 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,10 +1,34 @@
 // 状态管理相关接口api
 import request from '../index'
 // 设备申请列表
-export function getApplyList(data: any) {
+export function getStatusList(data: any) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
+// 状态管理新建
+export function addStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/addStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理删除
+export function deleteStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/deleteStateManageList',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理详情
+export function detailStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/selectStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
deleted file mode 100644
index 7c087f8..0000000
--- a/src/components/SelectTree/index.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
-      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
-      TreeProps类型  {value:'id',babel:'name',children:'children'}
-      最好是 符合elementui类型的树形结构
-       -->
-<!-- 树状选择器 -->
-<script lang="ts">
-import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import type { PropType } from 'vue'
-import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
-interface PropsIter {
-  value: string
-  label: string
-  children: string
-  disabled?: boolean
-}
-interface TreeIter {
-  id: string
-  label: string
-  children?: TreeIter[]
-}
-export default defineComponent({
-  props: {
-    // 组件绑定的options
-    options: {
-      type: Array as PropType<TreeIter[]>,
-      required: true,
-    },
-    // 配置选项
-    keyProps: Object as PropType<PropsIter>,
-    // 双向绑定值
-    modelValue: [String, Number],
-    // 组件样式宽
-    width: {
-      type: String,
-      default: '240px',
-    },
-    // 空占位字符
-    placeholder: String,
-    // eslint-disable-next-line vue/prop-name-casing
-    TreeProps: {
-      type: Object,
-      default: () => { return {} },
-    },
-  },
-  setup(props, { emit }) {
-    const { modelValue } = toRefs(props)
-    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
-      value: modelValue.value,
-      currentNodeKey: '',
-      currentNodeLabel: '',
-    })
-    const treeSelect = ref<HTMLElement | null>(null)
-    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
-      select.currentNodeKey = data.id
-      select.currentNodeLabel = data.label || data.name
-      select.value = data.id;
-      (treeSelect.value as any).blur()
-      emit('update:modelValue', select.value)
-    }
-    // 筛选方法
-    const treeV2: any = ref<HTMLElement | null>(null)
-    const selectFilter = (query: string) => {
-      treeV2.value.filter(query)
-    }
-    // 筛选方法
-    const treeFilter = (query: string, node: TreeNode) => {
-      return node.label?.indexOf(query) !== -1
-    }
-    // 直接清空选择数据
-    const clearSelected = () => {
-      select.currentNodeKey = ''
-      select.currentNodeLabel = ''
-      select.value = ''
-      emit('update:modelValue', undefined)
-    }
-    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
-    const setCurrent = () => {
-      select.currentNodeKey = select.value
-      treeV2.value.setCurrentKey(select.value)
-      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
-      select.currentNodeLabel = data?.label || data?.name
-    }
-    // 监听外部清空数据源 清空组件数据
-    watch(modelValue, (v) => {
-      if (v === undefined && select.currentNodeKey !== '') {
-        clearSelected()
-      }
-      // 动态赋值
-      if (v) {
-        select.value = v
-        setCurrent()
-      }
-    })
-    // 回显数据
-    onMounted(async () => {
-      await nextTick()
-      if (select.value) {
-        setCurrent()
-      }
-    })
-    const TreeProps = toRefs(props)
-    return {
-      treeSelect,
-      treeV2,
-      // eslint-disable-next-line vue/no-dupe-keys
-      TreeProps,
-      ...toRefs(select),
-      nodeClick,
-      selectFilter,
-      treeFilter,
-      clearSelected,
-    }
-  },
-})
-</script>
-
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.tree_box {
-  width: 214px;
-}
-
-.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
-  height: auto;
-  max-height: 274px;
-  padding: 0;
-  overflow: hidden;
-  overflow-y: auto;
-}
-
-.el-select-dropdown__item.selected {
-  font-weight: normal;
-}
-
-ul li :deep(.el-tree .el-tree-node__content) {
-  height: auto;
-  padding: 0 20px;
-}
-
-.el-tree-node__label {
-  font-weight: normal;
-}
-
-.el-tree :deep(.is-current .el-tree-node__label) {
-  color: #409eff;
-  font-weight: 700;
-}
-
-.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
-  color: #606266;
-  font-weight: normal;
-}
-
-.selectInput {
-  padding: 0 5px;
-  box-sizing: border-box;
-}
-
-.el-select {
-  width: 100% !important;
-}
-</style>
-
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 35f3dec..240fffa 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -165,6 +165,7 @@
       title: '详情',
       name: '设备借用申请',
       approvalStatus: props.type,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -378,7 +379,7 @@
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{ (searchQuery.offset as number - 1) * (searchQuery.limit as number) + scope.$index + 1 }}
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index 755138a..f272ff7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -8,7 +8,6 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
@@ -116,41 +115,14 @@
   },
 ])
 // 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
+const mesureCycleList = ref<selectType[]>()
 // 获取下拉框数
 const fetchData = () => {
-// 获取资产类型
+  // 获取检定周期
+  getDictByCode('mesureCycle').then((response) => {
+    mesureCycleList.value = response.data
+  })
+  // 获取资产类型
   getDictByCode('assetType').then((response) => {
     assetTypeList.value = response.data
   })
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index e220eb5..d0b26b6 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -24,61 +24,51 @@
   {
     text: '固定资产编号',
     value: 'assetNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '设备名称',
     value: 'equipmentName',
-    width: '150',
     align: 'center',
   },
   {
     text: '型号',
     value: 'modelNo',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备规格',
     value: 'equipmentSpecifications',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类别',
     value: 'equipmentCategoryName',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类型',
     value: 'equipmentTypeName',
-    width: '150',
     align: 'center',
   },
   {
     text: '用途',
     value: 'purpose',
-    width: '150',
     align: 'center',
   },
   {
     text: '管理级别',
     value: 'managerLevelName',
-    width: '150',
     align: 'center',
   },
   {
     text: '使用单位',
     value: 'useDeptName',
-    width: '150',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
     align: 'center',
   },
 ]) // 表格
@@ -103,7 +93,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 7ab7c18..2f7cf28 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,6 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
+import { addStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 const userInfo = useUserStore()
@@ -24,56 +25,18 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
-  assetNo: '', // 资产编号
-  assetType: '', // 资产类型
-  assetSource: '', // 资产来源
+  applyDesc: '', // 申请说明
+  time: '', // 时间
+  fileList: [] as any[], //	说明书
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
   equipmentNo: '', // 设备编号
   equipmentName: '', // 设备名称
-  labelBind: '', // 标签绑定
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
-  equipmentType: '', // 设备类型
-  equipmentCategory: '', // 设备类别
-  capitalSource: '', // 资本来源
-  managerLevel: '', // 管理级别
-  purpose: '', // 用途
-  technicalLevel: '', // 技术水平
-  intactState: '', // 完好状态
-  manufacturerCountry: '', // 厂家国别
-  manufacturer: '', // 生产厂家
-  overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
-  manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
-  weight: '', // 重量
-  enableDate: '', // 启用年月
-  singlePrice: '', // 单价
-  installIncidentalExpenses: '', //	安装及杂费
-  originValue: '', //	原值
-  useDept: '', //	使用部门
-  installPlace: '', //	安装地点
-  createUser: '', //		创建人/负责人
-  depreciationPeriod: '', //	折旧年限
-  depreciationMethod: '', //	折旧方法
-  attribute: '', //	属性
-  majorCategory: '', //	专业分类
-  presentOriginValue: '', //	目前原值
-  managerState: '1', //	管理状态
-  fileList: [] as any[], //	说明书
-  remark: '', //	备注
-  mesureType: '', //	检定方式
-  mesureRange: '', //	测量范围
-  uncertainty: '', //	不确定度
-  usePerson: '', //	使用人
-  mesureDept: '', //	检定部门
-  mesureCycle: '', //	检定周期
-  mesureDate: '', //	检定日期
-  validDate: '', //	有效日期
-  mesureResult: '', //	检定结果
-  abc: '', //	ABC
-  isCalibrationTestEquipment: '', //	是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', //	是否是测量工装台账
-  isStandardSupportEquipment: '', //		是否标准配套设备
+  manufacturer: '', // 生产厂家
+  equipmentList: [],
   id: '',
 }) // 表单
 const ruleForm2 = ref({
@@ -224,62 +187,6 @@
     useDeptListNoTree.value = res.data
   })
 }
-// 重置
-const resetDATA = () => {
-  ruleForm1.value = {
-    assetNo: '', // 资产编号
-    assetType: '', // 资产类型
-    assetSource: '', // 资产来源
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 设备名称
-    labelBind: '', // 标签绑定
-    modelNo: '', // 型号
-    equipmentSpecifications: '', // 设备规格
-    equipmentType: '', // 设备类型
-    equipmentCategory: '', // 设备类别
-    capitalSource: '', // 资本来源
-    managerLevel: '', // 管理级别
-    purpose: '', // 用途
-    technicalLevel: '', // 技术水平
-    intactState: '', // 完好状态
-    manufacturerCountry: '', // 厂家国别
-    manufacturer: '', // 生产厂家
-    overallDimension: '', // 外形尺寸
-    manufacturingNo: '', // 出厂编号
-    manufacturingDate: '', // 出厂年月
-    cardEstablishmentDate: '', // 立卡年月
-    weight: '', // 重量
-    enableDate: '', // 启用年月
-    singlePrice: '', // 单价
-    installIncidentalExpenses: '', //	安装及杂费
-    originValue: '', //	原值
-    useDept: '', //	使用部门
-    installPlace: '', //	安装地点
-    createUser: '', //		创建人/负责人
-    depreciationPeriod: '', //	折旧年限
-    depreciationMethod: '', //	折旧方法
-    attribute: '', //	属性
-    majorCategory: '', //	专业分类
-    presentOriginValue: '', //	目前原值
-    managerState: '1', //	管理状态
-    fileList: [] as any[], //	说明书
-    remark: '', //	备注
-    mesureType: '', //	检定方式
-    mesureRange: '', //	测量范围
-    uncertainty: '', //	不确定度
-    usePerson: '', //	使用人
-    mesureDept: '', //	检定部门
-    mesureCycle: '', //	检定周期
-    mesureDate: '', //	检定日期
-    validDate: '', //	有效日期
-    mesureResult: '', //	检定结果
-    abc: '', //	ABC
-    isCalibrationTestEquipment: '', //	是否是技术指标需要校准检定的设备
-    isMeasureAccount: '', //	是否是测量工装台账
-    isStandardSupportEquipment: '', //		是否标准配套设备
-    id: '',
-  }
-}
 // 判断是设备借用还是状态管理
 const isDevice = computed(() => {
   if (name.value == '设备借用申请' || name.value == '设备借用处理') {
@@ -295,7 +202,7 @@
   // ruleFormRef.value?.resetFields()
   title.value = row.title
   name.value = row.name
-  if (isDevice) {
+  if (isDevice.value) {
     // 设备借用
     if (title.value !== '新建') {
       console.log(row.id)
@@ -307,6 +214,7 @@
   }
   else {
     // 状态管理
+
   }
 }
 onMounted(() => {
@@ -315,12 +223,11 @@
 
 // 关闭弹窗
 const close = () => {
-  resetDATA()
   $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  if (isDevice) {
+  if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
     await formEl2.validate((valid, fields) => {
@@ -362,7 +269,25 @@
     })
   }
   else {
-    // 状态管理
+  // 状态管理
+    if (!formEl1) { return }
+    await formEl1.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then((res) => {
+          addStatus(ruleForm1.value).then((res) => {
+            console.log(res)
+          })
+        })
+      }
+    })
   }
 }
 // 取消
@@ -520,7 +445,7 @@
   //     edit: true,
   //   })
   // }
-  addRowRef.value.initDialog({ title: '添加' })
+  addRowRef.value.initDialog({ title: '' })
 }
 const SelectionList = ref()
 // 表格选中
@@ -556,7 +481,20 @@
 }
 // 借用设备列表添加
 const addRowMethods = (row) => {
-  borrowList.value = [...borrowList.value, ...row]
+  if (isDevice.value) {
+    // 设备借用
+    borrowList.value = [...borrowList.value, ...row]
+  }
+  else {
+  // 设备状态
+    if (row.length > 1) {
+      ElMessage.warning('只能选择一个设备')
+    }
+    else {
+      console.log(row[0], '选中的设备')
+      const device = row[0]
+    }
+  }
   // row.forEach((element) => {
   //   borrowList.value.push({
   //     equipmentName: element.equipmentName, // 设备名称
@@ -577,18 +515,20 @@
   //  根据状态判断
   //  全部 待审批 审批中 可审批
   const arr = ['0', '2', '3']
-  return arr.includes($route.query?.approvalStatus as string)
+  const status = ['待审批', '审批中']
+  return arr.includes($route.query?.approvalStatus as string) && status.includes($route.query?.approvalStatusName as string)
 })
 // 详情页是否展示打印按钮
 const isPrint = computed(() => {
   //  根据状态判断
   // 未通过 已通过
-  const arr = ['4', '5']
-  return arr.includes($route.query?.approvalStatus as string)
+  const arr = ['4', '5', '0']
+  const status = ['未通过', '已通过']
+  return arr.includes($route.query?.approvalStatus as string) && status.includes($route.query?.approvalStatusName as string)
 })
 // 已取消状态
 const isCancel = computed(() => {
-  if ($route.query?.approvalStatus === '6') {
+  if ($route.query?.approvalStatus === '6' || $route.query?.approvalStatusName === '已取消') {
     return true
   }
   else {
@@ -620,16 +560,16 @@
         <el-button v-if="title === '详情' && isPrint" type="primary">
           打印
         </el-button>
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
-        </el-button>
+        </el-button> -->
         <el-button v-if="title === '详情' && isCancel" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="title === '详情' && $route.query?.approvalStatus === '1'" type="primary" @click="editForm">
+        <el-button v-if="(title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+        <el-button v-if="(title === '详情' && isCancel) || (title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="deleteForm">
           删除
         </el-button>
         <el-button type="info" @click="resetForm()">
@@ -652,7 +592,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo">
-              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="addRowBtn">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -685,17 +631,17 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="manufacturingDate">
+            <el-form-item label="闲置时间" prop="time">
               <el-date-picker
-                v-model="ruleForm1.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '闲置时间'"
                 style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="managerState">
-              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="applyDesc">
+              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -751,12 +697,12 @@
       </el-form>
     </detail-page>
     <div>
-      <detail-block title="借用设备列表">
+      <detail-block v-if="isDevice" title="借用设备列表">
         <template #btns>
-          <el-button type="primary" @click="addRowBtn">
+          <el-button v-if="title !== '详情'" type="primary" @click="addRowBtn">
             添加行
           </el-button>
-          <el-button type="info" @click="removeRowBtn">
+          <el-button v-if="title !== '详情'" type="info" @click="removeRowBtn">
             删除行
           </el-button>
         </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 131b636..fd576ff 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/stateManage'
+// import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -156,6 +156,7 @@
     query: {
       title: '详情',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
@@ -174,6 +175,7 @@
     query: {
       title: '编辑',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
@@ -260,6 +262,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index fa7b761..a566b78 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,6 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
@@ -36,17 +35,17 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
-  { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
-  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '人员编号', value: 'staffNo', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center', width: 90 },
+  { text: '性别', value: 'sex', align: 'center', width: 90 },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '证书号', value: 'certificateNo', align: 'center' },
-  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
-  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效日期', value: 'validDate', align: 'center' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center' },
 ]) // 表格
 const certificateStatusList = ref([
   {
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 0de6eb3..4fc3aa9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
-import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
 import { getUserList } from '@/api/system/user'
@@ -19,7 +18,7 @@
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
-const ruleForm = ref({
+const ruleForm: { [key: string]: string | any } = ref({
   account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
@@ -42,6 +41,7 @@
 }) // 表单
 const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const staffId = ref('')
 // 身份证号码验证规则
 const validateIDcard = (rule: any, value: any, callback: any) => {
   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
@@ -191,8 +191,18 @@
   }
   return true
 }
+interface certificateType {
+  certificateNo: string // 证书号
+  certificateName: string // 证书名称
+  certificateCompany: string // 发证单位
+  certificateDate: string // 发证日期
+  validDate: string// 有效日期
+  editable?: boolean // 编辑模式
+  checked?: number
+  staffId?: any
+}
 // 证书对象
-const addObj = {
+const addObj: { [key: string]: object } = {
   证书基本信息: {
     certificateNo: '', // 证书号
     certificateName: '', // 证书名称
@@ -399,13 +409,13 @@
   }
 }
 // 双击行显示输入框
-const dblclickRow = (row) => {
+const dblclickRow = (row: certificateType) => {
   setAllRowReadable()
   row.editable = true
 }
 const SelectionList = ref()
 // 表格选中
-const handleSelectionChange = (e) => {
+const handleSelectionChange = (e: certificateType[]) => {
   SelectionList.value = e
 }
 // 添加行
@@ -415,20 +425,53 @@
     setAllRowReadable()
     currentShow.value.data.push({
       ...addObj[current.value],
+      staffId: staffId.value ? staffId.value : undefined,
     })
   }
 }
-// const deleteArrID = ref<string[]>([])
 // 删除行
 const removeRow = () => {
   currentShow.value.data = currentShow.value.data.filter((item) => {
     return !SelectionList.value.includes(item)
   })
-  // 需要删除的行的id
-  // deleteArrID.value = currentShow.value.data.filter((item) => {
-  //   return SelectionList.value.includes(item)
-  // }).map(row => (row.id as string))
-  // console.log()
+}
+// 处理编辑记录的函数
+const handleRecord = (initData: any[], finalData: any[]) => {
+  const certificateList = [] as any[]
+  // 新增的
+  finalData.forEach((item) => {
+    if (!item.id) {
+      certificateList.push(item)
+    }
+  })
+  // 删除的
+  const arr = finalData.filter(item => item.id).map(data => (data.id))
+  const statrArr = initData.map(data => (data.id))
+  const deleteArr = statrArr.filter((item) => {
+    return !arr.includes(item)
+  })
+  deleteArr.forEach((string) => {
+    certificateList.push({
+      id: string,
+      isDel: 1,
+    })
+  })
+  // 修改的
+  const editArr = statrArr.filter((item) => {
+    return arr.includes(item)
+  })
+  const editArrObject = finalData.filter((item) => {
+    return editArr.includes(item.id)
+  })
+  editArrObject.forEach((item) => {
+    certificateList.push({
+      ...item,
+      createTime: null,
+      updateTime: null,
+    })
+  })
+  console.log(certificateList, '最终需要提交的数组')
+  return certificateList
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
@@ -444,45 +487,27 @@
           type: 'warning',
         },
       ).then(() => {
-        // 处理编辑后的证书信息数据
-        console.log(changeList.value[0].data)
-        console.log(changeList.value[0].deepData)
-        const certificateList = []
-        // 1.先拿新增的
-        changeList.value[0].data.forEach((item) => {
-          if (!item.id) {
-            certificateList.push(item)
+        changeList.value[0].data = changeList.value[0].data.filter(item => item.certificateName !== '')
+        if (changeList.value[0].data.length) {
+          for (const key in ruleForm.value) {
+            if (ruleForm.value[key] === '') {
+              ruleForm.value[key] = null
+            }
           }
-        })
-        // 2.再拿删除的
-        const deleteArr = changeList.value[0].data.filter((item) => {
-          return changeList.value[0].deepData.includes(item)
-        })
-        console.log(deleteArr)
-        const aaa = changeList.value[0].deepData.filter((item) => {
-          return deleteArr.includes(item.id)
-        })
-        // changeList.value[0].data = changeList.value[0].data.filter(item => item.certificateName !== '')
-        // if (changeList.value[0].data.length) {
-        //   for (const key in ruleForm.value) {
-        //     if (ruleForm.value[key] === '') {
-        //       ruleForm.value[key] = null
-        //     }
-        //   }
-        //   (title.value === '新建'
-        //     ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
-        //     : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
-        //     if (res.code == 200) {
-        //       formEl?.resetFields()
-        //       ElMessage.success('提交成功')
-        //       resetFormData()
-        //       $router.go(-1)
-        //     }
-        //   })
-        // }
-        // else {
-        //   ElMessage.warning('请先填写证书信息')
-        // }
+          (title.value === '新建'
+            ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
+            : getStaffupdate({ ...ruleForm.value, certificateList: handleRecord(changeList.value[0].deepData, changeList.value[0].data), birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              resetFormData()
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          ElMessage.warning('请先填写证书信息')
+        }
       })
     }
   })
@@ -515,6 +540,7 @@
         ruleForm.value = res.data
         changeList.value[0].data = res.data.certificateList
         changeList.value[0].deepData = lodash.cloneDeep(res.data.certificateList)
+        staffId.value = changeList.value[0].deepData[0]?.staffId
       }
     })
   }

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index ea79535..8771c29 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,10 +1,34 @@
 // 状态管理相关接口api
 import request from '../index'
 // 设备申请列表
-export function getApplyList(data: any) {
+export function getStatusList(data: any) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
+// 状态管理新建
+export function addStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/addStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理删除
+export function deleteStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/deleteStateManageList',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理详情
+export function detailStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/selectStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
deleted file mode 100644
index 7c087f8..0000000
--- a/src/components/SelectTree/index.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
-      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
-      TreeProps类型  {value:'id',babel:'name',children:'children'}
-      最好是 符合elementui类型的树形结构
-       -->
-<!-- 树状选择器 -->
-<script lang="ts">
-import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import type { PropType } from 'vue'
-import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
-interface PropsIter {
-  value: string
-  label: string
-  children: string
-  disabled?: boolean
-}
-interface TreeIter {
-  id: string
-  label: string
-  children?: TreeIter[]
-}
-export default defineComponent({
-  props: {
-    // 组件绑定的options
-    options: {
-      type: Array as PropType<TreeIter[]>,
-      required: true,
-    },
-    // 配置选项
-    keyProps: Object as PropType<PropsIter>,
-    // 双向绑定值
-    modelValue: [String, Number],
-    // 组件样式宽
-    width: {
-      type: String,
-      default: '240px',
-    },
-    // 空占位字符
-    placeholder: String,
-    // eslint-disable-next-line vue/prop-name-casing
-    TreeProps: {
-      type: Object,
-      default: () => { return {} },
-    },
-  },
-  setup(props, { emit }) {
-    const { modelValue } = toRefs(props)
-    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
-      value: modelValue.value,
-      currentNodeKey: '',
-      currentNodeLabel: '',
-    })
-    const treeSelect = ref<HTMLElement | null>(null)
-    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
-      select.currentNodeKey = data.id
-      select.currentNodeLabel = data.label || data.name
-      select.value = data.id;
-      (treeSelect.value as any).blur()
-      emit('update:modelValue', select.value)
-    }
-    // 筛选方法
-    const treeV2: any = ref<HTMLElement | null>(null)
-    const selectFilter = (query: string) => {
-      treeV2.value.filter(query)
-    }
-    // 筛选方法
-    const treeFilter = (query: string, node: TreeNode) => {
-      return node.label?.indexOf(query) !== -1
-    }
-    // 直接清空选择数据
-    const clearSelected = () => {
-      select.currentNodeKey = ''
-      select.currentNodeLabel = ''
-      select.value = ''
-      emit('update:modelValue', undefined)
-    }
-    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
-    const setCurrent = () => {
-      select.currentNodeKey = select.value
-      treeV2.value.setCurrentKey(select.value)
-      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
-      select.currentNodeLabel = data?.label || data?.name
-    }
-    // 监听外部清空数据源 清空组件数据
-    watch(modelValue, (v) => {
-      if (v === undefined && select.currentNodeKey !== '') {
-        clearSelected()
-      }
-      // 动态赋值
-      if (v) {
-        select.value = v
-        setCurrent()
-      }
-    })
-    // 回显数据
-    onMounted(async () => {
-      await nextTick()
-      if (select.value) {
-        setCurrent()
-      }
-    })
-    const TreeProps = toRefs(props)
-    return {
-      treeSelect,
-      treeV2,
-      // eslint-disable-next-line vue/no-dupe-keys
-      TreeProps,
-      ...toRefs(select),
-      nodeClick,
-      selectFilter,
-      treeFilter,
-      clearSelected,
-    }
-  },
-})
-</script>
-
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.tree_box {
-  width: 214px;
-}
-
-.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
-  height: auto;
-  max-height: 274px;
-  padding: 0;
-  overflow: hidden;
-  overflow-y: auto;
-}
-
-.el-select-dropdown__item.selected {
-  font-weight: normal;
-}
-
-ul li :deep(.el-tree .el-tree-node__content) {
-  height: auto;
-  padding: 0 20px;
-}
-
-.el-tree-node__label {
-  font-weight: normal;
-}
-
-.el-tree :deep(.is-current .el-tree-node__label) {
-  color: #409eff;
-  font-weight: 700;
-}
-
-.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
-  color: #606266;
-  font-weight: normal;
-}
-
-.selectInput {
-  padding: 0 5px;
-  box-sizing: border-box;
-}
-
-.el-select {
-  width: 100% !important;
-}
-</style>
-
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 35f3dec..240fffa 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -165,6 +165,7 @@
       title: '详情',
       name: '设备借用申请',
       approvalStatus: props.type,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -378,7 +379,7 @@
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{ (searchQuery.offset as number - 1) * (searchQuery.limit as number) + scope.$index + 1 }}
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index 755138a..f272ff7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -8,7 +8,6 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
@@ -116,41 +115,14 @@
   },
 ])
 // 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
+const mesureCycleList = ref<selectType[]>()
 // 获取下拉框数
 const fetchData = () => {
-// 获取资产类型
+  // 获取检定周期
+  getDictByCode('mesureCycle').then((response) => {
+    mesureCycleList.value = response.data
+  })
+  // 获取资产类型
   getDictByCode('assetType').then((response) => {
     assetTypeList.value = response.data
   })
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index e220eb5..d0b26b6 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -24,61 +24,51 @@
   {
     text: '固定资产编号',
     value: 'assetNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '设备名称',
     value: 'equipmentName',
-    width: '150',
     align: 'center',
   },
   {
     text: '型号',
     value: 'modelNo',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备规格',
     value: 'equipmentSpecifications',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类别',
     value: 'equipmentCategoryName',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类型',
     value: 'equipmentTypeName',
-    width: '150',
     align: 'center',
   },
   {
     text: '用途',
     value: 'purpose',
-    width: '150',
     align: 'center',
   },
   {
     text: '管理级别',
     value: 'managerLevelName',
-    width: '150',
     align: 'center',
   },
   {
     text: '使用单位',
     value: 'useDeptName',
-    width: '150',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
     align: 'center',
   },
 ]) // 表格
@@ -103,7 +93,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 7ab7c18..2f7cf28 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,6 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
+import { addStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 const userInfo = useUserStore()
@@ -24,56 +25,18 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
-  assetNo: '', // 资产编号
-  assetType: '', // 资产类型
-  assetSource: '', // 资产来源
+  applyDesc: '', // 申请说明
+  time: '', // 时间
+  fileList: [] as any[], //	说明书
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
   equipmentNo: '', // 设备编号
   equipmentName: '', // 设备名称
-  labelBind: '', // 标签绑定
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
-  equipmentType: '', // 设备类型
-  equipmentCategory: '', // 设备类别
-  capitalSource: '', // 资本来源
-  managerLevel: '', // 管理级别
-  purpose: '', // 用途
-  technicalLevel: '', // 技术水平
-  intactState: '', // 完好状态
-  manufacturerCountry: '', // 厂家国别
-  manufacturer: '', // 生产厂家
-  overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
-  manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
-  weight: '', // 重量
-  enableDate: '', // 启用年月
-  singlePrice: '', // 单价
-  installIncidentalExpenses: '', //	安装及杂费
-  originValue: '', //	原值
-  useDept: '', //	使用部门
-  installPlace: '', //	安装地点
-  createUser: '', //		创建人/负责人
-  depreciationPeriod: '', //	折旧年限
-  depreciationMethod: '', //	折旧方法
-  attribute: '', //	属性
-  majorCategory: '', //	专业分类
-  presentOriginValue: '', //	目前原值
-  managerState: '1', //	管理状态
-  fileList: [] as any[], //	说明书
-  remark: '', //	备注
-  mesureType: '', //	检定方式
-  mesureRange: '', //	测量范围
-  uncertainty: '', //	不确定度
-  usePerson: '', //	使用人
-  mesureDept: '', //	检定部门
-  mesureCycle: '', //	检定周期
-  mesureDate: '', //	检定日期
-  validDate: '', //	有效日期
-  mesureResult: '', //	检定结果
-  abc: '', //	ABC
-  isCalibrationTestEquipment: '', //	是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', //	是否是测量工装台账
-  isStandardSupportEquipment: '', //		是否标准配套设备
+  manufacturer: '', // 生产厂家
+  equipmentList: [],
   id: '',
 }) // 表单
 const ruleForm2 = ref({
@@ -224,62 +187,6 @@
     useDeptListNoTree.value = res.data
   })
 }
-// 重置
-const resetDATA = () => {
-  ruleForm1.value = {
-    assetNo: '', // 资产编号
-    assetType: '', // 资产类型
-    assetSource: '', // 资产来源
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 设备名称
-    labelBind: '', // 标签绑定
-    modelNo: '', // 型号
-    equipmentSpecifications: '', // 设备规格
-    equipmentType: '', // 设备类型
-    equipmentCategory: '', // 设备类别
-    capitalSource: '', // 资本来源
-    managerLevel: '', // 管理级别
-    purpose: '', // 用途
-    technicalLevel: '', // 技术水平
-    intactState: '', // 完好状态
-    manufacturerCountry: '', // 厂家国别
-    manufacturer: '', // 生产厂家
-    overallDimension: '', // 外形尺寸
-    manufacturingNo: '', // 出厂编号
-    manufacturingDate: '', // 出厂年月
-    cardEstablishmentDate: '', // 立卡年月
-    weight: '', // 重量
-    enableDate: '', // 启用年月
-    singlePrice: '', // 单价
-    installIncidentalExpenses: '', //	安装及杂费
-    originValue: '', //	原值
-    useDept: '', //	使用部门
-    installPlace: '', //	安装地点
-    createUser: '', //		创建人/负责人
-    depreciationPeriod: '', //	折旧年限
-    depreciationMethod: '', //	折旧方法
-    attribute: '', //	属性
-    majorCategory: '', //	专业分类
-    presentOriginValue: '', //	目前原值
-    managerState: '1', //	管理状态
-    fileList: [] as any[], //	说明书
-    remark: '', //	备注
-    mesureType: '', //	检定方式
-    mesureRange: '', //	测量范围
-    uncertainty: '', //	不确定度
-    usePerson: '', //	使用人
-    mesureDept: '', //	检定部门
-    mesureCycle: '', //	检定周期
-    mesureDate: '', //	检定日期
-    validDate: '', //	有效日期
-    mesureResult: '', //	检定结果
-    abc: '', //	ABC
-    isCalibrationTestEquipment: '', //	是否是技术指标需要校准检定的设备
-    isMeasureAccount: '', //	是否是测量工装台账
-    isStandardSupportEquipment: '', //		是否标准配套设备
-    id: '',
-  }
-}
 // 判断是设备借用还是状态管理
 const isDevice = computed(() => {
   if (name.value == '设备借用申请' || name.value == '设备借用处理') {
@@ -295,7 +202,7 @@
   // ruleFormRef.value?.resetFields()
   title.value = row.title
   name.value = row.name
-  if (isDevice) {
+  if (isDevice.value) {
     // 设备借用
     if (title.value !== '新建') {
       console.log(row.id)
@@ -307,6 +214,7 @@
   }
   else {
     // 状态管理
+
   }
 }
 onMounted(() => {
@@ -315,12 +223,11 @@
 
 // 关闭弹窗
 const close = () => {
-  resetDATA()
   $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  if (isDevice) {
+  if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
     await formEl2.validate((valid, fields) => {
@@ -362,7 +269,25 @@
     })
   }
   else {
-    // 状态管理
+  // 状态管理
+    if (!formEl1) { return }
+    await formEl1.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then((res) => {
+          addStatus(ruleForm1.value).then((res) => {
+            console.log(res)
+          })
+        })
+      }
+    })
   }
 }
 // 取消
@@ -520,7 +445,7 @@
   //     edit: true,
   //   })
   // }
-  addRowRef.value.initDialog({ title: '添加' })
+  addRowRef.value.initDialog({ title: '' })
 }
 const SelectionList = ref()
 // 表格选中
@@ -556,7 +481,20 @@
 }
 // 借用设备列表添加
 const addRowMethods = (row) => {
-  borrowList.value = [...borrowList.value, ...row]
+  if (isDevice.value) {
+    // 设备借用
+    borrowList.value = [...borrowList.value, ...row]
+  }
+  else {
+  // 设备状态
+    if (row.length > 1) {
+      ElMessage.warning('只能选择一个设备')
+    }
+    else {
+      console.log(row[0], '选中的设备')
+      const device = row[0]
+    }
+  }
   // row.forEach((element) => {
   //   borrowList.value.push({
   //     equipmentName: element.equipmentName, // 设备名称
@@ -577,18 +515,20 @@
   //  根据状态判断
   //  全部 待审批 审批中 可审批
   const arr = ['0', '2', '3']
-  return arr.includes($route.query?.approvalStatus as string)
+  const status = ['待审批', '审批中']
+  return arr.includes($route.query?.approvalStatus as string) && status.includes($route.query?.approvalStatusName as string)
 })
 // 详情页是否展示打印按钮
 const isPrint = computed(() => {
   //  根据状态判断
   // 未通过 已通过
-  const arr = ['4', '5']
-  return arr.includes($route.query?.approvalStatus as string)
+  const arr = ['4', '5', '0']
+  const status = ['未通过', '已通过']
+  return arr.includes($route.query?.approvalStatus as string) && status.includes($route.query?.approvalStatusName as string)
 })
 // 已取消状态
 const isCancel = computed(() => {
-  if ($route.query?.approvalStatus === '6') {
+  if ($route.query?.approvalStatus === '6' || $route.query?.approvalStatusName === '已取消') {
     return true
   }
   else {
@@ -620,16 +560,16 @@
         <el-button v-if="title === '详情' && isPrint" type="primary">
           打印
         </el-button>
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
-        </el-button>
+        </el-button> -->
         <el-button v-if="title === '详情' && isCancel" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="title === '详情' && $route.query?.approvalStatus === '1'" type="primary" @click="editForm">
+        <el-button v-if="(title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+        <el-button v-if="(title === '详情' && isCancel) || (title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="deleteForm">
           删除
         </el-button>
         <el-button type="info" @click="resetForm()">
@@ -652,7 +592,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo">
-              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="addRowBtn">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -685,17 +631,17 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="manufacturingDate">
+            <el-form-item label="闲置时间" prop="time">
               <el-date-picker
-                v-model="ruleForm1.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '闲置时间'"
                 style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="managerState">
-              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="applyDesc">
+              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -751,12 +697,12 @@
       </el-form>
     </detail-page>
     <div>
-      <detail-block title="借用设备列表">
+      <detail-block v-if="isDevice" title="借用设备列表">
         <template #btns>
-          <el-button type="primary" @click="addRowBtn">
+          <el-button v-if="title !== '详情'" type="primary" @click="addRowBtn">
             添加行
           </el-button>
-          <el-button type="info" @click="removeRowBtn">
+          <el-button v-if="title !== '详情'" type="info" @click="removeRowBtn">
             删除行
           </el-button>
         </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 131b636..fd576ff 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/stateManage'
+// import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -156,6 +156,7 @@
     query: {
       title: '详情',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
@@ -174,6 +175,7 @@
     query: {
       title: '编辑',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
@@ -260,6 +262,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index fa7b761..a566b78 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,6 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
@@ -36,17 +35,17 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
-  { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
-  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '人员编号', value: 'staffNo', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center', width: 90 },
+  { text: '性别', value: 'sex', align: 'center', width: 90 },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '证书号', value: 'certificateNo', align: 'center' },
-  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
-  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效日期', value: 'validDate', align: 'center' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center' },
 ]) // 表格
 const certificateStatusList = ref([
   {
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 0de6eb3..4fc3aa9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
-import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
 import { getUserList } from '@/api/system/user'
@@ -19,7 +18,7 @@
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
-const ruleForm = ref({
+const ruleForm: { [key: string]: string | any } = ref({
   account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
@@ -42,6 +41,7 @@
 }) // 表单
 const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const staffId = ref('')
 // 身份证号码验证规则
 const validateIDcard = (rule: any, value: any, callback: any) => {
   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
@@ -191,8 +191,18 @@
   }
   return true
 }
+interface certificateType {
+  certificateNo: string // 证书号
+  certificateName: string // 证书名称
+  certificateCompany: string // 发证单位
+  certificateDate: string // 发证日期
+  validDate: string// 有效日期
+  editable?: boolean // 编辑模式
+  checked?: number
+  staffId?: any
+}
 // 证书对象
-const addObj = {
+const addObj: { [key: string]: object } = {
   证书基本信息: {
     certificateNo: '', // 证书号
     certificateName: '', // 证书名称
@@ -399,13 +409,13 @@
   }
 }
 // 双击行显示输入框
-const dblclickRow = (row) => {
+const dblclickRow = (row: certificateType) => {
   setAllRowReadable()
   row.editable = true
 }
 const SelectionList = ref()
 // 表格选中
-const handleSelectionChange = (e) => {
+const handleSelectionChange = (e: certificateType[]) => {
   SelectionList.value = e
 }
 // 添加行
@@ -415,20 +425,53 @@
     setAllRowReadable()
     currentShow.value.data.push({
       ...addObj[current.value],
+      staffId: staffId.value ? staffId.value : undefined,
     })
   }
 }
-// const deleteArrID = ref<string[]>([])
 // 删除行
 const removeRow = () => {
   currentShow.value.data = currentShow.value.data.filter((item) => {
     return !SelectionList.value.includes(item)
   })
-  // 需要删除的行的id
-  // deleteArrID.value = currentShow.value.data.filter((item) => {
-  //   return SelectionList.value.includes(item)
-  // }).map(row => (row.id as string))
-  // console.log()
+}
+// 处理编辑记录的函数
+const handleRecord = (initData: any[], finalData: any[]) => {
+  const certificateList = [] as any[]
+  // 新增的
+  finalData.forEach((item) => {
+    if (!item.id) {
+      certificateList.push(item)
+    }
+  })
+  // 删除的
+  const arr = finalData.filter(item => item.id).map(data => (data.id))
+  const statrArr = initData.map(data => (data.id))
+  const deleteArr = statrArr.filter((item) => {
+    return !arr.includes(item)
+  })
+  deleteArr.forEach((string) => {
+    certificateList.push({
+      id: string,
+      isDel: 1,
+    })
+  })
+  // 修改的
+  const editArr = statrArr.filter((item) => {
+    return arr.includes(item)
+  })
+  const editArrObject = finalData.filter((item) => {
+    return editArr.includes(item.id)
+  })
+  editArrObject.forEach((item) => {
+    certificateList.push({
+      ...item,
+      createTime: null,
+      updateTime: null,
+    })
+  })
+  console.log(certificateList, '最终需要提交的数组')
+  return certificateList
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
@@ -444,45 +487,27 @@
           type: 'warning',
         },
       ).then(() => {
-        // 处理编辑后的证书信息数据
-        console.log(changeList.value[0].data)
-        console.log(changeList.value[0].deepData)
-        const certificateList = []
-        // 1.先拿新增的
-        changeList.value[0].data.forEach((item) => {
-          if (!item.id) {
-            certificateList.push(item)
+        changeList.value[0].data = changeList.value[0].data.filter(item => item.certificateName !== '')
+        if (changeList.value[0].data.length) {
+          for (const key in ruleForm.value) {
+            if (ruleForm.value[key] === '') {
+              ruleForm.value[key] = null
+            }
           }
-        })
-        // 2.再拿删除的
-        const deleteArr = changeList.value[0].data.filter((item) => {
-          return changeList.value[0].deepData.includes(item)
-        })
-        console.log(deleteArr)
-        const aaa = changeList.value[0].deepData.filter((item) => {
-          return deleteArr.includes(item.id)
-        })
-        // changeList.value[0].data = changeList.value[0].data.filter(item => item.certificateName !== '')
-        // if (changeList.value[0].data.length) {
-        //   for (const key in ruleForm.value) {
-        //     if (ruleForm.value[key] === '') {
-        //       ruleForm.value[key] = null
-        //     }
-        //   }
-        //   (title.value === '新建'
-        //     ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
-        //     : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
-        //     if (res.code == 200) {
-        //       formEl?.resetFields()
-        //       ElMessage.success('提交成功')
-        //       resetFormData()
-        //       $router.go(-1)
-        //     }
-        //   })
-        // }
-        // else {
-        //   ElMessage.warning('请先填写证书信息')
-        // }
+          (title.value === '新建'
+            ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
+            : getStaffupdate({ ...ruleForm.value, certificateList: handleRecord(changeList.value[0].deepData, changeList.value[0].data), birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              resetFormData()
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          ElMessage.warning('请先填写证书信息')
+        }
       })
     }
   })
@@ -515,6 +540,7 @@
         ruleForm.value = res.data
         changeList.value[0].data = res.data.certificateList
         changeList.value[0].deepData = lodash.cloneDeep(res.data.certificateList)
+        staffId.value = changeList.value[0].deepData[0]?.staffId
       }
     })
   }
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index cbdea0b..8959b08 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -10,7 +10,6 @@
 import { toTreeList } from '@/utils/structure'
 import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const ruleFormRef1 = ref<FormInstance>() // from组件
 const ruleFormRef2 = ref<FormInstance>() // from组件

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index ea79535..8771c29 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,10 +1,34 @@
 // 状态管理相关接口api
 import request from '../index'
 // 设备申请列表
-export function getApplyList(data: any) {
+export function getStatusList(data: any) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
+// 状态管理新建
+export function addStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/addStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理删除
+export function deleteStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/deleteStateManageList',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理详情
+export function detailStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/selectStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
deleted file mode 100644
index 7c087f8..0000000
--- a/src/components/SelectTree/index.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
-      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
-      TreeProps类型  {value:'id',babel:'name',children:'children'}
-      最好是 符合elementui类型的树形结构
-       -->
-<!-- 树状选择器 -->
-<script lang="ts">
-import type { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
-import type { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
-import type { PropType } from 'vue'
-import { defineComponent, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue'
-interface PropsIter {
-  value: string
-  label: string
-  children: string
-  disabled?: boolean
-}
-interface TreeIter {
-  id: string
-  label: string
-  children?: TreeIter[]
-}
-export default defineComponent({
-  props: {
-    // 组件绑定的options
-    options: {
-      type: Array as PropType<TreeIter[]>,
-      required: true,
-    },
-    // 配置选项
-    keyProps: Object as PropType<PropsIter>,
-    // 双向绑定值
-    modelValue: [String, Number],
-    // 组件样式宽
-    width: {
-      type: String,
-      default: '240px',
-    },
-    // 空占位字符
-    placeholder: String,
-    // eslint-disable-next-line vue/prop-name-casing
-    TreeProps: {
-      type: Object,
-      default: () => { return {} },
-    },
-  },
-  setup(props, { emit }) {
-    const { modelValue } = toRefs(props)
-    const select: { value: string | number | undefined; currentNodeLabel: string | number | undefined; currentNodeKey: string | number | undefined } = reactive({
-      value: modelValue.value,
-      currentNodeKey: '',
-      currentNodeLabel: '',
-    })
-    const treeSelect = ref<HTMLElement | null>(null)
-    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
-      select.currentNodeKey = data.id
-      select.currentNodeLabel = data.label || data.name
-      select.value = data.id;
-      (treeSelect.value as any).blur()
-      emit('update:modelValue', select.value)
-    }
-    // 筛选方法
-    const treeV2: any = ref<HTMLElement | null>(null)
-    const selectFilter = (query: string) => {
-      treeV2.value.filter(query)
-    }
-    // 筛选方法
-    const treeFilter = (query: string, node: TreeNode) => {
-      return node.label?.indexOf(query) !== -1
-    }
-    // 直接清空选择数据
-    const clearSelected = () => {
-      select.currentNodeKey = ''
-      select.currentNodeLabel = ''
-      select.value = ''
-      emit('update:modelValue', undefined)
-    }
-    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
-    const setCurrent = () => {
-      select.currentNodeKey = select.value
-      treeV2.value.setCurrentKey(select.value)
-      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
-      select.currentNodeLabel = data?.label || data?.name
-    }
-    // 监听外部清空数据源 清空组件数据
-    watch(modelValue, (v) => {
-      if (v === undefined && select.currentNodeKey !== '') {
-        clearSelected()
-      }
-      // 动态赋值
-      if (v) {
-        select.value = v
-        setCurrent()
-      }
-    })
-    // 回显数据
-    onMounted(async () => {
-      await nextTick()
-      if (select.value) {
-        setCurrent()
-      }
-    })
-    const TreeProps = toRefs(props)
-    return {
-      treeSelect,
-      treeV2,
-      // eslint-disable-next-line vue/no-dupe-keys
-      TreeProps,
-      ...toRefs(select),
-      nodeClick,
-      selectFilter,
-      treeFilter,
-      clearSelected,
-    }
-  },
-})
-</script>
-
-<template>
-  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
-      <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
-          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
-          :filter-method="treeFilter"></el-tree-v2>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.tree_box {
-  width: 214px;
-}
-
-.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
-  height: auto;
-  max-height: 274px;
-  padding: 0;
-  overflow: hidden;
-  overflow-y: auto;
-}
-
-.el-select-dropdown__item.selected {
-  font-weight: normal;
-}
-
-ul li :deep(.el-tree .el-tree-node__content) {
-  height: auto;
-  padding: 0 20px;
-}
-
-.el-tree-node__label {
-  font-weight: normal;
-}
-
-.el-tree :deep(.is-current .el-tree-node__label) {
-  color: #409eff;
-  font-weight: 700;
-}
-
-.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
-  color: #606266;
-  font-weight: normal;
-}
-
-.selectInput {
-  padding: 0 5px;
-  box-sizing: border-box;
-}
-
-.el-select {
-  width: 100% !important;
-}
-</style>
-
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 35f3dec..240fffa 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -165,6 +165,7 @@
       title: '详情',
       name: '设备借用申请',
       approvalStatus: props.type,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -378,7 +379,7 @@
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
               <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+                {{ (searchQuery.offset as number - 1) * (searchQuery.limit as number) + scope.$index + 1 }}
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index 755138a..f272ff7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -8,7 +8,6 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
@@ -116,41 +115,14 @@
   },
 ])
 // 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
+const mesureCycleList = ref<selectType[]>()
 // 获取下拉框数
 const fetchData = () => {
-// 获取资产类型
+  // 获取检定周期
+  getDictByCode('mesureCycle').then((response) => {
+    mesureCycleList.value = response.data
+  })
+  // 获取资产类型
   getDictByCode('assetType').then((response) => {
     assetTypeList.value = response.data
   })
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index e220eb5..d0b26b6 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -24,61 +24,51 @@
   {
     text: '固定资产编号',
     value: 'assetNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '设备名称',
     value: 'equipmentName',
-    width: '150',
     align: 'center',
   },
   {
     text: '型号',
     value: 'modelNo',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备规格',
     value: 'equipmentSpecifications',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类别',
     value: 'equipmentCategoryName',
-    width: '150',
     align: 'center',
   },
   {
     text: '设备类型',
     value: 'equipmentTypeName',
-    width: '150',
     align: 'center',
   },
   {
     text: '用途',
     value: 'purpose',
-    width: '150',
     align: 'center',
   },
   {
     text: '管理级别',
     value: 'managerLevelName',
-    width: '150',
     align: 'center',
   },
   {
     text: '使用单位',
     value: 'useDeptName',
-    width: '150',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
     align: 'center',
   },
 ]) // 表格
@@ -103,7 +93,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 7ab7c18..2f7cf28 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,6 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
+import { addStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 const userInfo = useUserStore()
@@ -24,56 +25,18 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
-  assetNo: '', // 资产编号
-  assetType: '', // 资产类型
-  assetSource: '', // 资产来源
+  applyDesc: '', // 申请说明
+  time: '', // 时间
+  fileList: [] as any[], //	说明书
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
   equipmentNo: '', // 设备编号
   equipmentName: '', // 设备名称
-  labelBind: '', // 标签绑定
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
-  equipmentType: '', // 设备类型
-  equipmentCategory: '', // 设备类别
-  capitalSource: '', // 资本来源
-  managerLevel: '', // 管理级别
-  purpose: '', // 用途
-  technicalLevel: '', // 技术水平
-  intactState: '', // 完好状态
-  manufacturerCountry: '', // 厂家国别
-  manufacturer: '', // 生产厂家
-  overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
-  manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
-  weight: '', // 重量
-  enableDate: '', // 启用年月
-  singlePrice: '', // 单价
-  installIncidentalExpenses: '', //	安装及杂费
-  originValue: '', //	原值
-  useDept: '', //	使用部门
-  installPlace: '', //	安装地点
-  createUser: '', //		创建人/负责人
-  depreciationPeriod: '', //	折旧年限
-  depreciationMethod: '', //	折旧方法
-  attribute: '', //	属性
-  majorCategory: '', //	专业分类
-  presentOriginValue: '', //	目前原值
-  managerState: '1', //	管理状态
-  fileList: [] as any[], //	说明书
-  remark: '', //	备注
-  mesureType: '', //	检定方式
-  mesureRange: '', //	测量范围
-  uncertainty: '', //	不确定度
-  usePerson: '', //	使用人
-  mesureDept: '', //	检定部门
-  mesureCycle: '', //	检定周期
-  mesureDate: '', //	检定日期
-  validDate: '', //	有效日期
-  mesureResult: '', //	检定结果
-  abc: '', //	ABC
-  isCalibrationTestEquipment: '', //	是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', //	是否是测量工装台账
-  isStandardSupportEquipment: '', //		是否标准配套设备
+  manufacturer: '', // 生产厂家
+  equipmentList: [],
   id: '',
 }) // 表单
 const ruleForm2 = ref({
@@ -224,62 +187,6 @@
     useDeptListNoTree.value = res.data
   })
 }
-// 重置
-const resetDATA = () => {
-  ruleForm1.value = {
-    assetNo: '', // 资产编号
-    assetType: '', // 资产类型
-    assetSource: '', // 资产来源
-    equipmentNo: '', // 设备编号
-    equipmentName: '', // 设备名称
-    labelBind: '', // 标签绑定
-    modelNo: '', // 型号
-    equipmentSpecifications: '', // 设备规格
-    equipmentType: '', // 设备类型
-    equipmentCategory: '', // 设备类别
-    capitalSource: '', // 资本来源
-    managerLevel: '', // 管理级别
-    purpose: '', // 用途
-    technicalLevel: '', // 技术水平
-    intactState: '', // 完好状态
-    manufacturerCountry: '', // 厂家国别
-    manufacturer: '', // 生产厂家
-    overallDimension: '', // 外形尺寸
-    manufacturingNo: '', // 出厂编号
-    manufacturingDate: '', // 出厂年月
-    cardEstablishmentDate: '', // 立卡年月
-    weight: '', // 重量
-    enableDate: '', // 启用年月
-    singlePrice: '', // 单价
-    installIncidentalExpenses: '', //	安装及杂费
-    originValue: '', //	原值
-    useDept: '', //	使用部门
-    installPlace: '', //	安装地点
-    createUser: '', //		创建人/负责人
-    depreciationPeriod: '', //	折旧年限
-    depreciationMethod: '', //	折旧方法
-    attribute: '', //	属性
-    majorCategory: '', //	专业分类
-    presentOriginValue: '', //	目前原值
-    managerState: '1', //	管理状态
-    fileList: [] as any[], //	说明书
-    remark: '', //	备注
-    mesureType: '', //	检定方式
-    mesureRange: '', //	测量范围
-    uncertainty: '', //	不确定度
-    usePerson: '', //	使用人
-    mesureDept: '', //	检定部门
-    mesureCycle: '', //	检定周期
-    mesureDate: '', //	检定日期
-    validDate: '', //	有效日期
-    mesureResult: '', //	检定结果
-    abc: '', //	ABC
-    isCalibrationTestEquipment: '', //	是否是技术指标需要校准检定的设备
-    isMeasureAccount: '', //	是否是测量工装台账
-    isStandardSupportEquipment: '', //		是否标准配套设备
-    id: '',
-  }
-}
 // 判断是设备借用还是状态管理
 const isDevice = computed(() => {
   if (name.value == '设备借用申请' || name.value == '设备借用处理') {
@@ -295,7 +202,7 @@
   // ruleFormRef.value?.resetFields()
   title.value = row.title
   name.value = row.name
-  if (isDevice) {
+  if (isDevice.value) {
     // 设备借用
     if (title.value !== '新建') {
       console.log(row.id)
@@ -307,6 +214,7 @@
   }
   else {
     // 状态管理
+
   }
 }
 onMounted(() => {
@@ -315,12 +223,11 @@
 
 // 关闭弹窗
 const close = () => {
-  resetDATA()
   $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  if (isDevice) {
+  if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
     await formEl2.validate((valid, fields) => {
@@ -362,7 +269,25 @@
     })
   }
   else {
-    // 状态管理
+  // 状态管理
+    if (!formEl1) { return }
+    await formEl1.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then((res) => {
+          addStatus(ruleForm1.value).then((res) => {
+            console.log(res)
+          })
+        })
+      }
+    })
   }
 }
 // 取消
@@ -520,7 +445,7 @@
   //     edit: true,
   //   })
   // }
-  addRowRef.value.initDialog({ title: '添加' })
+  addRowRef.value.initDialog({ title: '' })
 }
 const SelectionList = ref()
 // 表格选中
@@ -556,7 +481,20 @@
 }
 // 借用设备列表添加
 const addRowMethods = (row) => {
-  borrowList.value = [...borrowList.value, ...row]
+  if (isDevice.value) {
+    // 设备借用
+    borrowList.value = [...borrowList.value, ...row]
+  }
+  else {
+  // 设备状态
+    if (row.length > 1) {
+      ElMessage.warning('只能选择一个设备')
+    }
+    else {
+      console.log(row[0], '选中的设备')
+      const device = row[0]
+    }
+  }
   // row.forEach((element) => {
   //   borrowList.value.push({
   //     equipmentName: element.equipmentName, // 设备名称
@@ -577,18 +515,20 @@
   //  根据状态判断
   //  全部 待审批 审批中 可审批
   const arr = ['0', '2', '3']
-  return arr.includes($route.query?.approvalStatus as string)
+  const status = ['待审批', '审批中']
+  return arr.includes($route.query?.approvalStatus as string) && status.includes($route.query?.approvalStatusName as string)
 })
 // 详情页是否展示打印按钮
 const isPrint = computed(() => {
   //  根据状态判断
   // 未通过 已通过
-  const arr = ['4', '5']
-  return arr.includes($route.query?.approvalStatus as string)
+  const arr = ['4', '5', '0']
+  const status = ['未通过', '已通过']
+  return arr.includes($route.query?.approvalStatus as string) && status.includes($route.query?.approvalStatusName as string)
 })
 // 已取消状态
 const isCancel = computed(() => {
-  if ($route.query?.approvalStatus === '6') {
+  if ($route.query?.approvalStatus === '6' || $route.query?.approvalStatusName === '已取消') {
     return true
   }
   else {
@@ -620,16 +560,16 @@
         <el-button v-if="title === '详情' && isPrint" type="primary">
           打印
         </el-button>
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
-        </el-button>
+        </el-button> -->
         <el-button v-if="title === '详情' && isCancel" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="title === '详情' && $route.query?.approvalStatus === '1'" type="primary" @click="editForm">
+        <el-button v-if="(title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+        <el-button v-if="(title === '详情' && isCancel) || (title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="deleteForm">
           删除
         </el-button>
         <el-button type="info" @click="resetForm()">
@@ -652,7 +592,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo">
-              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="addRowBtn">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -685,17 +631,17 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="manufacturingDate">
+            <el-form-item label="闲置时间" prop="time">
               <el-date-picker
-                v-model="ruleForm1.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '闲置时间'"
                 style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="managerState">
-              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="applyDesc">
+              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -751,12 +697,12 @@
       </el-form>
     </detail-page>
     <div>
-      <detail-block title="借用设备列表">
+      <detail-block v-if="isDevice" title="借用设备列表">
         <template #btns>
-          <el-button type="primary" @click="addRowBtn">
+          <el-button v-if="title !== '详情'" type="primary" @click="addRowBtn">
             添加行
           </el-button>
-          <el-button type="info" @click="removeRowBtn">
+          <el-button v-if="title !== '详情'" type="info" @click="removeRowBtn">
             删除行
           </el-button>
         </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 131b636..fd576ff 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/stateManage'
+// import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -156,6 +156,7 @@
     query: {
       title: '详情',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
@@ -174,6 +175,7 @@
     query: {
       title: '编辑',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
@@ -260,6 +262,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index fa7b761..a566b78 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,6 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
@@ -36,17 +35,17 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
-  { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
-  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '人员编号', value: 'staffNo', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center', width: 90 },
+  { text: '性别', value: 'sex', align: 'center', width: 90 },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '证书号', value: 'certificateNo', align: 'center' },
-  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
-  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效日期', value: 'validDate', align: 'center' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center' },
 ]) // 表格
 const certificateStatusList = ref([
   {
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 0de6eb3..4fc3aa9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
-import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
 import type { technologyJobType } from '../person-interface'
 import userListDialog from './userListDialog.vue'
 import { getUserList } from '@/api/system/user'
@@ -19,7 +18,7 @@
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
-const ruleForm = ref({
+const ruleForm: { [key: string]: string | any } = ref({
   account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
@@ -42,6 +41,7 @@
 }) // 表单
 const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const staffId = ref('')
 // 身份证号码验证规则
 const validateIDcard = (rule: any, value: any, callback: any) => {
   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
@@ -191,8 +191,18 @@
   }
   return true
 }
+interface certificateType {
+  certificateNo: string // 证书号
+  certificateName: string // 证书名称
+  certificateCompany: string // 发证单位
+  certificateDate: string // 发证日期
+  validDate: string// 有效日期
+  editable?: boolean // 编辑模式
+  checked?: number
+  staffId?: any
+}
 // 证书对象
-const addObj = {
+const addObj: { [key: string]: object } = {
   证书基本信息: {
     certificateNo: '', // 证书号
     certificateName: '', // 证书名称
@@ -399,13 +409,13 @@
   }
 }
 // 双击行显示输入框
-const dblclickRow = (row) => {
+const dblclickRow = (row: certificateType) => {
   setAllRowReadable()
   row.editable = true
 }
 const SelectionList = ref()
 // 表格选中
-const handleSelectionChange = (e) => {
+const handleSelectionChange = (e: certificateType[]) => {
   SelectionList.value = e
 }
 // 添加行
@@ -415,20 +425,53 @@
     setAllRowReadable()
     currentShow.value.data.push({
       ...addObj[current.value],
+      staffId: staffId.value ? staffId.value : undefined,
     })
   }
 }
-// const deleteArrID = ref<string[]>([])
 // 删除行
 const removeRow = () => {
   currentShow.value.data = currentShow.value.data.filter((item) => {
     return !SelectionList.value.includes(item)
   })
-  // 需要删除的行的id
-  // deleteArrID.value = currentShow.value.data.filter((item) => {
-  //   return SelectionList.value.includes(item)
-  // }).map(row => (row.id as string))
-  // console.log()
+}
+// 处理编辑记录的函数
+const handleRecord = (initData: any[], finalData: any[]) => {
+  const certificateList = [] as any[]
+  // 新增的
+  finalData.forEach((item) => {
+    if (!item.id) {
+      certificateList.push(item)
+    }
+  })
+  // 删除的
+  const arr = finalData.filter(item => item.id).map(data => (data.id))
+  const statrArr = initData.map(data => (data.id))
+  const deleteArr = statrArr.filter((item) => {
+    return !arr.includes(item)
+  })
+  deleteArr.forEach((string) => {
+    certificateList.push({
+      id: string,
+      isDel: 1,
+    })
+  })
+  // 修改的
+  const editArr = statrArr.filter((item) => {
+    return arr.includes(item)
+  })
+  const editArrObject = finalData.filter((item) => {
+    return editArr.includes(item.id)
+  })
+  editArrObject.forEach((item) => {
+    certificateList.push({
+      ...item,
+      createTime: null,
+      updateTime: null,
+    })
+  })
+  console.log(certificateList, '最终需要提交的数组')
+  return certificateList
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
@@ -444,45 +487,27 @@
           type: 'warning',
         },
       ).then(() => {
-        // 处理编辑后的证书信息数据
-        console.log(changeList.value[0].data)
-        console.log(changeList.value[0].deepData)
-        const certificateList = []
-        // 1.先拿新增的
-        changeList.value[0].data.forEach((item) => {
-          if (!item.id) {
-            certificateList.push(item)
+        changeList.value[0].data = changeList.value[0].data.filter(item => item.certificateName !== '')
+        if (changeList.value[0].data.length) {
+          for (const key in ruleForm.value) {
+            if (ruleForm.value[key] === '') {
+              ruleForm.value[key] = null
+            }
           }
-        })
-        // 2.再拿删除的
-        const deleteArr = changeList.value[0].data.filter((item) => {
-          return changeList.value[0].deepData.includes(item)
-        })
-        console.log(deleteArr)
-        const aaa = changeList.value[0].deepData.filter((item) => {
-          return deleteArr.includes(item.id)
-        })
-        // changeList.value[0].data = changeList.value[0].data.filter(item => item.certificateName !== '')
-        // if (changeList.value[0].data.length) {
-        //   for (const key in ruleForm.value) {
-        //     if (ruleForm.value[key] === '') {
-        //       ruleForm.value[key] = null
-        //     }
-        //   }
-        //   (title.value === '新建'
-        //     ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
-        //     : getStaffupdate({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
-        //     if (res.code == 200) {
-        //       formEl?.resetFields()
-        //       ElMessage.success('提交成功')
-        //       resetFormData()
-        //       $router.go(-1)
-        //     }
-        //   })
-        // }
-        // else {
-        //   ElMessage.warning('请先填写证书信息')
-        // }
+          (title.value === '新建'
+            ? getStaffAdd({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })
+            : getStaffupdate({ ...ruleForm.value, certificateList: handleRecord(changeList.value[0].deepData, changeList.value[0].data), birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` })).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              resetFormData()
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          ElMessage.warning('请先填写证书信息')
+        }
       })
     }
   })
@@ -515,6 +540,7 @@
         ruleForm.value = res.data
         changeList.value[0].data = res.data.certificateList
         changeList.value[0].deepData = lodash.cloneDeep(res.data.certificateList)
+        staffId.value = changeList.value[0].deepData[0]?.staffId
       }
     })
   }
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index cbdea0b..8959b08 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -10,7 +10,6 @@
 import { toTreeList } from '@/utils/structure'
 import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const ruleFormRef1 = ref<FormInstance>() // from组件
 const ruleFormRef2 = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 31ea6c1..d3a1ea9 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,6 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const $route = useRoute()
@@ -25,17 +24,17 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
-  { text: '姓名', value: 'name', align: 'center', width: '150' },
-  { text: '学历', value: 'education', align: 'center', width: '90' },
-  { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
-  { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
-  { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '180' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
+  { text: '人员编号', value: 'staffNo', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '学历', value: 'education', align: 'center' },
+  { text: '性别', value: 'sex', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '行政职务', value: 'administrationJob', align: 'center' },
+  { text: '计量专业', value: 'major', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id