diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index 703674f..b2c2357 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="unusedApply" />
+    <page name="设备处置申请" authority="handleApply" apply-type="6" />
   </app-container>
 </template>
 

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index 703674f..b2c2357 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="unusedApply" />
+    <page name="设备处置申请" authority="handleApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 35c2af6..744f0f3 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="unusedApply" />
+    <page name="设备启封申请" authority="openApply" apply-type="4" />
   </app-container>
 </template>
 

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index 703674f..b2c2357 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="unusedApply" />
+    <page name="设备处置申请" authority="handleApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 35c2af6..744f0f3 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="unusedApply" />
+    <page name="设备启封申请" authority="openApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 282ecd8..94c6475 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="unusedApply" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
   </app-container>
 </template>
 

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index 703674f..b2c2357 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="unusedApply" />
+    <page name="设备处置申请" authority="handleApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 35c2af6..744f0f3 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="unusedApply" />
+    <page name="设备启封申请" authority="openApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 282ecd8..94c6475 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="unusedApply" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index 1c8544d..a9e6733 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="unusedApply" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
   </app-container>
 </template>
 

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index 703674f..b2c2357 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="unusedApply" />
+    <page name="设备处置申请" authority="handleApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 35c2af6..744f0f3 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="unusedApply" />
+    <page name="设备启封申请" authority="openApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 282ecd8..94c6475 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="unusedApply" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index 1c8544d..a9e6733 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="unusedApply" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 4b02b09..8f15c63 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
   </app-container>
 </template>
 

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index 703674f..b2c2357 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="unusedApply" />
+    <page name="设备处置申请" authority="handleApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 35c2af6..744f0f3 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="unusedApply" />
+    <page name="设备启封申请" authority="openApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 282ecd8..94c6475 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="unusedApply" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index 1c8544d..a9e6733 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="unusedApply" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 4b02b09..8f15c63 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index c758059..e2ff064 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -77,7 +77,7 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publisher = userInfo.$state.deptId
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
   else if (row.title === '详情') {
@@ -126,9 +126,6 @@
       type: 'warning',
     },
       ).then((res) => {
-        if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher = userInfo.$state.deptId
-        }
         if (flag == '提交') {
           confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -257,15 +254,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
+              <dept-select v-model="ruleForm.publisher" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '请选择发布单位'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index 703674f..b2c2357 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="unusedApply" />
+    <page name="设备处置申请" authority="handleApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 35c2af6..744f0f3 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="unusedApply" />
+    <page name="设备启封申请" authority="openApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 282ecd8..94c6475 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="unusedApply" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index 1c8544d..a9e6733 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="unusedApply" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 4b02b09..8f15c63 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index c758059..e2ff064 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -77,7 +77,7 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publisher = userInfo.$state.deptId
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
   else if (row.title === '详情') {
@@ -126,9 +126,6 @@
       type: 'warning',
     },
       ).then((res) => {
-        if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher = userInfo.$state.deptId
-        }
         if (flag == '提交') {
           confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -257,15 +254,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
+              <dept-select v-model="ruleForm.publisher" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '请选择发布单位'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index f8f7528..a1c6722 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -22,6 +22,10 @@
 watch(current, (newValue) => {
   console.log(newValue, 'newValue')
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+},
+{
+  immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('fileMenu', current.value)

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index 703674f..b2c2357 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="unusedApply" />
+    <page name="设备处置申请" authority="handleApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 35c2af6..744f0f3 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="unusedApply" />
+    <page name="设备启封申请" authority="openApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 282ecd8..94c6475 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="unusedApply" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index 1c8544d..a9e6733 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="unusedApply" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 4b02b09..8f15c63 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index c758059..e2ff064 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -77,7 +77,7 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publisher = userInfo.$state.deptId
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
   else if (row.title === '详情') {
@@ -126,9 +126,6 @@
       type: 'warning',
     },
       ).then((res) => {
-        if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher = userInfo.$state.deptId
-        }
         if (flag == '提交') {
           confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -257,15 +254,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
+              <dept-select v-model="ruleForm.publisher" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '请选择发布单位'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index f8f7528..a1c6722 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -22,6 +22,10 @@
 watch(current, (newValue) => {
   console.log(newValue, 'newValue')
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+},
+{
+  immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('fileMenu', current.value)
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 16a8c9d..fa7b761 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -207,7 +207,6 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -215,7 +214,6 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -313,10 +311,11 @@
               :value="item.id"
             />
           </el-select> -->
-          <com-tree-select
+          <!-- <com-tree-select
             ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
             placeholder="工作部门" :tree-props="deptProps"
-          />
+          /> -->
+          <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index 703674f..b2c2357 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="unusedApply" />
+    <page name="设备处置申请" authority="handleApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 35c2af6..744f0f3 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="unusedApply" />
+    <page name="设备启封申请" authority="openApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 282ecd8..94c6475 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="unusedApply" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index 1c8544d..a9e6733 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="unusedApply" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 4b02b09..8f15c63 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index c758059..e2ff064 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -77,7 +77,7 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publisher = userInfo.$state.deptId
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
   else if (row.title === '详情') {
@@ -126,9 +126,6 @@
       type: 'warning',
     },
       ).then((res) => {
-        if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher = userInfo.$state.deptId
-        }
         if (flag == '提交') {
           confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -257,15 +254,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
+              <dept-select v-model="ruleForm.publisher" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '请选择发布单位'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index f8f7528..a1c6722 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -22,6 +22,10 @@
 watch(current, (newValue) => {
   console.log(newValue, 'newValue')
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+},
+{
+  immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('fileMenu', current.value)
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 16a8c9d..fa7b761 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -207,7 +207,6 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -215,7 +214,6 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -313,10 +311,11 @@
               :value="item.id"
             />
           </el-select> -->
-          <com-tree-select
+          <!-- <com-tree-select
             ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
             placeholder="工作部门" :tree-props="deptProps"
-          />
+          /> -->
+          <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7850502..0de6eb3 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,8 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 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 certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -12,7 +13,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 { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -228,6 +228,7 @@
   {
     name: '证书基本信息',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '发证单位',
@@ -269,6 +270,7 @@
   {
     name: '计量工作培训记录',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '培训时间',
@@ -317,6 +319,7 @@
   {
     name: '业务记录',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '样品编号',
@@ -415,11 +418,17 @@
     })
   }
 }
+// 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 submitForm = async (formEl: FormInstance | undefined) => {
@@ -435,27 +444,45 @@
           type: 'warning',
         },
       ).then(() => {
-        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
-            }
+        // 处理编辑后的证书信息数据
+        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)
           }
-          (title.value === '新建'
-            ? getStaffAdd
-            : 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('请先填写证书信息')
-        }
+        })
+        // 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('请先填写证书信息')
+        // }
       })
     }
   })
@@ -467,14 +494,12 @@
   $router.go(-1)
   resetFormData()
 }
-const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
-  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -489,6 +514,7 @@
       if (res.code === 200) {
         ruleForm.value = res.data
         changeList.value[0].data = res.data.certificateList
+        changeList.value[0].deepData = lodash.cloneDeep(res.data.certificateList)
       }
     })
   }
@@ -557,14 +583,15 @@
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
+              <!-- <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
                 ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
                 placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
-              />
+              /> -->
+              <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index 703674f..b2c2357 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="unusedApply" />
+    <page name="设备处置申请" authority="handleApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 35c2af6..744f0f3 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="unusedApply" />
+    <page name="设备启封申请" authority="openApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 282ecd8..94c6475 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="unusedApply" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index 1c8544d..a9e6733 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="unusedApply" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 4b02b09..8f15c63 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index c758059..e2ff064 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -77,7 +77,7 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publisher = userInfo.$state.deptId
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
   else if (row.title === '详情') {
@@ -126,9 +126,6 @@
       type: 'warning',
     },
       ).then((res) => {
-        if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher = userInfo.$state.deptId
-        }
         if (flag == '提交') {
           confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -257,15 +254,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
+              <dept-select v-model="ruleForm.publisher" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '请选择发布单位'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index f8f7528..a1c6722 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -22,6 +22,10 @@
 watch(current, (newValue) => {
   console.log(newValue, 'newValue')
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+},
+{
+  immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('fileMenu', current.value)
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 16a8c9d..fa7b761 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -207,7 +207,6 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -215,7 +214,6 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -313,10 +311,11 @@
               :value="item.id"
             />
           </el-select> -->
-          <com-tree-select
+          <!-- <com-tree-select
             ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
             placeholder="工作部门" :tree-props="deptProps"
-          />
+          /> -->
+          <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7850502..0de6eb3 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,8 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 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 certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -12,7 +13,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 { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -228,6 +228,7 @@
   {
     name: '证书基本信息',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '发证单位',
@@ -269,6 +270,7 @@
   {
     name: '计量工作培训记录',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '培训时间',
@@ -317,6 +319,7 @@
   {
     name: '业务记录',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '样品编号',
@@ -415,11 +418,17 @@
     })
   }
 }
+// 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 submitForm = async (formEl: FormInstance | undefined) => {
@@ -435,27 +444,45 @@
           type: 'warning',
         },
       ).then(() => {
-        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
-            }
+        // 处理编辑后的证书信息数据
+        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)
           }
-          (title.value === '新建'
-            ? getStaffAdd
-            : 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('请先填写证书信息')
-        }
+        })
+        // 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('请先填写证书信息')
+        // }
       })
     }
   })
@@ -467,14 +494,12 @@
   $router.go(-1)
   resetFormData()
 }
-const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
-  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -489,6 +514,7 @@
       if (res.code === 200) {
         ruleForm.value = res.data
         changeList.value[0].data = res.data.certificateList
+        changeList.value[0].deepData = lodash.cloneDeep(res.data.certificateList)
       }
     })
   }
@@ -557,14 +583,15 @@
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
+              <!-- <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
                 ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
                 placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
-              />
+              /> -->
+              <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index e2403ed..cbdea0b 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -199,14 +199,12 @@
   $router.go(-1)
   resetFormData()
 }
-const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
   name.value = row.name
-  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -299,7 +297,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
+              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -308,7 +307,7 @@
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
                 style="width: 100%;"
-              />
+              /> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index 703674f..b2c2357 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="unusedApply" />
+    <page name="设备处置申请" authority="handleApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 35c2af6..744f0f3 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="unusedApply" />
+    <page name="设备启封申请" authority="openApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 282ecd8..94c6475 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="unusedApply" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index 1c8544d..a9e6733 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="unusedApply" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 4b02b09..8f15c63 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index c758059..e2ff064 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -77,7 +77,7 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publisher = userInfo.$state.deptId
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
   else if (row.title === '详情') {
@@ -126,9 +126,6 @@
       type: 'warning',
     },
       ).then((res) => {
-        if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher = userInfo.$state.deptId
-        }
         if (flag == '提交') {
           confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -257,15 +254,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
+              <dept-select v-model="ruleForm.publisher" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '请选择发布单位'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index f8f7528..a1c6722 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -22,6 +22,10 @@
 watch(current, (newValue) => {
   console.log(newValue, 'newValue')
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+},
+{
+  immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('fileMenu', current.value)
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 16a8c9d..fa7b761 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -207,7 +207,6 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -215,7 +214,6 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -313,10 +311,11 @@
               :value="item.id"
             />
           </el-select> -->
-          <com-tree-select
+          <!-- <com-tree-select
             ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
             placeholder="工作部门" :tree-props="deptProps"
-          />
+          /> -->
+          <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7850502..0de6eb3 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,8 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 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 certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -12,7 +13,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 { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -228,6 +228,7 @@
   {
     name: '证书基本信息',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '发证单位',
@@ -269,6 +270,7 @@
   {
     name: '计量工作培训记录',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '培训时间',
@@ -317,6 +319,7 @@
   {
     name: '业务记录',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '样品编号',
@@ -415,11 +418,17 @@
     })
   }
 }
+// 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 submitForm = async (formEl: FormInstance | undefined) => {
@@ -435,27 +444,45 @@
           type: 'warning',
         },
       ).then(() => {
-        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
-            }
+        // 处理编辑后的证书信息数据
+        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)
           }
-          (title.value === '新建'
-            ? getStaffAdd
-            : 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('请先填写证书信息')
-        }
+        })
+        // 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('请先填写证书信息')
+        // }
       })
     }
   })
@@ -467,14 +494,12 @@
   $router.go(-1)
   resetFormData()
 }
-const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
-  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -489,6 +514,7 @@
       if (res.code === 200) {
         ruleForm.value = res.data
         changeList.value[0].data = res.data.certificateList
+        changeList.value[0].deepData = lodash.cloneDeep(res.data.certificateList)
       }
     })
   }
@@ -557,14 +583,15 @@
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
+              <!-- <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
                 ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
                 placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
-              />
+              /> -->
+              <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index e2403ed..cbdea0b 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -199,14 +199,12 @@
   $router.go(-1)
   resetFormData()
 }
-const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
   name.value = row.name
-  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -299,7 +297,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
+              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -308,7 +307,7 @@
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
                 style="width: 100%;"
-              />
+              /> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index e119e0d..31ea6c1 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -141,7 +141,6 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -149,7 +148,6 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -245,10 +243,11 @@
               :value="item.id"
             />
           </el-select> -->
-          <com-tree-select
+          <!-- <com-tree-select
             ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
             placeholder="工作部门" :tree-props="deptProps"
-          />
+          /> -->
+          <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index 703674f..b2c2357 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="unusedApply" />
+    <page name="设备处置申请" authority="handleApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 35c2af6..744f0f3 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="unusedApply" />
+    <page name="设备启封申请" authority="openApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 282ecd8..94c6475 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="unusedApply" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index 1c8544d..a9e6733 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="unusedApply" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 4b02b09..8f15c63 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index c758059..e2ff064 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -77,7 +77,7 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publisher = userInfo.$state.deptId
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
   else if (row.title === '详情') {
@@ -126,9 +126,6 @@
       type: 'warning',
     },
       ).then((res) => {
-        if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher = userInfo.$state.deptId
-        }
         if (flag == '提交') {
           confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -257,15 +254,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
+              <dept-select v-model="ruleForm.publisher" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '请选择发布单位'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index f8f7528..a1c6722 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -22,6 +22,10 @@
 watch(current, (newValue) => {
   console.log(newValue, 'newValue')
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+},
+{
+  immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('fileMenu', current.value)
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 16a8c9d..fa7b761 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -207,7 +207,6 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -215,7 +214,6 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -313,10 +311,11 @@
               :value="item.id"
             />
           </el-select> -->
-          <com-tree-select
+          <!-- <com-tree-select
             ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
             placeholder="工作部门" :tree-props="deptProps"
-          />
+          /> -->
+          <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7850502..0de6eb3 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,8 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 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 certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -12,7 +13,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 { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -228,6 +228,7 @@
   {
     name: '证书基本信息',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '发证单位',
@@ -269,6 +270,7 @@
   {
     name: '计量工作培训记录',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '培训时间',
@@ -317,6 +319,7 @@
   {
     name: '业务记录',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '样品编号',
@@ -415,11 +418,17 @@
     })
   }
 }
+// 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 submitForm = async (formEl: FormInstance | undefined) => {
@@ -435,27 +444,45 @@
           type: 'warning',
         },
       ).then(() => {
-        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
-            }
+        // 处理编辑后的证书信息数据
+        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)
           }
-          (title.value === '新建'
-            ? getStaffAdd
-            : 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('请先填写证书信息')
-        }
+        })
+        // 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('请先填写证书信息')
+        // }
       })
     }
   })
@@ -467,14 +494,12 @@
   $router.go(-1)
   resetFormData()
 }
-const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
-  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -489,6 +514,7 @@
       if (res.code === 200) {
         ruleForm.value = res.data
         changeList.value[0].data = res.data.certificateList
+        changeList.value[0].deepData = lodash.cloneDeep(res.data.certificateList)
       }
     })
   }
@@ -557,14 +583,15 @@
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
+              <!-- <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
                 ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
                 placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
-              />
+              /> -->
+              <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index e2403ed..cbdea0b 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -199,14 +199,12 @@
   $router.go(-1)
   resetFormData()
 }
-const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
   name.value = row.name
-  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -299,7 +297,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
+              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -308,7 +307,7 @@
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
                 style="width: 100%;"
-              />
+              /> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index e119e0d..31ea6c1 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -141,7 +141,6 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -149,7 +148,6 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -245,10 +243,11 @@
               :value="item.id"
             />
           </el-select> -->
-          <com-tree-select
+          <!-- <com-tree-select
             ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
             placeholder="工作部门" :tree-props="deptProps"
-          />
+          /> -->
+          <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 21d9af6..eaa60ae 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -153,15 +153,15 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2" />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
-          class="w-50 m-2 normal-input"
+          class="w-50 m-2"
         />
       </search-item>
       <search-item>

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 28ca2ed..47a713e 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -25,3 +25,36 @@
     data,
   })
 }
+// 设备借用申请编辑
+export function editApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请删除
+export function deleteApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请提交
+export function submitApply(data: object) {
+  return request({
+    url: '/equipmentApply/borrowEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+// 设备借用申请导出
+export function exportApply(data: object) {
+  return request({
+    url: '/equipmentApply/exportList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
new file mode 100644
index 0000000..ea79535
--- /dev/null
+++ b/src/api/device/stateManage.ts
@@ -0,0 +1,10 @@
+// 状态管理相关接口api
+import request from '../index'
+// 设备申请列表
+export function getApplyList(data: any) {
+  return request({
+    url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 2344541..ef7bd91 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -174,6 +174,7 @@
       check-on-click-node
       filterable
       class="full-width-input"
+      :disabled="props.disabled"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
       <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 93f7084..cd62c8b 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import type { Ref } from 'vue'
 import ResetPwd from './resetPwd.vue'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -15,6 +16,20 @@
 
 const resetPwd = ref()
 
+interface Message {
+  id: string
+  message: string
+  time: string
+}
+const messageList: Ref<Message[]> = ref([])
+
+messageList.value = [
+  { id: '1', message: '示例消息', time: '2022-07-20 18:32:00' },
+  { id: '2', message: '收到一条证书到期提醒', time: '2022-07-20 18:32:00' },
+  { id: '3', message: '有新的借用申请待审批', time: '2022-07-20 18:32:00' },
+  { id: '4', message: '您的请假申请已通过', time: '2022-07-20 18:32:00' },
+]
+
 function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout') {
   switch (command) {
     case 'dashboard':
@@ -76,6 +91,44 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <span v-if="settingsStore.mode === 'pc'" class="item">
+        <el-popover width="300">
+          <template #reference>
+            <div>
+              <el-badge :value="messageList.length" :max="9">
+                <el-icon>
+                  <svg-icon name="ep:bell" />
+                </el-icon>
+              </el-badge>
+            </div>
+          </template>
+          <template #default>
+            <div class="message-container">
+              <div class="message-title">消息({{ messageList.length }})</div>
+              <el-scrollbar max-height="400px">
+                <div v-for="message of messageList" :key="message.id" class="message-item">
+                  <div class="icon">
+                    <el-icon size="18">
+                      <svg-icon name="ep:chat-dot-square" />
+                    </el-icon>
+                  </div>
+                  <div class="message-content">
+                    <div class="message">
+                      {{ message.message }}
+                    </div>
+                    <div class="time">
+                      {{ message.time }}
+                    </div>
+                  </div>
+                </div>
+              </el-scrollbar>
+              <div class="message-footer">
+                进入消息列表
+              </div>
+            </div>
+          </template>
+        </el-popover>
+      </span>
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
@@ -140,6 +193,63 @@
   }
 }
 
+.message-container {
+  width: 100%;
+  padding: 0 5px;
+
+  .message-title {
+    width: 100%;
+    text-align: center;
+    padding-bottom: 10px;
+    font-size: 14px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .message-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+    padding: 8px 5px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #f6f6f6;
+    }
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      margin-right: 10px;
+      border-radius: 40px;
+      color: #fff;
+      background-color: var(--el-color-primary);
+      padding: 4px;
+    }
+
+    .message-content {
+      flex: 1;
+      font-size: 14px;
+
+      .time {
+        margin-top: 3px;
+        font-size: 12px;
+        color: #888;
+      }
+    }
+  }
+
+  .message-footer {
+    margin-top: 10px;
+    line-height: 2;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.user-container) {
   display: inline-block;
   height: 24px;
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 777ef0c..b10742f 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -85,7 +85,7 @@
         name: 'standingBookDetail',
         component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
         meta: {
-          title: '设备台账公用详情/编辑/新建',
+          title: '测量设备',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -98,15 +98,19 @@
           switch (type) {
             case 'measureDevice':
               to.meta.activeMenu = '/standingBook/measureDevice'
+              to.meta.title = '测量设备'
               break
             case 'standardMatchDevice':
               to.meta.activeMenu = '/standingBook/standardMatchDevice'
+              to.meta.title = '校准/检定设备'
               break
             case 'adjustDevice':
               to.meta.activeMenu = '/standingBook/adjustDevice'
+              to.meta.title = '标准配套设备'
               break
             case 'measureTool':
               to.meta.activeMenu = '/standingBook/measureTool'
+              to.meta.title = '测量工装'
               break
           }
           next()
@@ -124,7 +128,7 @@
       },
       {
         path: ':type/:id?',
-        name: 'fixedAssetsDetail',
+        name: 'fixedAssetsDetailType',
         component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
         meta: {
           title: '固定资产',
@@ -309,7 +313,7 @@
         name: 'stateManageDetail',
         component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
         meta: {
-          title: '状态管理公用详情/编辑/新建',
+          title: '设备闲置申请',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
@@ -321,24 +325,31 @@
           switch (type) {
             case 'unusedApply':
               to.meta.activeMenu = '/stateManage/unusedApply'
+              to.meta.title = '设备闲置申请'
               break
             case 'sealupApply':
               to.meta.activeMenu = '/stateManage/sealupApply'
+              to.meta.title = '设备封存申请'
               break
             case 'openApply':
               to.meta.activeMenu = '/stateManage/openApply'
+              to.meta.title = '设备启封申请'
               break
             case 'scrapApply':
               to.meta.activeMenu = '/stateManage/scrapApply'
+              to.meta.title = '设备报废申请'
               break
             case 'handleApply':
               to.meta.activeMenu = '/stateManage/handleApply'
+              to.meta.title = '设备处置申请'
               break
             case 'borrowapply':
               to.meta.activeMenu = '/borrow/borrowapply'
+              to.meta.title = '设备借用申请'
               break
             case 'borrowhandle':
               to.meta.activeMenu = '/borrow/borrowhandle'
+              to.meta.title = '设备借用处理'
               break
           }
           next()
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 973fa04..710bdc2 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -107,21 +107,27 @@
           switch (type) {
             case 'quality':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '质量文件'
               break
             case 'rules':
               to.meta.activeMenu = '/file/rules'
+              to.meta.title = '规章制度'
               break
             case 'remind':
               to.meta.activeMenu = '/file/quality'
+              to.meta.title = '管理办法'
               break
             case 'manageMethod':
               to.meta.activeMenu = '/file/manageMethod'
+              to.meta.title = '管理办法'
               break
             case 'testingMethod':
               to.meta.activeMenu = '/file/testingMethod'
+              to.meta.title = '校准检测办法'
               break
             case 'measureRule':
               to.meta.activeMenu = '/file/measureRule'
+              to.meta.title = '计量规程'
               break
           }
           next()
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 0cd02d3..66dd307 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -23,4 +23,5 @@
   validDate: string // 有效日期
   edit?: boolean
   equipmentName?: string
+  id?: string
 }
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6667663..53046f0 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -34,6 +34,7 @@
   }
 }, {
   immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('deviceBorrowApply', current.value)
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index d420d62..35f3dec 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { getApplyList } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { exportFile } from '@/utils/exportUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   type: {
     type: String,
@@ -30,19 +33,16 @@
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '文件号',
     value: 'fileNo',
-    width: '180',
     align: 'center',
   },
   {
@@ -53,7 +53,6 @@
   {
     text: '创建人',
     value: 'createUser',
-    width: '180',
     align: 'center',
   },
   {
@@ -66,7 +65,6 @@
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 // 其他状态的表格数据
@@ -74,47 +72,42 @@
   {
     text: '申请编号',
     value: 'applyNo',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请名称',
     value: 'applyName',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请部门',
     value: 'applyUnit',
-    width: '180',
     align: 'center',
   },
   {
     text: '申请人',
     value: 'applyPerson',
-    width: '200',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
-    width: '150',
   },
 ])
 const columns = computed(() => {
-  if (props.type !== '0') {
-    return columns2.value
-  }
-  else {
-    return columns1.value
-  }
+  // if (props.type !== '0') {
+  //   return columns2.value
+  // }
+  // else {
+  //   return columns1.value
+  // }
+  return columns2.value
 })
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -171,6 +164,7 @@
       id: row.id,
       title: '详情',
       name: '设备借用申请',
+      approvalStatus: props.type,
     },
   })
 }
@@ -182,6 +176,7 @@
       type: 'edit',
     },
     query: {
+      id: row.id,
       title: '编辑',
       name: '设备借用申请',
     },
@@ -190,7 +185,7 @@
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -199,15 +194,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -216,17 +211,13 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
-// 模板下载
-const templateDownload = () => {
-
-}
-// 标签识别
-const identify = () => {
-
-}
 // 新增
 const addBtn = () => {
   $router.push({
@@ -242,18 +233,18 @@
 }
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
 
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用申请')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 const approveRef = ref()
 // 同意
@@ -279,7 +270,7 @@
 // 取消
 const cancel = (row: any) => {
   ElMessageBox.confirm(
-    '确认取消吗？',
+    `确认取消${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -291,17 +282,34 @@
 // 提交
 const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认提交吗？',
+    `确认提交${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交',
+        })
+        getList()
+      }
+    })
+  })
 }
+const useDeptList = ref([])
 onMounted(() => {
   getList()
+  // 获取使用部门
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
 })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
@@ -310,9 +318,14 @@
   else {
     searchQuery.approvalStatus = newValue
   }
-  console.log(newValue, 'props')
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => searchQuery.time, (newVal) => {
+//   console.log(newVal, 'time')
+// })
 </script>
 
 <template>
@@ -330,14 +343,20 @@
           <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" /> -->
+          <dept-select v-model="searchQuery.applyUnit" placeholder="申请部门" :data="useDeptList" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.applyPerson" placeholder="申请人" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-input v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" />
+          <el-date-picker
+            v-model="searchQuery.time" placeholder="申请日期" clearable class="w-50 m-2" type="daterange"
+            start-placeholder="申请日期开始"
+            end-placeholder="申请日期结束"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm"
+          />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index e59c2a7..755138a 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -37,7 +37,7 @@
   overallDimension: '', // 外形尺寸
   manufacturingNo: '', // 出厂编号
   manufacturingDate: '', // 出厂年月
-  cardEstablishmentDate: '', // 立卡年月
+  cardEstablishmentDate: '', // 立卡日期
   weight: '', // 重量
   enableDate: '', // 启用年月
   singlePrice: '', // 单价
@@ -81,6 +81,14 @@
   enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
   mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
   validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+  useDept: [{ required: true, message: '使用部门不能为空', trigger: 'blur' }],
+  usePerson: [{ required: true, message: '使用人不能为空', trigger: 'blur' }],
+  equipmentCategory: [{ required: true, message: '设备类别不能为空', trigger: 'blur' }],
+  equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+  equipmentSpecifications: [{ required: true, message: '设备规格不能为空', trigger: 'blur' }],
+  purpose: [{ required: true, message: '用途不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  managerLevel: [{ required: true, message: '管理级别不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -107,9 +115,6 @@
     value: '0',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 检定周期
 const mesureCycleList = ref<selectType[]>([
   {
@@ -199,8 +204,6 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
-const selectTreeRef1 = ref()
-const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -256,10 +259,6 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
-  if (title.value !== '详情') {
-    selectTreeRef1.value.clearSelected()
-    selectTreeRef2.value.clearSelected()
-  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -460,10 +459,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+            <el-form-item label="立卡日期" prop="cardEstablishmentDate">
               <el-date-picker
                 v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '立卡年月'"
+                :placeholder="title === '详情' ? '' : '立卡日期'"
                 style="width: 100%;"
               />
             </el-form-item>
@@ -507,7 +506,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用部门" prop="useDept">
-              <com-tree-select
+              <dept-select v-model="ruleForm.useDept" :data="useDeptList" :placeholder="title === '详情' ? ' ' : '使用部门'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
@@ -516,7 +516,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -537,10 +537,11 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定部门" prop="mesureDept">
+              <el-input v-model.trim="ruleForm.mesureDept" :placeholder="title === '详情' ? '' : '检定部门'" :disabled="title === '详情'" />
               <!-- <el-select v-model="ruleForm.mesureDept" placeholder="检定部门" :disabled="title === '详情'">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
               </el-select> -->
-              <com-tree-select
+              <!-- <com-tree-select
                 v-if="title !== '详情'"
                 ref="selectTreeRef1"
                 v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
@@ -549,7 +550,7 @@
               />
               <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index d0ceefb..caf81b3 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -2,10 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { selectType } from '../standingBook-interface'
-import addDialog from './templateAdd.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/system/notice'
-import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const props = defineProps({
@@ -28,7 +26,7 @@
   useDept: '', // 使用部门
   validDate: '', // 有效日期
   abc: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -238,11 +236,9 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -353,11 +349,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <com-tree-select
-            ref="selectTreeRef"
-            v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps"
-          />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
         </search-item>
         <search-item>
           <el-date-picker
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 05e419a..e220eb5 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -15,7 +15,7 @@
   modelNo: '', // 型号
   equipmentSpecifications: '', // 设备规格
   equipmentCategory: '', // 设备类型
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -138,7 +138,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'detail',
     },
@@ -156,7 +156,7 @@
   //   ...row,
   // })
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'edit',
     },
@@ -213,7 +213,7 @@
 // 新增
 const add = () => {
   $router.push({
-    name: 'fixedAssetsDetail',
+    name: 'fixedAssetsDetailType',
     params: {
       type: 'add',
     },
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 214876c..fcb0d31 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -59,12 +59,12 @@
               <el-radio label="1">
                 同意
               </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
               <el-radio label="3">
                 驳回
               </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 856c2ff..7ab7c18 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,19 +1,21 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="add">
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import addRow from './addRow.vue'
+import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 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 { addApply, detailApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
 const ruleFormRef1 = ref() // from组件
@@ -79,6 +81,10 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  createUser: userInfo.$state.id,
+  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  id: '',
 })
 const rules1 = ref<FormRules>({
   assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
@@ -97,6 +103,7 @@
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
@@ -111,6 +118,7 @@
 const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 const isWhether = ref<selectType[]>([
   {
     name: '是',
@@ -213,6 +221,7 @@
   getDeptTreeList().then((res) => {
     // 转成树结构
     useDeptList.value = toTreeList(res.data, '0', true)
+    useDeptListNoTree.value = res.data
   })
 }
 // 重置
@@ -289,6 +298,7 @@
   if (isDevice) {
     // 设备借用
     if (title.value !== '新建') {
+      console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
         borrowList.value = res.data.equipmentList
@@ -325,21 +335,24 @@
           },
         ).then(() => {
           if (borrowList.value.length) {
-            // 新建/编辑
-            if (title.value === '新建') {
-              // 整理数据
-              const params = {
-                ...ruleForm2.value,
-                equipmentList: borrowList.value,
-                applyType: '1',
-              }
-              addApply(params).then((res) => {
-                console.log('设备借用申请新建', res)
-              })
+            // 整理数据
+            const params = {
+              ...ruleForm2.value,
+              equipmentList: borrowList.value.map(item => ({
+                equipmentId: item.id,
+              })),
+              applyType: '1',
             }
-            else {
-              // 编辑
-            }
+            title.value === '新建'
+              // eslint-disable-next-line multiline-ternary
+              ? addApply(params) : editApply(params)
+                .then((res) => {
+                  if (res.code === 200) {
+                    // 成功
+                    ElMessage.success('操作成功')
+                    $router.go(-1)
+                  }
+                })
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -353,10 +366,56 @@
   }
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  formEl?.resetFields()
+const resetForm = () => {
   close()
 }
+const approveRef = ref()
+// 审批操作
+const approval = (row: { id: string;type: string }) => {
+  let radio = ''
+  switch (row.type) {
+    case 'agree':
+      radio = '1'
+      break
+    case 'refuse':
+      radio = '2'
+      break
+    case 'reject':
+      radio = '3'
+      break
+  }
+  approveRef.value.initDialog({
+    radio,
+  })
+}
+// 删除当前
+const deleteForm = () => {
+  ElMessageBox.confirm(
+    `确认删除${ruleForm2.value.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: ruleForm2.value.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          resetForm()
+        }
+      })
+    })
+}
+// 编辑当前
+const editForm = () => {
+  // 并且隐藏编辑按钮
+  title.value = '编辑'
+}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -393,143 +452,187 @@
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
-    required: true,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
-    required: true,
   },
   {
     text: '型号',
     value: 'modelNo',
     align: 'center',
-    required: false,
   },
   {
     text: '测量范围',
     value: 'mesureRange',
     align: 'center',
-    required: true,
   },
+  // {
+  //   text: '使用部门',
+  //   value: 'useDept',
+  //   align: 'center',
+  //   required: true,
+  // },
+  // {
+  //   text: '使用人',
+  //   value: 'usePerson',
+  //   align: 'center',
+  //   required: true,
+  // },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
-    required: true,
   },
   {
     text: '使用人',
-    value: 'usePerson',
+    value: 'usePersonName',
     align: 'center',
-    required: true,
   },
   {
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
-    required: false,
   },
   {
     text: '有效日期',
     value: 'validDate',
     align: 'center',
-    required: false,
   },
 ])
 const addRowRef = ref()
 // 添加行
 const addRowBtn = () => {
-  addRowRef.value.initDialog({ title: '添加' })
-}
-
-// 检查证书列表
-function checkPersonList() {
-  for (let index = 0; index < currentShow.value.data.length; index++) {
-    const item = currentShow.value.data[index]
-    for (const prop of currentShow.value.column) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
-}
-// 将证书列表置为不可编辑状态
-function setAllRowReadable() {
-  // for (const item of borrowList.value) {
-  //   item.editable = false
+  // if (checkPersonList()) {
+  //   setAllRowReadable()
+  //   console.log(borrowList.value)
+  //   borrowList.value.push({
+  //     equipmentName: '', // 设备名称
+  //     createUser: userInfo.$state.id, // 当前用户id   1
+  //     equipmentId: '', // 设备id 1
+  //     equipmentNo: '', // 设备编号
+  //     modelNo: '', // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: '', // 有效日期
+  //     edit: true,
+  //   })
   // }
+  addRowRef.value.initDialog({ title: '添加' })
 }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e) => {
   SelectionList.value = e
 }
-// 双击行显示输入框
-const dblclickRow = (row) => {
-  // setAllRowReadable()
-  // row.editable = true
-}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
 // 删除行
 const removeRowBtn = () => {
-  const removeArr = borrowList.value.filter(item => item.remove !== '')
-  if (removeArr.length) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      borrowList.value = borrowList.value.filter(item => item.remove === '')
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 删除行
-// const removeRow = () => {
-//   currentShow.value.data = currentShow.value.data.filter((item) => {
-//     return !SelectionList.value.includes(item)
-//   })
-// }
-// 借用设备列表添加
-const addRowMethods = (row) => {
-  row.forEach((element) => {
-    borrowList.value.push({
-      equipmentName: element.equipmentName, // 设备名称
-      createUser: '', // 当前用户id   1
-      equipmentId: element.id, // 设备id 1
-      equipmentNo: element.equipmentNo, // 设备编号
-      modelNo: element.modelNo, // 型号
-      measureRange: '', // 测量范围 1
-      useDept: '', // 使用部门 1
-      usePerson: '', // 使用人 1
-      validDate: element.validDate, // 有效日期
-      edit: true,
-    })
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
   })
 }
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+// 详情页面中是否可审批
+const isApproval = computed(() => {
+  //  根据状态判断
+  //  全部 待审批 审批中 可审批
+  const arr = ['0', '2', '3']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 详情页是否展示打印按钮
+const isPrint = computed(() => {
+  //  根据状态判断
+  // 未通过 已通过
+  const arr = ['4', '5']
+  return arr.includes($route.query?.approvalStatus as string)
+})
+// 已取消状态
+const isCancel = computed(() => {
+  if ($route.query?.approvalStatus === '6') {
+    return true
+  }
+  else {
+    return false
+  }
+})
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 借用设备列表 -->
     <add-row ref="addRowRef" @add="addRowMethods" />
+    <!-- 审批操作 -->
+    <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+          同意
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && isPrint" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </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>
+        <el-button v-if="title === '详情' && isCancel" type="primary" @click="deleteForm">
+          删除
+        </el-button>
+        <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
       </template>
@@ -537,15 +640,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="useDept">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -620,16 +715,13 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请名称" prop="applyName">
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <com-tree-select
-                v-if="title !== '详情'"
-                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
-              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
-                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -642,7 +734,7 @@
           <el-col :span="6">
             <el-form-item label="借用时间" prop="time">
               <el-date-picker
-                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : '借用时间'"
                 style="width: 100%;"
               />
@@ -652,7 +744,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
-              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -668,39 +760,16 @@
             删除行
           </el-button>
         </template>
-        <!-- <normal-table
-          :data="borrowList" :total="1" :columns="columns as any"
-        >
-          <template #preColumns>
-            <el-table-column label="选择" width="55" align="center">
-              <template #default="scope">
-                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
-              </template>
-            </el-table-column>
-            <el-table-column label="序号" width="60" align="center">
-              <template #default="scope">
-                {{ scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table> -->
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
             <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+              <span>{{ item.text }}</span>
             </template>
             <template #default="scope">
-              <span v-if="!scope.row.edit">{{ scope.row[item.value] }}</span>
-              <!-- 测量范围输入框 -->
-              <el-input v-if="item.value === 'mesureRange'" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-              <!-- 使用部门属性选择 -->
-              <dept-select v-if="item.value === 'useDept'" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
-              <!-- 使用人下拉框 -->
-              <el-select v-if="item.value === 'usePerson'" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
-                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
-              </el-select>
+              <span>{{ scope.row[item.value]
+              }}</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
new file mode 100644
index 0000000..bf71edd
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -0,0 +1,799 @@
+<!-- 新增或详情弹窗  table表格可编辑  已废弃 -->
+<script lang="ts" setup name="add">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
+import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { UploadFile } from '@/api/measure/file'
+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 { addApply, detailApply } from '@/api/device/borrow'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
+const $router = useRouter()
+const $route = useRoute()
+const ruleFormRef1 = ref() // from组件
+const ruleFormRef2 = ref() // from组件
+const title = ref('')
+const name = ref('')
+const borrowList = ref<borrowDeviceType[]>([])
+const ruleForm1 = ref({
+  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 ruleForm2 = ref({
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const rules1 = ref<FormRules>({
+  assetType: [{ required: true, message: '资产类型不能为空', trigger: 'blur' }],
+  equipmentName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
+  manufacturingDate: [{ required: true, message: '出厂日期不能为空', trigger: 'blur' }],
+  modelNo: [{ required: true, message: '型号不能为空', trigger: 'blur' }],
+  abc: [{ required: true, message: 'ABC不能为空', trigger: 'blur' }],
+  cardEstablishmentDate: [{ required: true, message: '立卡年月不能为空', trigger: 'blur' }],
+  enableDate: [{ required: true, message: '启用日期不能为空', trigger: 'blur' }],
+  mesureDate: [{ required: true, message: '检定日期不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const rules2 = ref<FormRules>({
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
+})
+const assetTypeList = ref<selectType[]>([]) // 资产类型
+const ABCList = ref<selectType[]>([]) // ABC
+const mesureTypeList = ref<selectType[]>([]) // 检定方式
+const majorCategoryList = ref<selectType[]>([]) // 专业分类
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
+const mesureResultList = ref<selectType[]>([]) //  检定结果
+const equipmentTypeList = ref<selectType[]>([]) // 设备类型
+const managerLevelList = ref<selectType[]>([]) // 管理级别
+const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
+const managerStateList = ref<selectType[]>([]) // 管理状态
+const capitalSourceList = ref<selectType[]>([]) // 资本来源
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const useDeptListNoTree = ref([]) // 使用部门列表非树结构
+const isWhether = ref<selectType[]>([
+  {
+    name: '是',
+    id: 'shi',
+    value: '1',
+  },
+  {
+    name: '否',
+    id: 'fou',
+    value: '0',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 检定周期
+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 fetchData = () => {
+// 获取资产类型
+  getDictByCode('assetType').then((response) => {
+    assetTypeList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    ABCList.value = response.data
+  })
+  // 获取检定方式
+  getDictByCode('mesureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取专业分类
+  getDictByCode('majorCategory').then((response) => {
+    majorCategoryList.value = response.data
+  })
+  // 获取检定结果
+  getDictByCode('mesureResult').then((response) => {
+    mesureResultList.value = response.data
+  })
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
+  // 获取设备类型
+  getDictByCode('equipmentType').then((response) => {
+    equipmentTypeList.value = response.data
+  })
+  // 获取管理级别
+  getDictByCode('managerLevel').then((response) => {
+    managerLevelList.value = response.data
+  })
+  // 获取折旧方法
+  getDictByCode('depreciationMethod').then((response) => {
+    depreciationMethodList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取资本来源
+  getDictByCode('capitalSource').then((response) => {
+    capitalSourceList.value = response.data
+  })
+  // 获取用户列表
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+  })
+  // 获取部门列表
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+    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 == '设备借用处理') {
+    return true
+  }
+  else {
+    return false
+  }
+})
+// 弹窗初始化
+const initDialog = (row: any) => {
+  fetchData()
+  // ruleFormRef.value?.resetFields()
+  title.value = row.title
+  name.value = row.name
+  if (isDevice) {
+    // 设备借用
+    if (title.value !== '新建') {
+      detailApply({ id: row.id }).then((res) => {
+        ruleForm2.value = res.data
+        borrowList.value = res.data.equipmentList
+      })
+    }
+  }
+  else {
+    // 状态管理
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+
+// 关闭弹窗
+const close = () => {
+  resetDATA()
+  $router.go(-1)
+}
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (isDevice) {
+    //  设备借用
+    if (!formEl2) { return }
+    await formEl2.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认提交吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          if (borrowList.value.length) {
+            // 新建/编辑
+            if (title.value === '新建') {
+              // 整理数据
+              const params = {
+                ...ruleForm2.value,
+                equipmentList: borrowList.value.map(item => ({
+                  createUser: item.createUser,
+                  equipmentId: item.equipmentId,
+                  measureRange: item.measureRange,
+                  useDept: item.useDept,
+                  usePerson: item.usePerson,
+                })),
+                applyType: '1',
+              }
+              addApply(params).then((res) => {
+                console.log('设备借用申请新建', res)
+              })
+            }
+            else {
+              // 编辑
+            }
+          }
+          else {
+            ElMessage.warning('请先添加借用设备')
+          }
+        })
+      }
+    })
+  }
+  else {
+    // 状态管理
+  }
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        // 重置当前验证
+        ruleForm1.value.fileList = []
+        ruleForm1.value.fileList.push({
+          assetId: '',
+          fileName: res.data[0],
+          minioFileName: res.data[0],
+          // id: '',
+        })
+        ruleFormRef1.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDept',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePerson',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: false,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    // required: false,
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  if (checkPersonList()) {
+    setAllRowReadable()
+    console.log(borrowList.value)
+    borrowList.value.push({
+      equipmentName: '', // 设备名称
+      createUser: userInfo.$state.id, // 当前用户id   1
+      equipmentId: '', // 设备id 1
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      measureRange: '', // 测量范围 1
+      useDept: '', // 使用部门 1
+      usePerson: '', // 使用人 1
+      validDate: '', // 有效日期
+      edit: true,
+    })
+  }
+  // addRowRef.value.initDialog({ title: '添加' })
+}
+选择设备
+const selectDevice = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 检查设备列表
+function checkPersonList() {
+  for (let index = 0; index < borrowList.value.length; index++) {
+    const item = borrowList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将证书列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of borrowList.value) {
+    item.edit = false
+  }
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e) => {
+  SelectionList.value = e
+}
+// 双击行显示输入框
+const dblclickRow = (row) => {
+  setAllRowReadable()
+  row.edit = true
+}
+// 删除行
+// const removeRowBtn = () => {
+//   const removeArr = borrowList.value.filter(item => item.remove !== '')
+//   if (removeArr.length) {
+//     ElMessageBox.confirm(
+//       '确认删除选中的数据吗？',
+//       '提示',
+//       {
+//         confirmButtonText: '确认',
+//         cancelButtonText: '取消',
+//         type: 'warning',
+//       },
+//     ).then(() => {
+//       borrowList.value = borrowList.value.filter(item => item.remove === '')
+//       ElMessage.success('删除成功')
+//     })
+//   }
+//   else {
+//     ElMessage.warning('请先选择需要删除的数据')
+//   }
+// }
+// 删除行
+const removeRowBtn = () => {
+  borrowList.value = borrowList.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  const addrow = borrowList.value.filter(item => item.edit === true)[0]
+  addrow.equipmentName = row.equipmentName
+  addrow.equipmentId = row.equipmentId
+  addrow.equipmentNo = row.equipmentNo
+  addrow.modelNo = row.modelNo
+  addrow.measureRange = row.measureRange
+  addrow.validDate = row.validDate
+  // borrowList.value = [...borrowList.value, ...row]
+  // row.forEach((element) => {
+  //   borrowList.value.push({
+  //     equipmentName: element.equipmentName, // 设备名称
+  //     createUser: '', // 当前用户id   1
+  //     equipmentId: element.id, // 设备id 1
+  //     equipmentNo: element.equipmentNo, // 设备编号
+  //     modelNo: element.modelNo, // 型号
+  //     measureRange: '', // 测量范围 1
+  //     useDept: '', // 使用部门 1
+  //     usePerson: '', // 使用人 1
+  //     validDate: element.validDate, // 有效日期
+  //     edit: true,
+  //   })
+  // })
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm1.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm1.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="usePerson">
+              <el-select v-model="ruleForm1.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm1.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm1.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm1.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm1.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="闲置时间" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm1.manufacturingDate" 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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm1.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm1.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm1.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="申请单位" prop="applyUnit">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm2.applyUnit" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+              <el-select v-else v-model="ruleForm2.applyUnit" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="date" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请说明" prop="applyDesc">
+              <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <!-- <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table> -->
+        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange" @row-dblclick="dblclickRow">
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
+            <template #header>
+              <span v-if="!scope.row.edit">{{
+                item.value === 'useDept'
+                  ? useDeptListNoTree.filter(dept => dept.id === scope.row[item.value])[0]?.name
+                  : item.value === 'usePerson'
+                    ? usePersonList.filter(person => person.id === scope.row[item.value])[0]?.name
+                    : scope.row[item.value]
+              }}</span>
+              <!-- 设备名称输入框 -->
+              <el-input v-if="item.value === 'equipmentName' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @focus="selectDevice">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectDevice">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <!-- 测量范围输入框 -->
+              <el-input v-if="item.value === 'mesureRange' && scope.row.edit" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <!-- 使用部门属性选择 -->
+              <dept-select v-if="item.value === 'useDept' && scope.row.edit" v-model="scope.row[item.value]" :data="useDeptList" :placeholder="`${item.text}`" />
+              <!-- 使用人下拉框 -->
+              <el-select v-if="item.value === 'usePerson' && scope.row.edit" v-model="scope.row[item.value]" :placeholder="`${item.text}`">
+                <el-option v-for="person in usePersonList" :key="person.id" :label="person.name" :value="person.id" />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block v-if="title !== '新建'" title="审批流程">
+        <el-timeline>
+          <el-timeline-item timestamp="2018/4/12" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/12 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/3" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/3 20:46</p>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="2018/4/2" placement="top">
+            <el-card>
+              <h4>Update Github template</h4>
+              <p>Tom committed 2018/4/2 20:46</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.timeline {
+  background-color: #fff;
+}
+
+:deep(.el-checkbox__label) {
+  display: none;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 7cc9075..131b636 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 addDialog from './templateAdd.vue'
+import { getApplyList } from '@/api/device/stateManage'
 const props = defineProps({
   name: {
     type: String,
@@ -12,13 +12,28 @@
     type: String,
     default: '',
   },
+  type: { // 当前状态
+    type: String,
+    default: '',
+  },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 const $router = useRouter()
 const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
-  limit: 10,
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyUnit: '', // 申请单位
+  approvalStatus: '', // 审批状态
+  createUser: '', // 创建人
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -106,13 +121,12 @@
   extarCss: '',
 })
 const list = ref() // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const approveRef = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
+  // loadingTable.value = true
+  // getApplyList(searchQuery).then((res) => {
   //   if (res.code === 200) {
   //     list.value = res.data.rows
   //     total.value = res.data.total
@@ -121,17 +135,6 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [{
-      name: 'test',
-      status: '通过',
-      no: 1234,
-      time: '2022-12-12 00:00:00',
-      type: '闲置申请',
-    }]
-    total.value = 1
-    loadingTable.value = false
-  }, 1000)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -307,9 +310,28 @@
   getList()
   dialogVisible.value = false
 }
-onMounted(() => {
+// onMounted(() => {
+//   getList()
+// })
+watch(() => props.type, (newValue) => {
+  if (newValue === '0') {
+    searchQuery.approvalStatus = ''
+  }
+  else {
+    searchQuery.approvalStatus = newValue
+  }
   getList()
+}, {
+  immediate: true,
+  deep: true,
 })
+// watch(() => props.applyType, (newVal) => {
+//   searchQuery.applyStatus = newVal
+//   getList()
+// }, {
+//   immediate: true,
+//   deep: true,
+// })
 </script>
 
 <template>
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index fce7685..eaccced 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -7,6 +7,7 @@
 import passed from './status/passed.vue'// 已通过
 import pending from './status/pending.vue' // 待审批
 import unPassed from './status/unPassed.vue' // 未通过
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -16,10 +17,16 @@
     type: String,
     required: true,
   },
+  applyType: { // 设备申请类型
+    type: String,
+    default: '',
+  },
 })
 interface menuType {
   name: string
-  comp: any
+  comp?: any
+  id?: string
+  value?: string
 }
 const menu = shallowRef<menuType[]>([
   { name: '全部', comp: all },
@@ -30,10 +37,31 @@
   { name: '未通过', comp: unPassed },
   { name: '已取消', comp: cancel },
 ])
+const statusList = ref<menuType[]>([])
+const type = ref('') // 当前状态的value
 const current = ref('全部')
 const currentComp = shallowRef(all)
-watch(current, (newValue) => {
+watch(current, async (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+  if (statusList.value.length > 0) {
+    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+  }
+  else {
+    getDictByCode('approvalStatus').then((res) => {
+      statusList.value = (res.data as menuType[])
+      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    })
+  }
+}, {
+  immediate: true,
+  deep: true,
+})
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.authority}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  sessionStorage.getItem(`${props.authority}Menu`) ? sessionStorage.removeItem(`${props.authority}Menu`) : ''
 })
 </script>
 
@@ -48,7 +76,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :title="current" :name="props.name" />
+    <component :is="currentComp" :title="current" :name="props.name" :type="type" :apply-type="applyType" />
   </div>
 </template>
 
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index 703674f..b2c2357 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="unusedApply" />
+    <page name="设备处置申请" authority="handleApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 35c2af6..744f0f3 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="unusedApply" />
+    <page name="设备启封申请" authority="openApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 282ecd8..94c6475 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="unusedApply" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index 1c8544d..a9e6733 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="unusedApply" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 4b02b09..8f15c63 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index c758059..e2ff064 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -77,7 +77,7 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publisher = userInfo.$state.deptId
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
   else if (row.title === '详情') {
@@ -126,9 +126,6 @@
       type: 'warning',
     },
       ).then((res) => {
-        if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher = userInfo.$state.deptId
-        }
         if (flag == '提交') {
           confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -257,15 +254,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-              <com-tree-select
-                v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
-                :tree-props="deptProps"
-                style="width: 100%;"
-              />
+              <dept-select v-model="ruleForm.publisher" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '请选择发布单位'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index f8f7528..a1c6722 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -22,6 +22,10 @@
 watch(current, (newValue) => {
   console.log(newValue, 'newValue')
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+},
+{
+  immediate: true,
+  deep: true,
 })
 onUnmounted(() => {
   sessionStorage.setItem('fileMenu', current.value)
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 16a8c9d..fa7b761 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -207,7 +207,6 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -215,7 +214,6 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -313,10 +311,11 @@
               :value="item.id"
             />
           </el-select> -->
-          <com-tree-select
+          <!-- <com-tree-select
             ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
             placeholder="工作部门" :tree-props="deptProps"
-          />
+          /> -->
+          <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7850502..0de6eb3 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,8 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 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 certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -12,7 +13,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 { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -228,6 +228,7 @@
   {
     name: '证书基本信息',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '发证单位',
@@ -269,6 +270,7 @@
   {
     name: '计量工作培训记录',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '培训时间',
@@ -317,6 +319,7 @@
   {
     name: '业务记录',
     data: [] as any[],
+    deepData: [] as any[],
     column: [
       {
         text: '样品编号',
@@ -415,11 +418,17 @@
     })
   }
 }
+// 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 submitForm = async (formEl: FormInstance | undefined) => {
@@ -435,27 +444,45 @@
           type: 'warning',
         },
       ).then(() => {
-        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
-            }
+        // 处理编辑后的证书信息数据
+        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)
           }
-          (title.value === '新建'
-            ? getStaffAdd
-            : 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('请先填写证书信息')
-        }
+        })
+        // 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('请先填写证书信息')
+        // }
       })
     }
   })
@@ -467,14 +494,12 @@
   $router.go(-1)
   resetFormData()
 }
-const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
-  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -489,6 +514,7 @@
       if (res.code === 200) {
         ruleForm.value = res.data
         changeList.value[0].data = res.data.certificateList
+        changeList.value[0].deepData = lodash.cloneDeep(res.data.certificateList)
       }
     })
   }
@@ -557,14 +583,15 @@
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
+              <!-- <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
                 ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
                 placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
-              />
+              /> -->
+              <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index e2403ed..cbdea0b 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -199,14 +199,12 @@
   $router.go(-1)
   resetFormData()
 }
-const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
   name.value = row.name
-  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -299,7 +297,8 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
+              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
+              <!-- <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -308,7 +307,7 @@
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
                 style="width: 100%;"
-              />
+              /> -->
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index e119e0d..31ea6c1 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -141,7 +141,6 @@
 const search = () => {
   getList()
 }
-const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -149,7 +148,6 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
-  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -245,10 +243,11 @@
               :value="item.id"
             />
           </el-select> -->
-          <com-tree-select
+          <!-- <com-tree-select
             ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
             placeholder="工作部门" :tree-props="deptProps"
-          />
+          /> -->
+          <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 21d9af6..eaa60ae 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -153,15 +153,15 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2" />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
-          class="w-50 m-2 normal-input"
+          class="w-50 m-2"
         />
       </search-item>
       <search-item>
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index ad997df..2e314c9 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -285,10 +285,11 @@
           <el-form-item label="组织机构" prop="deptId">
             <!-- <dept-select v-model="userForm.deptId" :dept-show="true" :default-expanded-keys="[userForm.roleid]"
               placeholder="请选择组织机构" /> -->
-            <com-tree-select
+            <!-- <com-tree-select
               v-model="userForm.deptId" :options="deptTreeList" placeholder="选择组织机构"
               :tree-props="deptProps" style="width: 100%;"
-            />
+            /> -->
+            <dept-select v-model="userForm.deptId" :data="deptTreeList" placeholder="选择组织机构" style="width: 100%;" />
           </el-form-item>
         </el-col>
       </el-row>